diff --git a/NuGet.config b/NuGet.config index 2f3134c25..49478e17d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,20 @@ - - + - - - - + - - + - - + @@ -47,21 +41,17 @@ - - + - - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 272ad70a8..b04700e60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca8b53290abed6b00ae7a9cc331fbc69bc06026c + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e99084eedfdb1a3d2d99951ae0748c2b5f468358 + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 + d0deccaa5039ef510feef0dbb63a63dcc88112f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efb0c52f5d3c51b39af3b6021a50af178daea2e + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efb0c52f5d3c51b39af3b6021a50af178daea2e + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4c9c993698c298801739cd2dc25efa7ffe700bde + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 823450756bc26a13c44a96ea190c46a77c526e04 + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - f472bde6484a7b860c6647cf2ac64fd2870853e0 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 61a36038f..c3c5ea3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23463.14 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23463.7 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23463.13 - 6.0.23-servicing.23463.13 - 6.0.23-servicing.23463.13 - 6.0.23-servicing.23463.13 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.123-servicing.23469.16 - 6.0.123-servicing.23469.16 + 6.0.123-servicing.23480.40 + 6.0.123-servicing.23480.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23463.4 - 6.0.23-servicing.23463.4 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23463.6 - 6.0.23-servicing.23463.6 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.122 + 6.0.123 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.23 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c832b0941..20e7bdc4c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.122" + "dotnet": "6.0.123" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",