diff --git a/Directory.Packages.props b/Directory.Packages.props index cc7fa6af5d90..d5297e461e7a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,6 +83,7 @@ + diff --git a/NuGet.config b/NuGet.config index 0f4182d95ce2..d7929a36c750 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,32 +4,13 @@ - - - - - - - - - - + - - - - - - - - - - + - - + @@ -42,12 +23,12 @@ + - @@ -61,16 +42,7 @@ - - - - - - - - - - + @@ -102,18 +74,18 @@ - - + + - + @@ -121,16 +93,7 @@ - - - - - - - - - - + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 4f5e6e87f3f0..6c6fb078ba7c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -35,6 +35,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b5bf1179e77..87619aa62574 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ edd31f7a612db9a8d37df41d35137a0459e7a0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://github.com/dotnet/emsdk - e92f92efe5854b6fe013787830b59166cb9b4ed9 + d6672570f0fde2a4a3c7e65d60cec9f8406b039c https://github.com/dotnet/msbuild @@ -77,47 +77,47 @@ 05af489c957d1846f60b2e6b40df3841c0f1cfa6 - - https://github.com/dotnet/format - 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad + + https://dev.azure.com/dnceng/internal/_git/dotnet-format + 86f5186deeea364bd8541d51657e52a54b2a96b2 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - - https://github.com/dotnet/roslyn - 5a06a4caf73c5b086776763ebbee36c9b51c515e + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + b4e5d1dde7212b8c1636632220682ca40bed90b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://github.com/nuget/nuget.client @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -212,6 +212,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 81cabf2857a01351e5ab578947c7403a5b128ad1 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -224,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 883fc207bb50622d4458ff09ae6a62548783826a + e84ed744bb7989299c544f715056d05e220c7e00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://github.com/dotnet/razor @@ -302,21 +306,21 @@ https://github.com/dotnet/razor 8b1b103ae8587094180fd43303622205c83e2f71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://github.com/dotnet/xdt @@ -397,19 +401,19 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -417,13 +421,13 @@ 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -433,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -461,21 +465,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -504,9 +508,9 @@ https://github.com/dotnet/arcade 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index b47dbb2bf8b2..b8bf8d544da0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 4.3.0 4.3.0 4.0.5 - 8.0.0 + 8.0.1 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -51,35 +51,36 @@ - 8.0.8 - 8.0.8-servicing.24366.12 - 8.0.8 + 8.0.10 + 8.0.10-servicing.24466.10 + 8.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.1 - 8.0.8 - 8.0.8-servicing.24366.12 + 8.0.2 + 8.0.10 + 8.0.10-servicing.24466.10 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0 - 8.0.1 - 8.0.0 - 8.0.8 + 8.0.1 + 8.0.2 + 8.0.1 + 8.0.10 8.0.0 8.0.0 - 8.0.8 + 8.0.10 8.0.0 8.0.0 8.0.0 8.0.0 8.0.0 8.0.0 - 8.0.0 + 8.0.1 + 8.0.1 8.0.7 - 8.0.0 - 8.0.1 + 8.0.1 + 8.0.2 8.0.0 - 8.0.0 - 8.0.4 + 8.0.1 + 8.0.5 8.0.0 8.0.1 @@ -114,7 +115,7 @@ - 8.3.536002 + 8.3.546805 @@ -157,24 +158,24 @@ - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 - 4.11.0-3.24504.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 + 4.11.0-3.24468.6 $(MicrosoftNetCompilersToolsetPackageVersion) - 8.0.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8 + 8.0.10 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10 @@ -184,7 +185,7 @@ - 8.0.8-servicing.24366.7 + 8.0.10-servicing.24468.10 @@ -228,7 +229,7 @@ - 8.0.8 + 8.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))