[svn] r7123: vs-plugin/trunk:
Nemerle.VsIntegration.Tests/Properties/AssemblyInfo.cs
Nemerle.VsIntegration...
IT
svnadmin at nemerle.org
Wed Dec 20 04:19:42 CET 2006
Log:
1. Fixed PLK. Now integration can work without SDK.
2. Renamed dll to Nemerle.VisualStudio.dll.
Author: IT
Date: Wed Dec 20 04:19:34 2006
New Revision: 7123
Modified:
vs-plugin/trunk/Nemerle.VsIntegration.Tests/Properties/AssemblyInfo.cs
vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleAuthoringScope.cs
vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
vs-plugin/trunk/Nemerle.VsIntegration/NemerleConstants.cs
vs-plugin/trunk/Nemerle.VsIntegration/NemerlePackage.cs
vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs
vs-plugin/trunk/Nemerle.VsIntegration/Properties/AssemblyInfo.cs
vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs
vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx
vs-plugin/trunk/Nemerle.VsIntegration/Utils.cs
Modified: vs-plugin/trunk/Nemerle.VsIntegration.Tests/Properties/AssemblyInfo.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration.Tests/Properties/AssemblyInfo.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration.Tests/Properties/AssemblyInfo.cs Wed Dec 20 04:19:34 2006
@@ -3,11 +3,11 @@
using System.Resources;
using System.Runtime.InteropServices;
-[assembly : AssemblyTitle("Nemerle.VsIntegration.Tests.Tests")]
+[assembly : AssemblyTitle("Nemerle.VisualStudio.Tests.Tests")]
[assembly : AssemblyDescription("")]
[assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("RSDN")]
-[assembly : AssemblyProduct("Nemerle.VsIntegration.Tests.Tests")]
+[assembly : AssemblyProduct("Nemerle.VisualStudio.Tests.Tests")]
[assembly : AssemblyCopyright("Copyright © RSDN 2006")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]
Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleAuthoringScope.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleAuthoringScope.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleAuthoringScope.cs Wed Dec 20 04:19:34 2006
@@ -466,7 +466,7 @@
return
_authoringScopeTrace ??
(_authoringScopeTrace = new TraceSwitch("NemerleAuthoringScope",
- "Enables Nemerle.VsIntegration.LanguageService.NemerleAuthoringScope trace"));
+ "Enables Nemerle.VisualStudio.LanguageService.NemerleAuthoringScope trace"));
}
}
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj Wed Dec 20 04:19:34 2006
@@ -12,7 +12,7 @@
<ProjectGuid>{16041FE4-7A5D-4DFD-9A79-A92B6A81E291}</ProjectGuid>
<OutputType>Library</OutputType>
<NoStandardLibraries>false</NoStandardLibraries>
- <AssemblyName>Nemerle.VsIntegration</AssemblyName>
+ <AssemblyName>Nemerle.VisualStudio</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>nemerle.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
Modified: vs-plugin/trunk/Nemerle.VsIntegration/NemerleConstants.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/NemerleConstants.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/NemerleConstants.cs Wed Dec 20 04:19:34 2006
@@ -4,20 +4,21 @@
{
public static class NemerleConstants
{
- // See else:
- // Nemerle.VsIntegration\CtcComponents\Guids.h
+ // These constants are parts of PLK.
+ // If you need to change it, you will have to request new PLK as well.
+ //
+ public const string PackageGuidString = "CF7296F1-47E5-4915-83A0-8C44961F0981";
+ public const string PLKMinEdition = "standard";
+ public const string PLKCompanyName = "NA";
+ public const string PLKProductName = "Nemerle";
+ public const string PLKProductVersion = "1.0";
- public const string PackageGuidString = "CF7296F1-47E5-4915-83A0-8C44961F098D";
public const string TypeLibGuidString = "0D5051D0-A831-4841-8022-2D7DDFC4E63C";
public const string LanguageName = "Nemerle";
public const string FileExtension = ".n";
public const string ProjectExtension = "nproj";
-
- // Used by registration and about box/splash screen.
- //
- public const string ProductDetails = "Nemerle VS Integration";
- public const string ProductID = "1.0";
+ public const string ProductDetails = "Nemerle Visual Studio Integration\r\nVersion 1.0";
// Attention, GUID LanguageServiceGuidString also has to be changed there:
// Nemerle.VsIntegration\CodeSnippets\SnippetsIndex.xml
Modified: vs-plugin/trunk/Nemerle.VsIntegration/NemerlePackage.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/NemerlePackage.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/NemerlePackage.cs Wed Dec 20 04:19:34 2006
@@ -32,8 +32,18 @@
// GlobalConstants.LanguageName, ".n",
// GlobalConstants.LanguageName + ";" + GlobalConstants.LanguageName ,
// GlobalConstants.LanguageName)]
- [ProvideLoadKey("standard", NemerleConstants.ProductID, NemerleConstants.ProductDetails, "", 104)]
+
+ [Guid(NemerleConstants.PackageGuidString)]
+ [ComVisible(true)]
+ [PackageRegistration(UseManagedResourcesOnly = true)]
+ [ProvideLoadKey(
+ NemerleConstants.PLKMinEdition,
+ NemerleConstants.PLKProductVersion,
+ NemerleConstants.PLKProductName,
+ NemerleConstants.PLKCompanyName,
+ 104)]
[DefaultRegistryRoot("Software\\Microsoft\\VisualStudio\\8.0Exp")]
+
[ProvideService(typeof(NemerleLanguageService), ServiceName = NemerleConstants.LanguageName)]
[ProvideService(typeof(INemerleLibraryManager))]
[ProvideLanguageService(
@@ -48,7 +58,6 @@
ShowCompletion = true,
ShowMatchingBrace = true)]
[ProvideLanguageExtension(typeof(NemerleLanguageService), NemerleConstants.FileExtension)]
- [Guid(NemerleConstants.PackageGuidString)]
[ProvideProjectFactory(typeof(NemerleProjectFactory),
NemerleConstants.LanguageName,
NemerleConstants.LanguageName + " Project Files (*." +
@@ -65,14 +74,13 @@
[ProvideEditorExtension (typeof(NemerleEditorFactory), NemerleConstants.FileExtension, 32)]
[ProvideEditorLogicalView(typeof(NemerleEditorFactory), NemerleConstants.EditorLogicalViewGuidString)] //LOGVIEWID_Designer
[ProvideEditorLogicalView(typeof(NemerleEditorFactory), NemerleConstants.EditorLogicalViewGuidString)] //LOGVIEWID_Code
- [PackageRegistration(UseManagedResourcesOnly = true)]
// Showing the splash screen requires "devenv /rootsuffix Exp /setup" during the installation.
// For more information please see: http://blogs.msdn.com/jim_glass/archive/2005/05/23/421152.aspx
[InstalledProductRegistration(
true,
NemerleConstants.LanguageName,
NemerleConstants.ProductDetails,
- NemerleConstants.ProductID,
+ NemerleConstants.PLKProductVersion,
IconResourceID=300)]
[RegisterSnippets(
NemerleConstants.LanguageServiceGuidString,
@@ -347,7 +355,7 @@
public int ProductID(out string pbstrPID)
{
- pbstrPID = NemerleConstants.ProductID;
+ pbstrPID = NemerleConstants.PLKProductVersion;
return VSConstants.S_OK;
}
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleFileNode.cs Wed Dec 20 04:19:34 2006
@@ -38,7 +38,6 @@
#region Fields
SelectionElementValueChangedListener _selectionChangedListener;
-
NemerleFileNodeCodeDomProvider _codeDomProvider;
#endregion
@@ -107,10 +106,10 @@
get
{
if (IsFormSubType)
- return (int)ProjectNode.ImageName.WindowsForm;
+ return (int)NemerleConstants.ImageListIndex.NemerleForm;
- if (this.FileName.ToLower().EndsWith(".n"))
- return NemerleProjectNode.ImageOffset + (int)NemerleProjectNode.PythonImageName.PyFile;
+ if (FileName.ToLower().EndsWith(NemerleConstants.FileExtension))
+ return (int)NemerleConstants.ImageListIndex.NemerleSource;
return base.ImageIndex;
}
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Properties/AssemblyInfo.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Properties/AssemblyInfo.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Properties/AssemblyInfo.cs Wed Dec 20 04:19:34 2006
@@ -8,11 +8,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Nemerle.VsIntegration")]
+[assembly: AssemblyTitle("Nemerle.VisualStudio")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("rsdn.ru, nemerle.org")]
-[assembly: AssemblyProduct("Nemerle.VsIntegration")]
+[assembly: AssemblyProduct("Nemerle.VisualStudio")]
[assembly: AssemblyCopyright("Copyright © rsdn.ru, nemerle.org 2006")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Resources.Designer.cs Wed Dec 20 04:19:34 2006
@@ -70,7 +70,7 @@
}
/// <summary>
- /// Looks up a localized string similar to KHJ1HZR1P2EMZKCRZCMAMCZEMPKEPEZJP1CEKQCEHDICAKMARHCTK9KJM8IMARZ3QEZCJ2RQIKEMHZR0MAE1JEQKZAIPCMP2PAE2EZZIMCJ8K9ZJAHI0EKD9MDAPE2HC.
+ /// Looks up a localized string similar to DDQ8HJPRZZE3QJKCEAEZZEZDJ0CJPKMPEJEIZQEZQARPARHDHAC0D3CQDCEJPIJCE3P2K9E9IDJCMEMHRKQDHAQ1QMZRAPHAEQP2HQP3IAQMZDKIJRI3CZQJIIDTECII.
/// </summary>
internal static string _104 {
get {
@@ -78,6 +78,15 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to KHJ1HZR1P2EMZKCRZCMAMCZEMPKEPEZJP1CEKQCEHDICAKMARHCTK9KJM8IMARZ3QEZCJ2RQIKEMHZR0MAE1JEQKZAIPCMP2PAE2EZZIMCJ8K9ZJAHI0EKD9MDAPE2HC.
+ /// </summary>
+ internal static string _1042 {
+ get {
+ return ResourceManager.GetString("1042", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Icon _300 {
get {
object obj = ResourceManager.GetObject("300", resourceCulture);
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Resources.resx Wed Dec 20 04:19:34 2006
@@ -221,6 +221,9 @@
<value>Output File</value>
</data>
<data name="104" xml:space="preserve">
+ <value>DDQ8HJPRZZE3QJKCEAEZZEZDJ0CJPKMPEJEIZQEZQARPARHDHAC0D3CQDCEJPIJCE3P2K9E9IDJCMEMHRKQDHAQ1QMZRAPHAEQP2HQP3IAQMZDKIJRI3CZQJIIDTECII</value>
+ </data>
+ <data name="1042" xml:space="preserve">
<value>KHJ1HZR1P2EMZKCRZCMAMCZEMPKEPEZJP1CEKQCEHDICAKMARHCTK9KJM8IMARZ3QEZCJ2RQIKEMHZR0MAE1JEQKZAIPCMP2PAE2EZZIMCJ8K9ZJAHI0EKD9MDAPE2HC</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
Modified: vs-plugin/trunk/Nemerle.VsIntegration/Utils.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Utils.cs (original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Utils.cs Wed Dec 20 04:19:34 2006
@@ -75,7 +75,7 @@
{
// Replace is a temporary solution util we get PLK for Nemerle.VisualStudio.dll.
//
- return Path.GetFileNameWithoutExtension(type.Module.Name).Replace("VsIntegration", "VisualStudio");
+ return Path.GetFileNameWithoutExtension(type.Module.Name);
}
public static T GetService<T>(IServiceProvider provider)
More information about the svn
mailing list