Changed the debugger package generation

build/Targets/Dependencies.props

@@ -25,8 +25,8 @@
     <MicrosoftDiaSymReaderPortablePdbVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftNETCoreRuntimeCoreCLRVersion>1.1.0</MicrosoftNETCoreRuntimeCoreCLRVersion>
     <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
-    <MicrosoftVisualStudioDebuggerEngineVersion>15.0.25824-RC</MicrosoftVisualStudioDebuggerEngineVersion>
-    <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.25824-RC</MicrosoftVisualStudioDebuggerMetadataVersion>
+    <MicrosoftVisualStudioDebuggerEngineVersion>15.0.26201-alpha</MicrosoftVisualStudioDebuggerEngineVersion>
+    <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.26201-alpha</MicrosoftVisualStudioDebuggerMetadataVersion>
     <MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
     <MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
     <MicrosoftVSSDKBuildToolsVersion>15.0.26124-RC3</MicrosoftVSSDKBuildToolsVersion>

src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj

@@ -22,10 +22,10 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Engine\15.0.25824-RC\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Engine.dll">
+    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Engine\$(MicrosoftVisualStudioDebuggerEngineVersion)\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Engine.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Metadata\15.0.25824-RC\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Metadata.dll">
+    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Metadata\$(MicrosoftVisualStudioDebuggerMetadataVersion)\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Metadata.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -33,4 +33,4 @@
     <Exec Command="&quot;$(FakeSignToolPath)&quot; -f &quot;$(OutDir)%(Content.Filename)%(Extension)&quot;" />
   </Target>
   <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>

src/Tools/GenerateSdkPackages/change-all.ps1

@@ -31,7 +31,8 @@ try {
     }
 
     $changeFilePath = [IO.Path]::GetTempFileName()
-    $changeList | out-file $changeFilePath
+    $changeList -join [Environment]::NewLine | out-file $changeFilePath
+    write-host (gc -raw $changeFilePath)
 
     $fullSln = join-path $rootPath "..\Roslyn.sln"
     if (test-path $fullSln) {

src/Tools/GenerateSdkPackages/engine.nuspec

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

src/Tools/GenerateSdkPackages/make-all.ps1

@@ -24,38 +24,41 @@ function package-normal() {
     & $nuget pack $baseNuspecPath -OutputDirectory $packagePath -Properties name=$simpleName`;version=$packageVersion`;filePath=$filePath
 }
 
-# Used to package Microsoft.VisualStudio.Debugger.Engine
-function package-engine() {
+# The debugger DLLs have a more complex structure and it's easier to special case
+# copying them over.
+function copy-debugger() { 
     $refRootPath = [IO.Path]::GetFullPath((join-path $dropPath "..\..\Debugger\ReferenceDLL"))
-    $engineDllPath = join-path $dllPath "engine"
-    $engineNespecPath = join-path $PSScriptRoot "engine.nuspec"
-    mkdir $engineDllPath -ErrorAction SilentlyContinue | out-null
-    cp -fo -re $refRootPath $engineDllPath
-    pushd $engineDllPath
+    $debuggerDllPath = join-path $dllPath "debugger"
+    $net20Path = join-path $debuggerDllPath "net20"
+    $net45Path = join-path $debuggerDllPath "net45"
+    $portablePath = join-path $debuggerDllPath "portable"
+
+    mkdir $debuggerDllPath -ErrorAction SilentlyContinue | out-null
+    mkdir $net20Path -ErrorAction SilentlyContinue | out-null
+    mkdir $net45Path -ErrorAction SilentlyContinue | out-null
+    mkdir $portablePath -ErrorAction SilentlyContinue | out-null
+
+    pushd $debuggerDllPath
     try {
+        $d = join-path $dropPath "..\..\Debugger"
+        cp (join-path $d "RemoteDebugger\Microsoft.VisualStudio.Debugger.Engine.dll") $net20Path
+        cp (join-path $d "IDE\Microsoft.VisualStudio.Debugger.Engine.dll") $net45Path
+        cp (join-path $d "x-plat\coreclr.windows\mcg\Microsoft.VisualStudio.Debugger.Engine.dll") $portablePath
+        cp (join-path $dropPath "Microsoft.VisualStudio.Debugger.Metadata.dll") $net20Path
+        cp (join-path $dropPath "Microsoft.VisualStudio.Debugger.Metadata.dll") $portablePath
         gci -re -in *.dll | %{ & $fakeSign -f $_ }
-        & $nuget pack $engineNespecPath -OutputDirectory $packagePath -Properties version=$packageVersion`;enginePath=$engineDllPath
     }
     finally {
         popd
     }
 }
 
-# Used to package Microsoft.VisualStudio.Debugger.Metadata
-function package-metadata() {
-    $refRootPath = [IO.Path]::GetFullPath((join-path $dropPath "..\..\Debugger\ReferenceDLL"))
-    $metadataDllPath = join-path $dllPath "metadata"
-    $metadataNespecPath = join-path $PSScriptRoot "metadata.nuspec"
-    mkdir $metadataDllPath -ErrorAction SilentlyContinue | out-null
-    cp -fo -re $refRootPath $metadataDllPath
-    pushd $metadataDllPath
-    try {
-        gci -re -in *.dll | %{ & $fakeSign -f $_ }
-        & $nuget pack $metadataNespecPath -OutputDirectory $packagePath -Properties version=$packageVersion`;metadataPath=$metadataDllPath
-    }
-    finally {
-        popd
-    }
+# Used to package debugger nugets
+function package-debugger() {
+    param( [string]$kind )
+    $debuggerPath = join-path $dllPath "debugger"
+    $nuspecPath = join-path $PSScriptRoot "$kind.nuspec"
+    & $nuget pack $nuspecPath -OutputDirectory $packagePath -Properties version=$packageVersion`;debuggerPath=$debuggerPath
 }
 
 try {
@@ -87,13 +90,15 @@ try {
     mkdir $packagePath -ErrorAction SilentlyContinue | out-null
     pushd $outPath
     try {
+        copy-debugger
+
         foreach ($item in $list) {
             $name = split-path -leaf $item
             $simpleName = [IO.Path]::GetFileNameWithoutExtension($name) 
             write-host "Packing $simpleName"
             switch ($simpleName) {
-                "Microsoft.VisualStudio.Debugger.Engine" { package-engine }
-                "Microsoft.VisualStudio.Debugger.Metadata" { package-metadata }
+                "Microsoft.VisualStudio.Debugger.Engine" { package-debugger "engine" }
+                "Microsoft.VisualStudio.Debugger.Metadata" { package-debugger "metadata" }
                 default { package-normal }
             }
         }

src/Tools/GenerateSdkPackages/metadata.nuspec

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