[svn] r6530: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.csproj Nemerle.VsIntegration.T...

NoiseEHC svnadmin at nemerle.org
Wed Aug 16 15:00:29 CEST 2006


Log:
Fix compiling with 2006 AUG CTP (what should be the good image index in NemerleFileNode.cs?)

Author: NoiseEHC
Date: Wed Aug 16 15:00:26 2006
New Revision: 6530

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.csproj
   vs-plugin/trunk/Nemerle.VsIntegration.Tests/Nemerle.VsIntegration.Tests.csproj
   vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
   vs-plugin/trunk/Nemerle.VsIntegration/NemerleFileNode.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.csproj
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.csproj	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.csproj	Wed Aug 16 15:00:26 2006
@@ -85,7 +85,6 @@
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Modified: vs-plugin/trunk/Nemerle.VsIntegration.Tests/Nemerle.VsIntegration.Tests.csproj
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration.Tests/Nemerle.VsIntegration.Tests.csproj	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration.Tests/Nemerle.VsIntegration.Tests.csproj	Wed Aug 16 15:00:26 2006
@@ -28,18 +28,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Nemerle, Version=0.9.3.12, Culture=neutral, PublicKeyToken=e080a9c724e2bfcd, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\Nemerle\Nemerle.dll</HintPath>
-    </Reference>
-    <Reference Include="Nemerle.Compiler, Version=0.9.3.19, Culture=neutral, PublicKeyToken=5291d186334f6101, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\Nemerle\Nemerle.Compiler.dll</HintPath>
-    </Reference>
-    <Reference Include="Nemerle.Macros, Version=0.9.3.9, Culture=neutral, PublicKeyToken=5291d186334f6101, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\Nemerle\Nemerle.Macros.dll</HintPath>
-    </Reference>
+    <Reference Include="$(Nemerle)\Nemerle.Compiler.dll" />
+    <Reference Include="$(Nemerle)\Nemerle.dll" />
+    <Reference Include="$(Nemerle)\Nemerle.Macros.dll" />
     <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
     <Reference Include="System" />
   </ItemGroup>

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 Aug 16 15:00:26 2006
@@ -104,8 +104,8 @@
     <Content Include="CodeSnippets\SnippetsIndex.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Overview.xml" />
-    <Content Include="Overview-Project.xml" />
+    <None Include="Overview.xml" />
+    <None Include="Overview-Project.xml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="CodeSnippets\Snippets\class.snippet">
@@ -126,15 +126,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Engine\TraceWriter.cs" />
-    <None Include="nemerle.snk" />
   </ItemGroup>
   <PropertyGroup>
     <CommonRegAttributes>$(VisualStudioIntegration)\Common\Source\CSharp\RegistrationAttributes</CommonRegAttributes>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(VisualStudioIntegration)\Common\Source\CSharp\RegistrationAttributes\LanguageIntellisenseProviderRegistrationAttribute.cs">
-      <Link>RegistrationAttributes\LanguageIntellisenseProviderRegistrationAttribute.cs</Link>
-    </Compile>
     <Compile Include="$(VisualStudioIntegration)\Common\Source\CSharp\RegistrationAttributes\WebSiteProjectAttribute.cs">
       <Link>RegistrationAttributes\WebSiteProjectAttribute.cs</Link>
     </Compile>
@@ -253,7 +249,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ObjectModelExtenders\!Info.txt" />
-    <Content Include="Overview.xml" />
     <EmbeddedResource Include="Resources\NemerleImageList.bmp" />
     <Content Include="Resources\Nemerle.ico" />
     <ZipProject Include="Templates\Projects\WindowsApplication\NemerleMacroLibrary.vstemplate" />

Modified: vs-plugin/trunk/Nemerle.VsIntegration/NemerleFileNode.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/NemerleFileNode.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/NemerleFileNode.cs	Wed Aug 16 15:00:26 2006
@@ -101,7 +101,7 @@
 			get
 			{
 				if (Path.GetExtension(FileName).ToLower() == GlobalConstants.FileExtension)
-					return (int)ProjectNode.ImageName.File;
+					return (int)ProjectNode.ImageName.TextFile;
 				else
 					return base.ImageIndex;
 			}



More information about the svn mailing list