diff --git a/NuGet.config b/NuGet.config index 4e27eeb09..e1915e330 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,13 @@ + + + @@ -18,8 +21,11 @@ + + + @@ -38,11 +44,16 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adb9cdacf..9aae3e4fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + 6c37c986b6c8fc0669b38a03a03445a75b8227a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e diff --git a/eng/Versions.props b/eng/Versions.props index 1b8dcefd5..bfb1bd98e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.2-servicing.24068.3 + 8.0.5-servicing.24217.4 - 8.0.2-servicing.24068.6 + 8.0.5-servicing.24217.2 @@ -66,22 +66,22 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.5 + 8.0.5 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 0.2.0 - 8.0.300-preview.24218.5 - 8.0.300-preview.24218.5 - 8.0.300-preview.24218.5 + 8.0.300 + 8.0.300-rtm.24223.20 + 8.0.300-rtm.24223.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,24 +92,24 @@ - 8.0.2-servicing.24067.11 + 8.0.5-servicing.24216.15 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24216.15 + 8.0.5-servicing.24216.15 + 8.0.5 + 8.0.5 + 8.0.5 + 8.0.5 2.1.0 - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24217.5 + 8.0.5-servicing.24217.5 + 8.0.5 + 8.0.5 @@ -213,7 +213,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))