From 98161ab62ec0bbd77fe9a3c301d0d36016e0c9de Mon Sep 17 00:00:00 2001 From: lajones Date: Tue, 5 Jan 2016 15:13:15 -0800 Subject: [PATCH] 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 08b39e0358c0fbe951cff42efd3493d532d46d1a. --- src/EFTools/DesignXmlCore/DesignXmlCore.csproj | 2 +- src/EFTools/EntityDesign/EntityDesign.csproj | 3 ++- .../EntityDesignBootstrapPackage.csproj | 2 +- .../EntityDesignDataSourceWizardExtension.csproj | 2 +- .../EntityDesignDatabaseGeneration.csproj | 2 +- .../EntityDesigner.csproj | 2 +- .../EntityDesignExtensibility.csproj | 2 +- .../EntityDesignModel/EntityDesignModel.csproj | 2 +- .../EntityDesignPackage/EntityDesignPackage.csproj | 2 +- .../EntityDesignerVersioningFacade.csproj | 2 +- src/EFTools/XmlCore/XmlCore.csproj | 2 +- test/EFTools/E2ETests/E2ETests.csproj | 2 +- test/EFTools/FunctionalTests/FunctionalTests.csproj | 2 +- test/EFTools/InProcTests/InProcTests.csproj | 2 +- .../TestInfrastructure/TestInfrastructure.csproj | 2 +- test/EFTools/UnitTests/UnitTests.csproj | 2 +- tools/EntityFramework.settings.targets | 2 ++ tools/EntityFramework.targets | 13 +++++++++++++ 18 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj index 547329b6f7..c3fb1cae10 100644 --- a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj +++ b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj @@ -10,7 +10,7 @@ Microsoft.VisualStudio.Data.Tools.Design.XmlCore $(OutputPath)$(AssemblyName).xml Microsoft.VisualStudio.Data.Tools.Design.XmlCore - v4.5 + $(ToolingDotNetFrameworkVersion) false 512 diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj index b0d3cdcf3a..a478927058 100644 --- a/src/EFTools/EntityDesign/EntityDesign.csproj +++ b/src/EFTools/EntityDesign/EntityDesign.csproj @@ -11,7 +11,7 @@ $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design false - v4.5 + $(ToolingDotNetFrameworkVersion) false 512 @@ -100,6 +100,7 @@ + diff --git a/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj b/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj index 7a0faca801..97ac79e95c 100644 --- a/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj +++ b/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj @@ -12,7 +12,7 @@ Microsoft.Data.Entity.Design.BootstrapPackage $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.BootstrapPackage - v4.5 + $(ToolingDotNetFrameworkVersion) 512 false diff --git a/src/EFTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj b/src/EFTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj index 8e2c2890f4..ec54830f6e 100644 --- a/src/EFTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj +++ b/src/EFTools/EntityDesignDataSourceWizardExtension/EntityDesignDataSourceWizardExtension.csproj @@ -10,7 +10,7 @@ Microsoft.Data.Entity.Design.DataSourceWizardExtension $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.DataSourceWizardExtension - v4.5 + $(ToolingDotNetFrameworkVersion) 512 diff --git a/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj b/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj index 91ee1839b2..02c9ba162e 100644 --- a/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj +++ b/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj @@ -11,7 +11,7 @@ $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.DatabaseGeneration false - v4.5 + $(ToolingDotNetFrameworkVersion) false 512 diff --git a/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj b/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj index b9dd9ff0c4..4e1e2d5be5 100644 --- a/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj +++ b/src/EFTools/EntityDesignEntityDesigner/EntityDesigner.csproj @@ -11,7 +11,7 @@ $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.EntityDesigner false - v4.5 + $(ToolingDotNetFrameworkVersion) false 512 false diff --git a/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj b/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj index e5f6aeffce..499687332d 100644 --- a/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj +++ b/src/EFTools/EntityDesignPackage/EntityDesignPackage.csproj @@ -10,7 +10,7 @@ Microsoft.Data.Entity.Design.Package $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.Package - v4.5 + $(ToolingDotNetFrameworkVersion) false 512 Resources\File.ico diff --git a/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj b/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj index bf9f5073ea..542178973f 100644 --- a/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj +++ b/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj @@ -11,7 +11,7 @@ Microsoft.Data.Entity.Design.VersioningFacade Microsoft.Data.Entity.Design.VersioningFacade $(OutputPath)$(AssemblyName).xml - v4.5 + $(ToolingDotNetFrameworkVersion) 512 diff --git a/src/EFTools/XmlCore/XmlCore.csproj b/src/EFTools/XmlCore/XmlCore.csproj index 1684005e97..861b16451d 100644 --- a/src/EFTools/XmlCore/XmlCore.csproj +++ b/src/EFTools/XmlCore/XmlCore.csproj @@ -10,7 +10,7 @@ Microsoft.Data.Tools.XmlDesignerBase Microsoft.Data.Tools.Design.XmlCore $(OutputPath)$(RootNamespace).xml - v4.5 + $(ToolingDotNetFrameworkVersion) 512 false diff --git a/test/EFTools/E2ETests/E2ETests.csproj b/test/EFTools/E2ETests/E2ETests.csproj index 4dc5f7a248..a81c7e8d26 100644 --- a/test/EFTools/E2ETests/E2ETests.csproj +++ b/test/EFTools/E2ETests/E2ETests.csproj @@ -9,7 +9,7 @@ Properties EFDesigner.E2ETests EFDesigner.E2ETests - v4.5 + $(ToolingDotNetFrameworkVersion) 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 diff --git a/test/EFTools/FunctionalTests/FunctionalTests.csproj b/test/EFTools/FunctionalTests/FunctionalTests.csproj index c88f626100..51de9aba1a 100644 --- a/test/EFTools/FunctionalTests/FunctionalTests.csproj +++ b/test/EFTools/FunctionalTests/FunctionalTests.csproj @@ -10,7 +10,7 @@ Properties EFDesigner.FunctionalTests EFDesigner.FunctionalTests - v4.5 + $(ToolingDotNetFrameworkVersion) 512 true ..\..\..\ diff --git a/test/EFTools/InProcTests/InProcTests.csproj b/test/EFTools/InProcTests/InProcTests.csproj index e06567cb9d..5cedf259ee 100644 --- a/test/EFTools/InProcTests/InProcTests.csproj +++ b/test/EFTools/InProcTests/InProcTests.csproj @@ -9,7 +9,7 @@ Properties EFDesigner.InProcTests EFDesigner.InProcTests - v4.5 + $(ToolingDotNetFrameworkVersion) 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 diff --git a/test/EFTools/TestInfrastructure/TestInfrastructure.csproj b/test/EFTools/TestInfrastructure/TestInfrastructure.csproj index 70bc90220f..b610fa24ca 100644 --- a/test/EFTools/TestInfrastructure/TestInfrastructure.csproj +++ b/test/EFTools/TestInfrastructure/TestInfrastructure.csproj @@ -10,7 +10,7 @@ Properties EFDesigner.TestInfrastructure EFDesigner.TestInfrastructure - v4.5 + $(ToolingDotNetFrameworkVersion) 512 diff --git a/test/EFTools/UnitTests/UnitTests.csproj b/test/EFTools/UnitTests/UnitTests.csproj index f56398ff95..9317b6b77c 100644 --- a/test/EFTools/UnitTests/UnitTests.csproj +++ b/test/EFTools/UnitTests/UnitTests.csproj @@ -10,7 +10,7 @@ Properties UnitTests EFDesigner.UnitTests - v4.5 + $(ToolingDotNetFrameworkVersion) 512 true ..\..\..\ diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets index 9e74140571..323aa79b2b 100644 --- a/tools/EntityFramework.settings.targets +++ b/tools/EntityFramework.settings.targets @@ -24,6 +24,8 @@ Project global pre-settings. 3 $(VersionReleasePrefix) + v4.5.1 + v4.5 diff --git a/tools/EntityFramework.targets b/tools/EntityFramework.targets index a812219192..152c8217a9 100644 --- a/tools/EntityFramework.targets +++ b/tools/EntityFramework.targets @@ -38,6 +38,19 @@ Project global post-settings and targets. + + + + $(VS150COMNTOOLS)\..\..\Common7\IDE; + $(VS150COMNTOOLS)\..\..\Common7\IDE\Xml; + $(VS150COMNTOOLS)\..\..\Common7\IDE\PrivateAssemblies; + $(AssemblySearchPaths) + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath)