diff --git a/build/Targets/VSL.Settings.targets b/build/Targets/VSL.Settings.targets index e6a1a4aa9020f..41143b3d23577 100644 --- a/build/Targets/VSL.Settings.targets +++ b/build/Targets/VSL.Settings.targets @@ -15,7 +15,7 @@ Microsoft.Net.Compilers $(NuGetPackageRoot)\Microsoft.Net.Compilers\1.1.0-beta1-20150727-01\build\Microsoft.Net.Compilers.props - $(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150814-01\build\Microsoft.Net.RoslynDiagnostics.props + $(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150818-01\build\Microsoft.Net.RoslynDiagnostics.props $(AdditionalFileItemNames);PublicAPI diff --git a/build/ToolsetPackages/project.json b/build/ToolsetPackages/project.json index 604fc211f9b43..150620299a500 100644 --- a/build/ToolsetPackages/project.json +++ b/build/ToolsetPackages/project.json @@ -4,7 +4,7 @@ "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150817-01", "Microsoft.DiaSymReader.Native": "1.1.0-alpha2", "Microsoft.Net.Compilers": "1.1.0-beta1-20150727-01", - "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150814-01", + "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150818-01", "FakeSign": "0.9.2", "xunit": "1.9.2", "xunit.runner.console": "2.1.0-beta4-build3109", diff --git a/build/ToolsetPackages/project.lock.json b/build/ToolsetPackages/project.lock.json index 0d1513b9f2fe7..a57bd6f82982f 100644 --- a/build/ToolsetPackages/project.lock.json +++ b/build/ToolsetPackages/project.lock.json @@ -31,7 +31,7 @@ }, "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {}, "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {}, - "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {}, + "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {}, "Microsoft.Tpl.Dataflow/4.5.24": { "compile": { "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} @@ -85,7 +85,7 @@ } }, "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {}, - "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {}, + "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {}, "Microsoft.Tpl.Dataflow/4.5.24": { "compile": { "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} @@ -1036,15 +1036,15 @@ "tools/VBCSCompiler.exe.config" ] }, - "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": { - "sha512": "ZsPiNo4TIlamP3VDJ7f+PzfLM2MwlQPW29Lm4gNn7j3EZvS2wu5RapJe6Edpz2OuFyZSq0U9NvNHmgM9I7W9Og==", + "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": { + "sha512": "gKMS7pSOjXejP+S3+pAIShKYOyfneRRZGowDiEGZDHPUZqaof7ccmFkXxWMyTy2hV00exSBqNeRZDL4IpJxuCQ==", "type": "Package", "files": [ "[Content_Types].xml", "_rels/.rels", "build/Microsoft.Net.RoslynDiagnostics.props", "Microsoft.Net.RoslynDiagnostics.nuspec", - "package/services/metadata/core-properties/e01abf88844b465fabea2ac7ad8c8ffb.psmdcp", + "package/services/metadata/core-properties/433dcdf8a06f4dcb806e4f7f93ed8bf2.psmdcp", "ThirdPartyNotices.rtf", "tools/Roslyn.Diagnostics.Analyzers.CSharp.dll", "tools/Roslyn.Diagnostics.Analyzers.dll", @@ -1130,7 +1130,7 @@ "Microsoft.CodeAnalysis.Test.Resources.Proprietary >= 1.1.0-beta1-20150817-01", "Microsoft.DiaSymReader.Native >= 1.1.0-alpha2", "Microsoft.Net.Compilers >= 1.1.0-beta1-20150727-01", - "Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150814-01", + "Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150818-01", "xunit >= 1.9.2", "xunit.runner.console >= 2.1.0-beta4-build3109", "xunit.runners >= 2.0.0-alpha-build2576" diff --git a/cibuild.sh b/cibuild.sh index e1f7679dc35de..ecb20178dc1fa 100755 --- a/cibuild.sh +++ b/cibuild.sh @@ -79,7 +79,7 @@ restore_nuget() { acquire_sem_or_wait "restore_nuget" - local package_name="nuget.14.zip" + local package_name="nuget.15.zip" local target="/tmp/$package_name" echo "Installing NuGet Packages $target" if [ -f $target ]; then diff --git a/docs/infrastructure/mono-toolset.md b/docs/infrastructure/mono-toolset.md index d33255b77b0cf..676929923ce20 100644 --- a/docs/infrastructure/mono-toolset.md +++ b/docs/infrastructure/mono-toolset.md @@ -34,9 +34,11 @@ The cross platform restore works by downloading the contents of the packages dir This is done by executing the following on a Windows box. - Change to the root of the enlistment. - - Delete the contents of the package directory. - - Run .nuget/NuGetRestore.ps1 - - Zip the packages directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number) + - delete the contents of the `~\.nuget\packages` + - Run + - `.\nuget.exe restore Roslyn.sln` + - `.\nuget.exe restore build\ToolsetPackages\project.json` + - Zip the `~\.nuget` directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number) - Use [azcopy](https://azure.microsoft.com/en-us/documentation/articles/storage-use-azcopy) to upload to https://dotnetci.blob.core.windows.net/roslyn - Change cibuild.sh to reference the new package.