Update so that in the .ttinclude files we use %VSnnnCOMNTOOLS% for De…

…v14 and below and $(DevEnvDir) for Dev15.
dotnet · Jul 29, 2016 · 013d453 · divega · Aug 2, 2016 · lajones
1 parent c4dd439
commit 013d453
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj
@@ -49,10 +49,10 @@
     <DelaySign>true</DelaySign>
   </PropertyGroup>
   <PropertyGroup>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='11.0'">VS110COMNTOOLS</VsCommonToolsEnvVarName>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='12.0'">VS120COMNTOOLS</VsCommonToolsEnvVarName>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='14.0'">VS140COMNTOOLS</VsCommonToolsEnvVarName>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='15.0'">VS150COMNTOOLS</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='11.0'">%25VS110COMNTOOLS%25</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='12.0'">%25VS120COMNTOOLS%25</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='14.0'">%25VS140COMNTOOLS%25</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='15.0'">%24(DevEnvDir)</VsCommonToolsEnvVarName>
   </PropertyGroup>
   <Import Project="$(RepositoryRoot)tools\EFToolsVsReferences.settings.targets" />
   <ItemGroup>

diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude
@@ -4,8 +4,8 @@
 <#@ assembly name="System.Xml" #>
 <#@ assembly name="System.Xml.Linq"#>
 <#@ assembly name="EnvDTE"#>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\EntityFramework.dll" #>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\Microsoft.Data.Entity.Design.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\EntityFramework.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\Microsoft.Data.Entity.Design.dll" #>
 <#@ import namespace="System" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.IO" #>

diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude
@@ -4,8 +4,8 @@
 <#@ assembly name="System.Xml" #>
 <#@ assembly name="System.Xml.Linq"#>
 <#@ assembly name="EnvDTE"#>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\EntityFramework.dll" #>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\Microsoft.Data.Entity.Design.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\EntityFramework.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\Microsoft.Data.Entity.Design.dll" #>
 <#@ import namespace="System" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.IO" #>

diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/GenerateTSQL.Utility.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/GenerateTSQL.Utility.ttinclude
@@ -2,11 +2,14 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++
 // NOTE: This include template also requires an assembly
-// reference to %VERSIONED_VSCOMNTOOLS_ENV_VAR%\Microsoft.Data.Entity.Design.DatabaseGeneration.dll
+// reference to %VSnnnCOMNTOOLS% or $(DevEnvDir)\Microsoft.Data.Entity.Design.DatabaseGeneration.dll
 // and a namespace reference to Microsoft.Data.Entity.Design.DatabaseGeneration 
 // in the parent template. Commented-out examples are provided below (replace '!' with '#'):
 // <!@ assembly name="%VS110COMNTOOLS%..\IDE\Microsoft.Data.Entity.Design.DatabaseGeneration.dll" !>
 // <!@ import namespace="Microsoft.Data.Entity.Design.DatabaseGeneration" !>
+// or
+// <!@ assembly name="$(DevEnvDir)Microsoft.Data.Entity.Design.DatabaseGeneration.dll" !>
+// <!@ import namespace="Microsoft.Data.Entity.Design.DatabaseGeneration" !>
 // ++++++++++++++++++++++++++++++++++++++++++++++++++
 #>
 <#@ assembly name="System.Core" #>

diff --git a/src/EFTools/EntityDesign/TextTemplates/SsdlToSql10.tt b/src/EFTools/EntityDesign/TextTemplates/SsdlToSql10.tt
@@ -7,13 +7,13 @@
 // of the SSDL. This T-SQL is compatible with SQL 2012, 2008, 2005, CE, and Azure databases.
 //---------------------------------------------------------------------
 // Note: We will resolve all paths in assembly directives at runtime, taking 
-// macros and environment variables into account (e.g. $(ProjectDir), %VERSIONED_VSCOMNTOOLS_ENV_VAR% etc.)
+// macros and environment variables into account (e.g. $(ProjectDir), VERSIONED_VSCOMNTOOLS_ENV_VAR etc.)
 #>
 <#@ assembly name="System.Core" #>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\Microsoft.Data.Entity.Design.DatabaseGeneration.dll"#>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\EntityFramework.dll"#>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\EntityFramework.SqlServer.dll" #>
-<#@ assembly name="%VERSIONED_VSCOMNTOOLS_ENV_VAR%..\IDE\EntityFramework.SqlServerCompact.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\Microsoft.Data.Entity.Design.DatabaseGeneration.dll"#>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\EntityFramework.dll"#>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\EntityFramework.SqlServer.dll" #>
+<#@ assembly name="VERSIONED_VSCOMNTOOLS_ENV_VAR..\IDE\EntityFramework.SqlServerCompact.dll" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>