diff --git a/NuGet.config b/NuGet.config index dd632b04b..7b4f90a94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,13 +42,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95730dc2c..8849d0ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 080b813fcf9f2417d6f0d50a6853d1b71034482b + b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 6c7f38c614304c93cd392907df7d5e770d5cf7f1 + 60d640a5c1025d1e9e89188cabe41e692d0f5468 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index a2f52497e..d3893f5c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23364.6 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23364.5 - 6.0.120 + 6.0.121 @@ -44,20 +44,20 @@ - 6.0.20 - 6.0.20 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 - 6.0.20-servicing.23321.6 + 6.0.21 + 6.0.21 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 + 6.0.21-servicing.23364.38 0.2.0 - 6.0.120-servicing.23322.14 - 6.0.120-servicing.23322.14 + 6.0.121-servicing.23367.13 + 6.0.121-servicing.23367.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 + 6.0.21 + 6.0.21 2.1.0 - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.120 + 6.0.121 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.20 + 6.0.21 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - -