From f326414f09ecb6860e7ff2a0d43d6b5d78c00a95 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Jul 2023 11:50:32 -0500 Subject: [PATCH 01/31] Update MissingXmlDoc baseline (#16959) --- .../assets/baselines/MissingXmlDoc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From d1ab1020fd88070368bfcfcfa975b52091d3a22a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 12 Jul 2023 18:35:57 +0000 Subject: [PATCH 02/31] Update dependencies from https://github.com/dotnet/arcade build 20230711.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23313.5 -> To Version 6.0.0-beta.23361.3 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3453596a3..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 690e7b881..a1ef1a795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a37934b0e..f352cdb4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 diff --git a/global.json b/global.json index 31e65ea4d..3364ad030 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.119", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" } } From 5677e50878182bde36577e3a6c005179ad3dc210 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:53:44 -0700 Subject: [PATCH 03/31] [release/6.0.1xx] Update dependencies from dotnet/arcade (#16969) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index f47da0a6e..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cfaae8dd..95730dc2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2de3d47ba..e7d31888f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 diff --git a/global.json b/global.json index 31e65ea4d..3364ad030 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.119", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" } } From 5db1934e433f8bb48e2c20a1a4691025406ff70b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:05:29 +0000 Subject: [PATCH 04/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.120-servicing.23322.14 -> To Version 6.0.121-servicing.23364.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..0b20f805d 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..0017d06b3 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 + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + 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 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f 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 + f46a9672ea5b9c9fc5e40f9b0ca405664115394c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 + f46a9672ea5b9c9fc5e40f9b0ca405664115394c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea 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 e7d31888f..d6d900ba1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 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.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.120-servicing.23322.14 - 6.0.120-servicing.23322.14 + 6.0.121-servicing.23364.11 + 6.0.121-servicing.23364.11 $(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.23364.1 + 6.0.21-servicing.23364.1 + 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) From ed642f02d8315fdbb5e5912fc81ac11fd2951a4f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:05:58 +0000 Subject: [PATCH 05/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.315-servicing.23322.16 -> To Version 6.0.316-servicing.23364.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..e6622435c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,8 +16,10 @@ + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1ef1a795..6801f0a25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a75313bb4f23e7fb72e1d382e944351dd4fa473 + 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9359aebf07bec085619421d7b078affadbd4b05 + 1439d8bce6207584e4f75fb24691d2f146b93be5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9359aebf07bec085619421d7b078affadbd4b05 + 1439d8bce6207584e4f75fb24691d2f146b93be5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f352cdb4a..bcd147d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 6.0.315 + 6.0.316 @@ -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.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.315-servicing.23322.16 - 6.0.315-servicing.23322.16 + 6.0.316-servicing.23364.13 + 6.0.316-servicing.23364.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23364.1 + 6.0.21-servicing.23364.1 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.315 + 6.0.316 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 310c694977bdbf1754c5ee8b396785eea7b223f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 13:06:23 +0000 Subject: [PATCH 06/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.412-servicing.23322.15 -> To Version 6.0.413-servicing.23364.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..3d8f2fb68 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,8 +16,10 @@ + + @@ -37,12 +40,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e89c33bea..1f6d6250d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 198e1c4771fc6a8a19625159c5730c26ef00f3cf + a282993b4e0f9930ea49c4831165a918d07f820a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 39e0501ee91dcf2b9b885d647795184815fb0408 + a62c85f2091a3e36e15eb9fb36e0c6806c29c95f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d5409636809f75eb115d80785f31736829594f34 + 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a49236d0540364ac6e9f81a7ea637c06b17d88e + 2645f1e26e70544cfae5dbc7198ef403ec96c0db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a49236d0540364ac6e9f81a7ea637c06b17d88e + 2645f1e26e70544cfae5dbc7198ef403ec96c0db - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 + c4dcb2663686315258f2f687c51f1ff5bb7d0aea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a1ce0ea15..bd1118896 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23321.8 + 6.0.21-servicing.23363.8 - 6.0.412 + 6.0.413 @@ -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.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 + 6.0.21-servicing.23363.15 0.2.0 - 6.0.412-servicing.23322.15 - 6.0.412-servicing.23322.15 + 6.0.413-servicing.23364.12 + 6.0.413-servicing.23364.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.20-servicing.23321.10 - 6.0.20-servicing.23321.10 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23364.1 + 6.0.21-servicing.23364.1 + 6.0.21 + 6.0.21 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.412 + 6.0.413 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 08035c40749605b571e8169eb29c66596ffb358b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 19:29:33 +0000 Subject: [PATCH 07/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23364.11 -> To Version 6.0.121-servicing.23367.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b20f805d..7b4f90a94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0017d06b3..8849d0ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f46a9672ea5b9c9fc5e40f9b0ca405664115394c + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f46a9672ea5b9c9fc5e40f9b0ca405664115394c + 1f77c362a752e25c643140f014af4ee0a05fce4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d6d900ba1..7d7dff33f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 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.121-servicing.23364.11 - 6.0.121-servicing.23364.11 + 6.0.121-servicing.23367.13 + 6.0.121-servicing.23367.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 From 4dce61d3fae364b71c768e6421366cbd3d00cf92 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 19:38:09 +0000 Subject: [PATCH 08/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23364.13 -> To Version 6.0.316-servicing.23367.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++--- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6622435c..237478e93 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + + - + @@ -40,14 +41,15 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6801f0a25..2569e5124 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 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 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1439d8bce6207584e4f75fb24691d2f146b93be5 + 68456cae299435babf6fe194ec79e305275985f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1439d8bce6207584e4f75fb24691d2f146b93be5 + 68456cae299435babf6fe194ec79e305275985f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bcd147d2f..6370a3eb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 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.316-servicing.23364.13 - 6.0.316-servicing.23364.13 + 6.0.316-servicing.23367.14 + 6.0.316-servicing.23367.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 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.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 From ece5b130b11aad66e541d467f4af22bb1c3dd46d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:00:03 +0000 Subject: [PATCH 09/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++---- eng/Version.Details.xml | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4179b6715..590969229 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,22 @@ - + + - - - + + + - - - + @@ -45,14 +44,15 @@ + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5add6..3d182f16e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dd121ee97234c7490f6111cf0c7bfa9235923f81 + 05b68f8296b45fa76b27abcb8e5666e73a4873b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d41bd7da4139331ef02657deb7944df43b8a181c + 5461ffc0ad318e6e60746a1440c67866d74b507e https://github.com/dotnet/fsharp @@ -133,7 +133,7 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - c3cc1d0ceeab1a65da0217e403851a1e8a30086a + 5db000294db8cc634e7d8fc004844338c9747dbc - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..20f64b72a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.9-servicing.23321.6 + 7.0.10-servicing.23363.13 - 7.0.9-servicing.23321.9 + 7.0.10-servicing.23364.1 @@ -56,29 +56,29 @@ - 7.0.9 - 7.0.9 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 + 7.0.10 + 7.0.10 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 0.2.0 - 7.0.306 - 7.0.306-servicing.23321.40 - 7.0.306-servicing.23321.40 + 7.0.307 + 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-3.23210.15 + 4.6.0-3.23329.3 @@ -86,20 +86,20 @@ - 7.0.9-servicing.23320.18 - 7.0.9-servicing.23320.18 - 7.0.9 - 7.0.9 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23363.12 + 7.0.10-servicing.23363.12 + 7.0.10 + 7.0.10 + 7.0.10 + 7.0.10 2.1.0 - 7.0.9-servicing.23321.11 - 7.0.9-servicing.23321.11 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23364.4 + 7.0.10-servicing.23364.4 + 7.0.10 + 7.0.10 @@ -197,7 +197,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.3-release-20230616-01 + 17.6.3 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6c0c0d063da21edc33c12ea623f05b525d45f244 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 17 Jul 2023 14:03:39 -0700 Subject: [PATCH 10/31] Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch 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 @@ - - - -+ -+ -+ -+ - - - From 5d26c38ee96606c1e474039d445c27cba6d2b229 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jul 2023 21:09:22 +0000 Subject: [PATCH 11/31] Merged PR 32709: Remove applied source build patch - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch 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 @@ - - - -+ -+ -+ -+ - - - From 2fd6547cc123bda1d7b4b99a5d2a7b4e675c3f35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:10:50 +0000 Subject: [PATCH 12/31] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 590969229..754b226fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d182f16e..13a1aa1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05b68f8296b45fa76b27abcb8e5666e73a4873b7 + 1f1ac283c5d3bb3302111f8aef567a3541863c49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5461ffc0ad318e6e60746a1440c67866d74b507e + 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 20f64b72a..c197a2a4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23363.13 + 7.0.10-servicing.23364.5 - 7.0.10-servicing.23364.1 + 7.0.10-servicing.23364.4 @@ -70,8 +70,8 @@ 7.0.307 - 7.0.307-servicing.23367.12 - 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.21 + 7.0.307-servicing.23367.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.10-servicing.23364.4 - 7.0.10-servicing.23364.4 + 7.0.10-servicing.23367.2 + 7.0.10-servicing.23367.2 7.0.10 7.0.10 From 10710f7d8e8fa29aea83b7ba59c0e169a7afc008 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Jul 2023 21:13:18 +0000 Subject: [PATCH 13/31] Merged PR 32707: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_gi... --- NuGet.config | 10 +-- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 32 ++++----- ...explicit-System.Text.Json-dependency.patch | 31 -------- 4 files changed, 58 insertions(+), 87 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/NuGet.config b/NuGet.config index 3d8f2fb68..adbb45577 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + + - + @@ -40,15 +41,16 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6d6250d..a5554bca6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 3c299ae525000e4dd138b22c0f549110625876ed https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a282993b4e0f9930ea49c4831165a918d07f820a + 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 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a62c85f2091a3e36e15eb9fb36e0c6806c29c95f + cec88a329584349fda070f4c7346b10538210ace https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2645f1e26e70544cfae5dbc7198ef403ec96c0db + 32a105ca98fd8a3807b81912fbef60a085378f24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2645f1e26e70544cfae5dbc7198ef403ec96c0db + 32a105ca98fd8a3807b81912fbef60a085378f24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c4dcb2663686315258f2f687c51f1ff5bb7d0aea + fa467fd679da61d9e429ce2654ef63766afcd7f5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bd1118896..97effa0a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 - 6.0.21-servicing.23363.8 + 6.0.21-servicing.23364.5 @@ -46,18 +46,18 @@ 6.0.21 6.0.21 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 - 6.0.21-servicing.23363.15 + 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.413-servicing.23364.12 - 6.0.413-servicing.23364.12 + 6.0.413-servicing.23367.15 + 6.0.413-servicing.23367.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 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.21-servicing.23364.1 - 6.0.21-servicing.23364.1 + 6.0.21-servicing.23367.3 + 6.0.21-servicing.23367.3 6.0.21 6.0.21 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 @@ - - - -+ -+ -+ -+ - - - From 00e4340849d26c84e65f750acb91355d4c40f9ae Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jul 2023 22:00:26 +0000 Subject: [PATCH 14/31] Merged PR 32708: Remove applied source build patch - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch 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 @@ - - - -+ -+ -+ -+ - - - From 63943c001443c5b8a9a047c3795d51be642a4a04 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 18 Jul 2023 10:35:41 -0500 Subject: [PATCH 15/31] Update SB SDK diff baseline (#16972) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 1b86a0d2e..4e98d267b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From 536ba6ad9962efad823c9bc5bc86b12326b586b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jul 2023 18:02:21 +0000 Subject: [PATCH 16/31] Update dependencies from https://github.com/dotnet/arcade build 20230720.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3 --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4179b6715..a309f71c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,18 +12,12 @@ - - - - - - @@ -50,9 +44,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5add6..74966f00a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..f18973d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23361.2 + 7.0.0-beta.23370.3 diff --git a/global.json b/global.json index d20ab2569..0df69a962 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" } } From 4ccaa3edeee38255544b967914b266a6c19ceac5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:00:55 -0700 Subject: [PATCH 17/31] Update branding to 6.0.122 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e7d31888f..a2f52497e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9beeb9ef34c235ffca7d3b8eb60542f6472c5d32 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:00 -0700 Subject: [PATCH 18/31] Update branding to 6.0.317 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f352cdb4a..a1d216e46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From eccb361192f2f1e70224c47be9579afe12c07b5c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:05 -0700 Subject: [PATCH 19/31] Update branding to 6.0.414 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1ce0ea15..b4f44346e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 607aa73912ecbdf7929fc4088268ffb8e5c4afee Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:10 -0700 Subject: [PATCH 20/31] Update branding to 7.0.111 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a83b35744..fbb6625b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 1cc16c4f4d4be2ece0e43db48edd5e7db8fa030b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:14 -0700 Subject: [PATCH 21/31] Update branding to 7.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4..9266d9f9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 2a433a301fc9d79ec14e20fa5e083288f557445e Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 8 Aug 2023 14:56:41 -0400 Subject: [PATCH 22/31] [release/6.01xx] Update source-build CI to Fedora 38 (#16649) --- .../templates/job/source-build-run-tarball-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index c3c5a5fca..1dc1503c5 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -14,7 +14,7 @@ parameters: centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 - fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: name: NetCore1ESPool-Svc-Internal @@ -62,9 +62,9 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false - Fedora33-Offline: + Fedora38-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora33Container }} + _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false @@ -111,9 +111,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora33-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora33-Offline_Artifacts - _Container: ${{ parameters.fedora33Container }} + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false From 27ecd661b8981b4775e4f11d68fab4c65184e17d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:55:41 -0700 Subject: [PATCH 23/31] Merging internal commits for release/7.0.1xx (#17140) Co-authored-by: Matt Thalman Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell --- NuGet.config | 18 ++-- eng/Version.Details.xml | 100 ++++++++--------- eng/Versions.props | 48 ++++----- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- ...explicit-System.Text.Json-dependency.patch | 31 ------ 5 files changed, 88 insertions(+), 210 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/NuGet.config b/NuGet.config index 6cb159ba1..fc3d06124 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,22 @@ + - - - + + + - - - + @@ -45,14 +44,15 @@ + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fb3411c5..7f105b121 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dd121ee97234c7490f6111cf0c7bfa9235923f81 + 1f1ac283c5d3bb3302111f8aef567a3541863c49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d41bd7da4139331ef02657deb7944df43b8a181c + 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index fbb6625b2..f0c2a03b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.9-servicing.23321.6 + 7.0.10-servicing.23364.5 - 7.0.9-servicing.23321.9 + 7.0.10-servicing.23364.4 @@ -56,22 +56,22 @@ - 7.0.9 - 7.0.9 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 + 7.0.10 + 7.0.10 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 0.2.0 - 7.0.109 - 7.0.109-servicing.23322.18 - 7.0.109-servicing.23322.18 + 7.0.110 + 7.0.110-servicing.23367.22 + 7.0.110-servicing.23367.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.9-servicing.23320.18 - 7.0.9-servicing.23320.18 - 7.0.9 - 7.0.9 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23363.12 + 7.0.10-servicing.23363.12 + 7.0.10 + 7.0.10 + 7.0.10 + 7.0.10 2.1.0 - 7.0.9-servicing.23321.11 - 7.0.9-servicing.23321.11 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23367.2 + 7.0.10-servicing.23367.2 + 7.0.10 + 7.0.10 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4d662a3c3..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,23 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll -+./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll -+./sdk/x.y.z/System.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json 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 @@ - - - -+ -+ -+ -+ - - - From 4ace1423c373c74350c56bd691d5e35e804cad15 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 8 Aug 2023 15:32:35 -0500 Subject: [PATCH 24/31] Remove extra XML doc entry --- .../assets/baselines/MissingXmlDoc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 51976bbb72f65f960b58d55939f7e0a9406bfcef Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 8 Aug 2023 18:03:28 -0500 Subject: [PATCH 25/31] .NET Source-Build 7.0.110 August 2023 Updates (#17150) --- eng/Versions.props | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- src/SourceBuild/tarball/content/prep.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f0c2a03b1..17d507d76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.109 - 7.0.109 + 7.0.110 + 7.0.110 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 97f4b4ce3..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -305,7 +305,7 @@ - + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 23dda09a0..f8dc920b3 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.109" + "dotnet": "7.0.110" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index b436e6cff..290014931 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt From 13a9c8658383a104f88992e0c37760f70ec04bb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 23:59:03 +0000 Subject: [PATCH 26/31] Update dependencies from https://github.com/dotnet/arcade build 20230808.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3 --- NuGet.config | 27 +++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 754b226fd..b885835bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,33 @@ + + + + + + + + + + + + + + + @@ -44,14 +59,26 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f009c11c3..9d206477b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 226ec073b..ad9e76ac4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23370.3 + 7.0.0-beta.23408.3 diff --git a/global.json b/global.json index 0df69a962..bf1732f08 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.109", + "dotnet": "7.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" } } From f2a927934b2b8f18195b1e89230fb33bf0facefe Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:18:30 -0500 Subject: [PATCH 27/31] .NET Source-Build 6.0.121 August 2023 Updates (#17149) --- eng/Versions.props | 2 +- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- src/SourceBuild/tarball/content/prep.sh | 4 ++-- .../assets/baselines/MissingXmlDoc.txt | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3893f5c2..2a3fffae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.120 + 6.0.121 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 323f7a038..4ee92a5e1 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -322,7 +322,7 @@ - + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 0f6503072..e981a599e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120" + "dotnet": "6.0.121" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e7fc6d550..429173290 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line) fi fi done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 936590bd4957956814471058e15bf04bccdc7267 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:25:31 -0700 Subject: [PATCH 28/31] [release/6.0.1xx] Update dependencies from dotnet/arcade (#17161) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b4f90a94..a5401b038 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,27 @@ + + + + - + + + + @@ -42,16 +49,21 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8849d0ad4..5581ce16f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2a3fffae8..98528e76f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 95c297b5f7e841767ff178fff0ba9259e0e84a2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:27:14 -0700 Subject: [PATCH 29/31] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17158) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index adbb45577..f27f973a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,15 +46,20 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5554bca6..9c3d54c5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 384dc7844..891c7b729 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 66301b23fbff01a61d9d2983301b8c6529b080fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:23:55 -0700 Subject: [PATCH 30/31] [release/7.0.1xx] Update dependencies from dotnet/arcade (#17160) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 19 +++++++++++++++---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc3d06124..2bc601a50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + + + - - + + + @@ -44,14 +51,18 @@ + + + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f105b121..41f0b6154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 17d507d76..f9f9cd5e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23361.2 + 7.0.0-beta.23408.3 diff --git a/global.json b/global.json index d20ab2569..bf1732f08 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.109", + "dotnet": "7.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" } } From f42900e18ff2cfd228060373227b896bc78492b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Aug 2023 08:07:10 +0000 Subject: [PATCH 31/31] Update dependencies from https://github.com/dotnet/test-templates build 20230810.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23409.2 -> To Version 1.1.0-rc.23410.2 --- NuGet.config | 20 -------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc5c95362..b1a2c374a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,26 +10,14 @@ - - - - - - - - - - - - @@ -51,19 +39,11 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40b8870dd..74fcc18d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 1e5f3603af2277910aad946736ee23283e7f3e16 diff --git a/eng/Versions.props b/eng/Versions.props index 3bce6f43e..110f1666f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23409.2 - 1.1.0-rc.23409.2 - 1.1.0-rc.23409.2 + 1.1.0-rc.23410.2 + 1.1.0-rc.23410.2 + 1.1.0-rc.23410.2