Back to only two assemblies, but compiled with conditional references.

MrJul · Oct 8, 2014 · 24f9c3a · 24f9c3a
1 parent 511e25b
commit 24f9c3a
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 209 deletions.
diff --git a/Build.bat b/Build.bat
@@ -0,0 +1,2 @@
+"%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" Build.targets
+nuget.exe pack GammaJul.ReSharper.EnhancedTooltip.nuspec
diff --git a/Build.targets b/Build.targets
@@ -0,0 +1,10 @@
+<Project ToolsVersion="12.0" DefaultTargets="BuildAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="BuildAll">
+	<!--
+		We have to build two separates assembly because the reference to Microsoft.VisualStudio.ExtensionManager must have the correct version.
+		Visual Studio doesn't provide a binding redirect for this specific assembly.
+	-->
+    <MSBuild Projects="GammaJul.ReSharper.EnhancedTooltip.sln" Properties="Platform=Any CPU;Configuration=Release;TargetVsVersion=11" />
+    <MSBuild Projects="GammaJul.ReSharper.EnhancedTooltip.sln" Properties="Platform=Any CPU;Configuration=Release;TargetVsVersion=12" />
+  </Target>
+</Project>
diff --git a/...r.EnhancedTooltip.VsIntegration/GammaJul.ReSharper.EnhancedTooltip.Vs11Integration.csproj b/...r.EnhancedTooltip.VsIntegration/GammaJul.ReSharper.EnhancedTooltip.Vs11Integration.csproj
diff --git a/...er.EnhancedTooltip.Vs12Integration.csproj → ...rper.EnhancedTooltip.VsIntegration.csproj b/...er.EnhancedTooltip.Vs12Integration.csproj → ...rper.EnhancedTooltip.VsIntegration.csproj
@@ -15,10 +15,12 @@
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectGuid>{95370CDE-2391-41E3-94CF-D831C7101059}</ProjectGuid>
     <RootNamespace>GammaJul.ReSharper.EnhancedTooltip.VsIntegration</RootNamespace>
-    <AssemblyName>GammaJul.ReSharper.EnhancedTooltip.Vs12Integration</AssemblyName>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
   </PropertyGroup>
   <Import Project="..\GammaJul.Resharper.EnhancedTooltip.props" />
+  <PropertyGroup>
+    <AssemblyName>GammaJul.ReSharper.EnhancedTooltip.VsIntegration</AssemblyName>
+  </PropertyGroup>
   <PropertyGroup>
     <StartAction>Program</StartAction>
     <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe</StartProgram>
@@ -41,7 +43,6 @@
     <Reference Include="Microsoft.VisualStudio.Shell" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
-    <Reference Include="Microsoft.VisualStudio.ExtensionManager, Version=12.0.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\Logo\Logo32.png">

diff --git a/GammaJul.ReSharper.EnhancedTooltip.VsIntegration/QuickInfoSourceProviderProxy.cs b/GammaJul.ReSharper.EnhancedTooltip.VsIntegration/QuickInfoSourceProviderProxy.cs
@@ -24,7 +24,7 @@ public sealed class QuickInfoSourceProviderProxy : IQuickInfoSourceProvider {
 		private const string ProviderTypeNameWithoutVersion = "GammaJul.ReSharper.EnhancedTooltip.VisualStudio.QuickInfoSourceProvider, GammaJul.ReSharper.EnhancedTooltip.";
 
 		private readonly Lazy<IQuickInfoSourceProvider> _lazyProvider;
-
+		
 		[Import(AllowDefault = true)]
 		public IVsEditorAdaptersFactoryService VsEditorAdaptersFactoryService { get; set; }
 

diff --git a/...rper.EnhancedTooltip.VsVersionSpecific/GammaJul.ReSharper.EnhancedTooltip.Vs11Only.csproj b/...rper.EnhancedTooltip.VsVersionSpecific/GammaJul.ReSharper.EnhancedTooltip.Vs11Only.csproj
diff --git a/...rper.EnhancedTooltip.VsVersionSpecific/GammaJul.ReSharper.EnhancedTooltip.Vs12Only.csproj b/...rper.EnhancedTooltip.VsVersionSpecific/GammaJul.ReSharper.EnhancedTooltip.Vs12Only.csproj
diff --git a/GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific/Properties/AssemblyInfo.vs11.cs b/GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific/Properties/AssemblyInfo.vs11.cs
diff --git a/GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific/Properties/AssemblyInfo.vs12.cs b/GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific/Properties/AssemblyInfo.vs12.cs
diff --git a/GammaJul.ReSharper.EnhancedTooltip.nuspec b/GammaJul.ReSharper.EnhancedTooltip.nuspec
@@ -9,7 +9,7 @@
 		<description>Colorizes the tooltip as well as the parameter information popup.</description>
 		<releaseNotes>
 			**You might have to restart VS TWICE after updating if you were using v1.0.** 
-			Fixed integration into VS2012 integration.
+			Fixed integration into VS2012.
 		</releaseNotes>
 		<projectUrl>https://github.com/MrJul/ReSharper.EnhancedTooltip/</projectUrl>
 		<iconUrl>https://raw.github.com/MrJul/ReSharper.EnhancedTooltip/master/Logo/Logo128.png</iconUrl>
@@ -23,13 +23,11 @@
 
 	<files>
 
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.8.2.dll" target="ReSharper\v8.2\vs11.0\plugins" />
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.Vs11Integration.vsix" target="ReSharper\v8.2\vs11.0\plugins" />
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.Vs11Only.dll" target="ReSharper\v8.2\vs11.0\plugins" />
+		<file src="bin\Release\Vs11\GammaJul.ReSharper.EnhancedTooltip.8.2.dll" target="ReSharper\v8.2\vs11.0\plugins" />
+		<file src="bin\Release\Vs11\GammaJul.ReSharper.EnhancedTooltip.VsIntegration.vsix" target="ReSharper\v8.2\vs11.0\plugins" />
 
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.8.2.dll" target="ReSharper\v8.2\vs12.0\plugins" />
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.Vs12Integration.vsix" target="ReSharper\v8.2\vs12.0\plugins" />
-		<file src="bin\Release\GammaJul.ReSharper.EnhancedTooltip.Vs12Only.dll" target="ReSharper\v8.2\vs12.0\plugins" />
+		<file src="bin\Release\Vs12\GammaJul.ReSharper.EnhancedTooltip.8.2.dll" target="ReSharper\v8.2\vs12.0\plugins" />
+		<file src="bin\Release\Vs12\GammaJul.ReSharper.EnhancedTooltip.VsIntegration.vsix" target="ReSharper\v8.2\vs12.0\plugins" />
 
 	</files>
 

diff --git a/GammaJul.ReSharper.EnhancedTooltip.props b/GammaJul.ReSharper.EnhancedTooltip.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <TargetVsVersion Condition = " '$(TargetVsVersion)' == '' ">12</TargetVsVersion>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Library</OutputType>
@@ -19,14 +20,14 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug\Vs$(TargetVsVersion)</OutputPath>
     <DefineConstants>JET_MODE_ASSERT;DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release</OutputPath>
+    <OutputPath>..\bin\Release\Vs$(TargetVsVersion)</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
@@ -64,6 +65,7 @@
     <Reference Include="Microsoft.VisualStudio.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+	<Reference Include="Microsoft.VisualStudio.ExtensionManager, Version=$(TargetVsVersion).0.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/GammaJul.ReSharper.EnhancedTooltip.sln b/GammaJul.ReSharper.EnhancedTooltip.sln
@@ -9,54 +9,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		GammaJul.ReSharper.EnhancedTooltip.props = GammaJul.ReSharper.EnhancedTooltip.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.8.2", "GammaJul.ReSharper.EnhancedTooltip\GammaJul.ReSharper.EnhancedTooltip.8.2.csproj", "{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.Vs12Only", "GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific\GammaJul.ReSharper.EnhancedTooltip.Vs12Only.csproj", "{D1966C2C-FF11-423E-90C1-749F8F49E9CB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F} = {C181470B-B767-4DED-B3C8-ACEF50AF4D4F}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.Vs11Only", "GammaJul.ReSharper.EnhancedTooltip.VsVersionSpecific\GammaJul.ReSharper.EnhancedTooltip.Vs11Only.csproj", "{DD330CC9-6877-4405-8604-6E2232E0A02F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F} = {C181470B-B767-4DED-B3C8-ACEF50AF4D4F}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.VsIntegration", "GammaJul.ReSharper.EnhancedTooltip.VsIntegration\GammaJul.ReSharper.EnhancedTooltip.VsIntegration.csproj", "{95370CDE-2391-41E3-94CF-D831C7101059}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.Vs12Integration", "GammaJul.ReSharper.EnhancedTooltip.VsIntegration\GammaJul.ReSharper.EnhancedTooltip.Vs12Integration.csproj", "{95370CDE-2391-41E3-94CF-D831C7101059}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D1966C2C-FF11-423E-90C1-749F8F49E9CB} = {D1966C2C-FF11-423E-90C1-749F8F49E9CB}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.Vs11Integration", "GammaJul.ReSharper.EnhancedTooltip.VsIntegration\GammaJul.ReSharper.EnhancedTooltip.Vs11Integration.csproj", "{60E5E070-9839-463F-A142-887658255943}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DD330CC9-6877-4405-8604-6E2232E0A02F} = {DD330CC9-6877-4405-8604-6E2232E0A02F}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GammaJul.ReSharper.EnhancedTooltip.8.2", "GammaJul.ReSharper.EnhancedTooltip\GammaJul.ReSharper.EnhancedTooltip.8.2.csproj", "{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1966C2C-FF11-423E-90C1-749F8F49E9CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1966C2C-FF11-423E-90C1-749F8F49E9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1966C2C-FF11-423E-90C1-749F8F49E9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1966C2C-FF11-423E-90C1-749F8F49E9CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD330CC9-6877-4405-8604-6E2232E0A02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD330CC9-6877-4405-8604-6E2232E0A02F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD330CC9-6877-4405-8604-6E2232E0A02F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD330CC9-6877-4405-8604-6E2232E0A02F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95370CDE-2391-41E3-94CF-D831C7101059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{95370CDE-2391-41E3-94CF-D831C7101059}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95370CDE-2391-41E3-94CF-D831C7101059}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95370CDE-2391-41E3-94CF-D831C7101059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60E5E070-9839-463F-A142-887658255943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60E5E070-9839-463F-A142-887658255943}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60E5E070-9839-463F-A142-887658255943}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60E5E070-9839-463F-A142-887658255943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C181470B-B767-4DED-B3C8-ACEF50AF4D4F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		"%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" Build.targets
		nuget.exe pack GammaJul.ReSharper.EnhancedTooltip.nuspec