diff --git a/build/Targets/Dependencies.props b/build/Targets/Dependencies.props
index 0d05da218b12894b60fce93002bf5707e2789938..01001dffd5874db2e68b5502ada3b1a96790ab2d 100644
--- a/build/Targets/Dependencies.props
+++ b/build/Targets/Dependencies.props
@@ -25,8 +25,8 @@
1.2.0
1.1.0
10.1.0
- 15.0.25824-RC
- 15.0.25824-RC
+ 15.0.26201-alpha
+ 15.0.26201-alpha
2.0.0-rc3-61304-01
2.0.0-rc3-61304-01
15.0.26124-RC3
diff --git a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
index 8c4d9e05558aa9b700a68ca67ab7ef48e942a047..1e7ce8fbf00f3287a2b7d9c7ce599a4ee6b4fb4a 100644
--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
@@ -22,10 +22,10 @@
-
+
PreserveNewest
-
+
PreserveNewest
@@ -33,4 +33,4 @@
-
\ No newline at end of file
+
diff --git a/src/Tools/GenerateSdkPackages/change-all.ps1 b/src/Tools/GenerateSdkPackages/change-all.ps1
index b51e8569b60d5926528aee1d7bdee406f7dff596..d1553c885180f9807849dd849cf3f9de1fe8c993 100644
--- a/src/Tools/GenerateSdkPackages/change-all.ps1
+++ b/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) {
diff --git a/src/Tools/GenerateSdkPackages/engine.nuspec b/src/Tools/GenerateSdkPackages/engine.nuspec
index 57746dda33f631e91a2dcbaaf4cb07f81570f736..5925d34d4657a62943142789f41d2015c8ad8167 100644
--- a/src/Tools/GenerateSdkPackages/engine.nuspec
+++ b/src/Tools/GenerateSdkPackages/engine.nuspec
@@ -17,8 +17,8 @@
VSSDK
-
-
-
+
+
+
diff --git a/src/Tools/GenerateSdkPackages/make-all.ps1 b/src/Tools/GenerateSdkPackages/make-all.ps1
index b656bf78907e7574ea7a7220f3af7ba246c7da19..5724959b6b96ee54e35c40de6f6fd0cbbab688c0 100644
--- a/src/Tools/GenerateSdkPackages/make-all.ps1
+++ b/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 }
}
}
diff --git a/src/Tools/GenerateSdkPackages/metadata.nuspec b/src/Tools/GenerateSdkPackages/metadata.nuspec
index b295933d7fd1077bde564b7442c428d66357fc16..3f4d9fd992201adeb034bd076eff57a2d74a838f 100644
--- a/src/Tools/GenerateSdkPackages/metadata.nuspec
+++ b/src/Tools/GenerateSdkPackages/metadata.nuspec
@@ -17,7 +17,7 @@
VSSDK
-
-
+
+