Merge pull request #21007 from tmat/DebuggerPackages

Update Debugger nuspecs

src/Tools/GenerateSdkPackages/README.md

@@ -16,8 +16,12 @@ to make the packages for the build.
 > .\make-all.ps1 -version "26418.00" -branch "d15prerel"  -outpath c:\users\jaredpar\temp\nuget
 ```
 
-This will create all of the packages with the version string 15.0.26418-alpha.  Next the build needs to be updated 
-to reflect this change in version for the packages we are consuming. 
+This will create all of the packages with the version string 15.0.26418-alpha.
+
+When building packages from a non-release branch (e.g. vsucorediag) use ```-versionSuffix branch-name``` to avoid potential 
+conflicts with release branch versions.
+
+Next the build needs to be updated to reflect this change in version for the packages we are consuming. 
 
 ``` powershell
 > .\change-all.ps1 -version "26418.00" 

src/Tools/GenerateSdkPackages/engine.nuspec

@@ -17,8 +17,8 @@
     <tags>VSSDK</tags>
   </metadata>
   <files>
-    <file src="$debuggerPath$\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll" target="lib\net20" />
-    <file src="$debuggerPath$\v4.5\Microsoft.VisualStudio.Debugger.Engine.dll" target="lib\net45" />
-    <file src="$debuggerPath$\portable\Microsoft.VisualStudio.Debugger.Engine.dll" target="lib\portable-net45+win8" />
+    <file src="$debuggerPath$\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll" target="ref\net20" />
+    <file src="$debuggerPath$\v4.5\Microsoft.VisualStudio.Debugger.Engine.dll" target="ref\net45" />
+    <file src="$debuggerPath$\portable\Microsoft.VisualStudio.Debugger.Engine.dll" target="ref\netstandard1.3" />
   </files>
 </package>

src/Tools/GenerateSdkPackages/make-all.ps1

@@ -2,7 +2,8 @@
 param(
     [string]$version = "26606.00",
     [string]$branch = "d15rel",
-    [string]$outPath = $null
+    [string]$outPath = $null,
+    [string]$versionSuffix = "alpha"
 )
 
 Set-StrictMode -version 2.0
@@ -55,7 +56,7 @@ try {
     $fakeSign = Join-Path (Get-PackageDir "FakeSign") "Tools\FakeSign.exe"
 
     $shortVersion = $version.Substring(0, $version.IndexOf('.'))
-    $packageVersion = "15.0.$shortVersion-alpha"
+    $packageVersion = "15.0.$shortVersion-$versionSuffix"
     $dllPath = Join-Path $outPath "Dlls"
     $packagePath = Join-Path $outPath "Packages"
 

src/Tools/GenerateSdkPackages/metadata.nuspec

@@ -17,7 +17,7 @@
     <tags>VSSDK</tags>
   </metadata>
   <files>
-    <file src="$debuggerPath$\v2.0\Microsoft.VisualStudio.Debugger.Metadata.dll" target="lib\net20" />
-    <file src="$debuggerPath$\portable\Microsoft.VisualStudio.Debugger.Metadata.dll" target="lib\portable-net45+win8" />
+    <file src="$debuggerPath$\v2.0\Microsoft.VisualStudio.Debugger.Metadata.dll" target="ref\net20" />
+    <file src="$debuggerPath$\portable\Microsoft.VisualStudio.Debugger.Metadata.dll" target="ref\netstandard1.3" />
   </files>
 </package>