For VS 15.0: add assembly search paths which are no longer in the GAC…

… and update to v4.5.1 for TargetFramework. cheery-pick from 08b39e0.
ErikEJ · Jan 13, 2016 · 98161ab · 98161ab
1 parent b94de8a
commit 98161ab
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 16 deletions.
diff --git a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>Microsoft.VisualStudio.Data.Tools.Design.XmlCore</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.VisualStudio.Data.Tools.Design.XmlCore</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj
@@ -11,7 +11,7 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design</RootNamespace>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -100,6 +100,7 @@
     <Reference Include="WindowsFormsIntegration" />
     <Reference Include="EnvDte" />
     <Reference Include="EnvDte80" />
+    <Reference Condition="$(VisualStudioVersion)=='15.0'" Include="Microsoft.VisualStudio.Imaging" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />

diff --git a/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj b/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>Microsoft.Data.Entity.Design.BootstrapPackage</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.BootstrapPackage</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <!-- do we need this ?-->
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>

diff --git a/...FTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj b/...FTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>Microsoft.Data.Entity.Design.DataSourceWizardExtension</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.DataSourceWizardExtension</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj b/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj
@@ -11,7 +11,7 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.DatabaseGeneration</RootNamespace>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

diff --git a/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj b/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj
@@ -11,7 +11,7 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.EntityDesigner</RootNamespace>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
     <!-- needed ? can it be public?

diff --git a/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj b/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj
@@ -11,7 +11,7 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.Extensibility</RootNamespace>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

diff --git a/src/EFTools/EntityDesignModel/EntityDesignModel.csproj b/src/EFTools/EntityDesignModel/EntityDesignModel.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>Microsoft.Data.Entity.Design.Model</RootNamespace>
     <AssemblyName>Microsoft.Data.Entity.Design.Model</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <!-- do we need this ?-->
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>

diff --git a/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj b/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>Microsoft.Data.Entity.Design.Package</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <RootNamespace>Microsoft.Data.Entity.Design.Package</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>Resources\File.ico</ApplicationIcon>

diff --git a/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj b/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj
@@ -11,7 +11,7 @@
     <RootNamespace>Microsoft.Data.Entity.Design.VersioningFacade</RootNamespace>
     <AssemblyName>Microsoft.Data.Entity.Design.VersioningFacade</AssemblyName>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/EFTools/XmlCore/XmlCore.csproj b/src/EFTools/XmlCore/XmlCore.csproj
@@ -10,7 +10,7 @@
     <RootNamespace>Microsoft.Data.Tools.XmlDesignerBase</RootNamespace>
     <AssemblyName>Microsoft.Data.Tools.Design.XmlCore</AssemblyName>
     <DocumentationFile>$(OutputPath)$(RootNamespace).xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <!-- do we need this ?-->
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>

diff --git a/test/EFTools/E2ETests/E2ETests.csproj b/test/EFTools/E2ETests/E2ETests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EFDesigner.E2ETests</RootNamespace>
     <AssemblyName>EFDesigner.E2ETests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/test/EFTools/FunctionalTests/FunctionalTests.csproj b/test/EFTools/FunctionalTests/FunctionalTests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EFDesigner.FunctionalTests</RootNamespace>
     <AssemblyName>EFDesigner.FunctionalTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RestorePackages>true</RestorePackages>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

diff --git a/test/EFTools/InProcTests/InProcTests.csproj b/test/EFTools/InProcTests/InProcTests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EFDesigner.InProcTests</RootNamespace>
     <AssemblyName>EFDesigner.InProcTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/test/EFTools/TestInfrastructure/TestInfrastructure.csproj b/test/EFTools/TestInfrastructure/TestInfrastructure.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EFDesigner.TestInfrastructure</RootNamespace>
     <AssemblyName>EFDesigner.TestInfrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/test/EFTools/UnitTests/UnitTests.csproj b/test/EFTools/UnitTests/UnitTests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTests</RootNamespace>
     <AssemblyName>EFDesigner.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RestorePackages>true</RestorePackages>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets
@@ -24,6 +24,8 @@ Project global pre-settings.
     <VersionReleasePrefix>3</VersionReleasePrefix>
     <VersionRelease>$(VersionReleasePrefix)</VersionRelease>
     <VersionReleaseName></VersionReleaseName>
+    <ToolingDotNetFrameworkVersion Condition="'$(VisualStudioVersion)' == '15.0'">v4.5.1</ToolingDotNetFrameworkVersion>
+    <ToolingDotNetFrameworkVersion Condition="'$(VisualStudioVersion)' != '15.0'">v4.5</ToolingDotNetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/tools/EntityFramework.targets b/tools/EntityFramework.targets
@@ -38,6 +38,19 @@ Project global post-settings and targets.
     </AssemblySearchPaths>
   </PropertyGroup>
 
+  <!-- For VisualStudioVersion 15.0 the VS installation no longer adds the VS dirs to the
+       assembly search paths via the GAC so need to add the following search paths to support
+       references to Microsoft.VSDesigner, Microsoft.VisualStudio.XmlEditor and
+       Microsoft.VisualStudio.Modeling.* DLLs -->
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'" >
+    <AssemblySearchPaths>
+      $(VS150COMNTOOLS)\..\..\Common7\IDE;
+      $(VS150COMNTOOLS)\..\..\Common7\IDE\Xml;
+      $(VS150COMNTOOLS)\..\..\Common7\IDE\PrivateAssemblies;
+      $(AssemblySearchPaths)
+    </AssemblySearchPaths>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!--Force a rebuild if this file is changed -->
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>