Updating pkgdef to look for EF5 DLL in new location and updating version

numbers (note: this will be used for dev14 _only_).
ErikEJ · Nov 4, 2015 · 821b4f3 · 821b4f3
1 parent 08264cc
commit 821b4f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef b/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef
@@ -179,4 +179,4 @@
 "PublicKeyToken"="b77a5c561934e089"
 "Culture"="neutral"
 "Version"="5.0.0.0"
-"CodeBase"="$PackageFolder$\NuGet Packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll"
+"CodeBase"="$RootFolder$Common7\IDE\Extensions\Microsoft\Entity Framework Tools\NuGet Packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll"
diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets
@@ -22,7 +22,7 @@ Project global pre-settings.
     <VersionBuild>0</VersionBuild>
     <VersionRevision>0</VersionRevision>
     <VersionReleasePrefix>3</VersionReleasePrefix>
-    <VersionRelease>$(VersionReleasePrefix)</VersionRelease>
+    <VersionRelease>$(VersionReleasePrefix)-tools-update-1</VersionRelease>
     <VersionReleaseName></VersionReleaseName>
   </PropertyGroup>
 

diff --git a/tools/EntityFramework.targets b/tools/EntityFramework.targets
@@ -61,10 +61,10 @@ Project global post-settings and targets.
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(BuildingToolingProject)' == 'true'">
-    <WixFullProductName_Dev11>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2012</WixFullProductName_Dev11>
-    <WixFullProductName_Dev12>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2013</WixFullProductName_Dev12>
-    <WixFullProductName_Dev14>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2015</WixFullProductName_Dev14>
-    <WixFullProductName_Dev15>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 15</WixFullProductName_Dev15>
+    <WixFullProductName_Dev11>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2012 DO NOT USE</WixFullProductName_Dev11>
+    <WixFullProductName_Dev12>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2013 DO NOT USE</WixFullProductName_Dev12>
+    <WixFullProductName_Dev14>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2015 Update 1</WixFullProductName_Dev14>
+    <WixFullProductName_Dev15>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools Pre-Release for Visual Studio 15 DO NOT USE</WixFullProductName_Dev15>
     <WixProductDescription_Dev11>$(WixFullProductName_Dev11)</WixProductDescription_Dev11>
     <WixProductDescription_Dev12>$(WixFullProductName_Dev12)</WixProductDescription_Dev12>
     <WixProductDescription_Dev14>$(WixFullProductName_Dev14)</WixProductDescription_Dev14>