From ce85c68bfdb99a5078ebd9c816b3fc4959e16aef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 16:27:37 +0000 Subject: [PATCH 001/124] Update dependencies from https://github.com/dotnet/arcade build 20230411.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23167.1 -> To Version 6.0.0-beta.23211.7 --- 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 d589623e6..a91bd5a8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -43,17 +50,22 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a50b0c49c..8fc6ade00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8a84d1369..c5e25edd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 diff --git a/global.json b/global.json index 5bd694fa0..1f0711594 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" } } From 3b57a2b9a489dfc145a2f3794e674019ebd601d7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 17:16:34 +0000 Subject: [PATCH 002/124] Merged PR 30554: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20230411.7 - **Date Produced**: April 11, 2023 8:39:02 PM UTC - **Commit**: 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23167.1 to 6.0.0-beta.23211.7][1] [1]: https://github.com/dotnet/arcade/compare/92c39a4f0b...7bca7a24df [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.116 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- 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 043f28d3b..f8fb2fb33 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,18 @@ + + + + + + @@ -42,15 +47,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ba865110..31fa15648 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a43d29388..278fe85d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 diff --git a/global.json b/global.json index 5bd694fa0..1f0711594 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" } } From d03d699b09ae9cc51ec28277d85ab512e035d9ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:17:53 +0000 Subject: [PATCH 003/124] Merged PR 30689: [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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.408 to 6.0.409 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23174.7 to 6.0.409-rtm.23213.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.409 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.... --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 84 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb95457fe..074ca0c70 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + + - - - + - - - - + @@ -47,22 +42,17 @@ + - - - + + - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b43e4b469..1ecd1190b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1450763a83b184fa2fdd590d5774556b709bf4c1 + 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4478215a43d6cec39061c414d65d0a1dd78993f0 + ad7fc2b8478c658ca841a7ea2671aafe11aeb797 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4478215a43d6cec39061c414d65d0a1dd78993f0 + ad7fc2b8478c658ca841a7ea2671aafe11aeb797 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/microsoft/vstest - dd7c26bf1fa66d50a0f21999e24f7b7e4195ae05 + 6e76d580fcc69954441344175bd1b0ab2e432026 @@ -151,9 +151,9 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - - https://github.com/nuget/nuget.client - a90539fd502f9425311b34451cdd2965516f5d26 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 5e444458a8c4a2dac9806fc1d387b7f157669540 diff --git a/eng/Versions.props b/eng/Versions.props index 8eab0dc13..783422594 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.408 + 6.0.409 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.408-servicing.23177.15 - 6.0.408-servicing.23177.15 + 6.0.409-servicing.23215.3 + 6.0.409-servicing.23215.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.408 + 6.0.409 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.2 + 17.3.3-release-20230405-02 From f1a405947785344bd1f4078525a61a82463c0671 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:11 +0000 Subject: [PATCH 004/124] Merged PR 30688: [internal/release/6.0.3xx] 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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23174.6 to 6.0.312-servicing.23213.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop... --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 85 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8fb2fb33..98ebbff1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + + - - - + - - - - + @@ -47,21 +42,16 @@ + - - - + + - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31fa15648..dc108d0d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 110c63b62d458c319cdaacca2dfd64fe677a3d55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest - 0c34747ff62ec59acb1579dfea5377acaf54027d + 5948b392c5d8c2580d08c9f6570409315243f86e @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://github.com/nuget/nuget.client - 51ca5ad938c742e6ff876ea1545b0712b130f9d1 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 diff --git a/eng/Versions.props b/eng/Versions.props index 278fe85d5..3224186bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.311 + 6.0.312 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.311-servicing.23177.16 - 6.0.311-servicing.23177.16 + 6.0.312-servicing.23215.2 + 6.0.312-servicing.23215.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.311 + 6.0.312 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.1-release-20230323-13 + 17.2.1-release-20230405-01 From c305e7fec37172d00cac7e12998dcb68a734136c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 16 Apr 2023 00:22:33 +0000 Subject: [PATCH 005/124] Merged PR 30542: [internal/release/6.0.1xx] 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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.116 to 6.0.117 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.116-servicing.23174.5 to 6.0.117-servicing.23212.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.116 to 6.0.117 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.16-servicing.231... --- NuGet.config | 22 ++++---- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index d589623e6..8112280a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + + - + - - + @@ -43,18 +43,18 @@ - + - + + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a50b0c49c..43d75ed83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 110c63b62d458c319cdaacca2dfd64fe677a3d55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d3c2532d3f57ceb36692d9f4c13b696018f64ab6 + 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d3c2532d3f57ceb36692d9f4c13b696018f64ab6 + 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d3c2532d3f57ceb36692d9f4c13b696018f64ab6 + 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fd373338fdfbf3c6aac707ae660e2121fe0c2b7a + 778ab4ed057719953ac26f9121acca9a6753ef83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fd373338fdfbf3c6aac707ae660e2121fe0c2b7a + 778ab4ed057719953ac26f9121acca9a6753ef83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 7778347509e70cdcaa14a09103939fe295a00bb3 + cc7fb0593127e24f55ce016fb3ac85b5b2857fec @@ -151,9 +151,9 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - - https://github.com/nuget/nuget.client - 822425710cec4e49c9344ada58c21c7d3223973b + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 7fe6b814c901490292f02d8ea12749505fbb959a @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - a243060cdb356f166664b5d0c3dad206299935e7 + 275d1fa1fa5df44c2189d3976a351ed001e6f7b4 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 8a84d1369..ef793c4a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.116 + 6.0.117 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.116-servicing.23177.14 - 6.0.116-servicing.23177.14 + 6.0.117-servicing.23215.7 + 6.0.117-servicing.23215.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.116 + 6.0.117 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.2-release-20230323-12 + 17.0.3-release-20230412-05 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.16 + 6.0.17 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 13565e2b982ef0e66e92b2337389f6b6eaebdee1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 16 Apr 2023 17:23:35 +0000 Subject: [PATCH 006/124] Merged PR 30719: [internal/release/6.0.3xx] 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.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230416.3 - **Date Produced**: April 16, 2023 5:04:20 PM UTC - **Commit**: 1faeafd01ba2fc70cb9bd62a613e15925558882c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.312-servicing.23215.2 to 6.0.312-servicing.23216.3][1] - **Microsoft.NET.Sdk**: [from 6.0.312-servicing.23215.2 to 6.0.312-servicing.23216.3][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC93f3d08577&targetVersion=GC1faeafd01b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC110c63b62d&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc108d0d3..553afd0ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 110c63b62d458c319cdaacca2dfd64fe677a3d55 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93f3d085773bb5f0bac5a864c1e59c22625738ba + 1faeafd01ba2fc70cb9bd62a613e15925558882c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93f3d085773bb5f0bac5a864c1e59c22625738ba + 1faeafd01ba2fc70cb9bd62a613e15925558882c diff --git a/eng/Versions.props b/eng/Versions.props index 3224186bc..038005d18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.312-servicing.23215.2 - 6.0.312-servicing.23215.2 + 6.0.312-servicing.23216.3 + 6.0.312-servicing.23216.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1884c21898a7806efa4311445a9561ffa85a216b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 16 Apr 2023 17:28:55 +0000 Subject: [PATCH 007/124] Merged PR 30720: [internal/release/6.0.1xx] 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.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230416.4 - **Date Produced**: April 16, 2023 5:04:31 PM UTC - **Commit**: 5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.117-servicing.23215.7 to 6.0.117-servicing.23216.4][1] - **Microsoft.NET.Sdk**: [from 6.0.117-servicing.23215.7 to 6.0.117-servicing.23216.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC778ab4ed05&targetVersion=GC5ed3b0840b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC110c63b62d&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43d75ed83..8600a7af4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 110c63b62d458c319cdaacca2dfd64fe677a3d55 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 778ab4ed057719953ac26f9121acca9a6753ef83 + 5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 778ab4ed057719953ac26f9121acca9a6753ef83 + 5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938 diff --git a/eng/Versions.props b/eng/Versions.props index ef793c4a9..1f52b54ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.117-servicing.23215.7 - 6.0.117-servicing.23215.7 + 6.0.117-servicing.23216.4 + 6.0.117-servicing.23216.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fff348f8580c3d246cc04f3c4f45eaf0500aadc9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Apr 2023 00:50:42 +0000 Subject: [PATCH 008/124] Merged PR 30722: [internal/release/6.0.1xx] 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.DotNet.Common.ItemTemplates**: from 6.0.117 to 6.0.117 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.117-servicing.23212.12 to 6.0.117-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.117 to 6.0.117 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230416.6 - **Date Produced**: April 16, 2023 10:32:38 PM UTC - **Commit**: 4bcf845ee20643a295f8a36e603a82698e0c22ff - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.117-servicing.23216.4 to 6.0.117-servicing.23216.6][1] - **Microsoft.NET.Sdk**: [from 6.0.117-servicing.23216.4 to 6.0.117-servicing.23216.6][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.117 to 6.0.117][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.117-servicing.23212.12 to 6.0.117-servicing.23213.12][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.117 to 6.0.117][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5ed3b0840b&targetVersion=GC4bcf845ee2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC1e4f8f9196&targetVersion=GCb8c3336aae&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8112280a7..89ae0fb4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8600a7af4..147ff1972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d + b8c3336aaeb266735521b3f71476df551bd06916 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d + b8c3336aaeb266735521b3f71476df551bd06916 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e4f8f9196d410d4ba80a82971c88a6aeea8b67d + b8c3336aaeb266735521b3f71476df551bd06916 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938 + 4bcf845ee20643a295f8a36e603a82698e0c22ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938 + 4bcf845ee20643a295f8a36e603a82698e0c22ff diff --git a/eng/Versions.props b/eng/Versions.props index 1f52b54ca..535927639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.117-servicing.23216.4 - 6.0.117-servicing.23216.4 + 6.0.117-servicing.23216.6 + 6.0.117-servicing.23216.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ebd52b98d09a830c37f5c93dd68bb9f9c280c78 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:41 +0000 Subject: [PATCH 009/124] Merged PR 30757: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230418.4 - **Date Produced**: April 18, 2023 3:27:49 PM UTC - **Commit**: d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.117-servicing.23216.6 to 6.0.117-servicing.23218.4][1] - **Microsoft.NET.Sdk**: [from 6.0.117-servicing.23216.6 to 6.0.117-servicing.23218.4][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.17 to 6.0.17][2] - **Microsoft.As... --- NuGet.config | 15 ++++++++------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 89ae0fb4e..82c9e4a45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,24 @@ - + + - - + + + @@ -43,17 +45,18 @@ - + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 147ff1972..240288f03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8c3336aaeb266735521b3f71476df551bd06916 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bcf845ee20643a295f8a36e603a82698e0c22ff + d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bcf845ee20643a295f8a36e603a82698e0c22ff + d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b diff --git a/eng/Versions.props b/eng/Versions.props index 535927639..320b5b824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.17 6.0.17 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 0.2.0 - 6.0.117-servicing.23216.6 - 6.0.117-servicing.23216.6 + 6.0.117-servicing.23218.4 + 6.0.117-servicing.23218.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.17 From 934a4f73a91e9fcb85a65fe3888f26adfb1a33c9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:48 +0000 Subject: [PATCH 010/124] Merged PR 30758: [internal/release/6.0.3xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230418.6 - **Date Produced**: April 18, 2023 3:28:13 PM UTC - **Commit**: ae62f868ad40f9193a94695eaad6c5233190d110 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.312-servicing.23216.3 to 6.0.312-servicing.23218.6][1] - **Microsoft.NET.Sdk**: [from 6.0.312-servicing.23216.3 to 6.0.312-servicing.23218.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Host.win-x64*... --- NuGet.config | 14 +++++++------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98ebbff1c..cdb6685f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - - + + + @@ -42,15 +43,16 @@ - + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 553afd0ec..74d6eb48f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1faeafd01ba2fc70cb9bd62a613e15925558882c + ae62f868ad40f9193a94695eaad6c5233190d110 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1faeafd01ba2fc70cb9bd62a613e15925558882c + ae62f868ad40f9193a94695eaad6c5233190d110 diff --git a/eng/Versions.props b/eng/Versions.props index 038005d18..fddcf4289 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.17 6.0.17 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 0.2.0 - 6.0.312-servicing.23216.3 - 6.0.312-servicing.23216.3 + 6.0.312-servicing.23218.6 + 6.0.312-servicing.23218.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.17 From 87380a18ebe0118506aba93c47d3f2313286c984 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:52 +0000 Subject: [PATCH 011/124] Merged PR 30759: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230418.5 - **Date Produced**: April 18, 2023 3:28:35 PM UTC - **Commit**: f5d9e9d2deefcd0c88f470d4271246df2bf5add6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.409-servicing.23215.3 to 6.0.409-servicing.23218.5][1] - **Microsoft.NET.Sdk**: [from 6.0.409-servicing.23215.3 to 6.0.409-servicing.23218.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Host.win-x64*... --- NuGet.config | 14 +++++++------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 074ca0c70..a0c2db74e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - - + + + @@ -42,16 +43,17 @@ - + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ecd1190b..cb93eb12a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 + c5dca375ba37a494ac5b8a1e228a7ca8484613c1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1d32cba54f57b8436de0e670f9157857ea658381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad7fc2b8478c658ca841a7ea2671aafe11aeb797 + f5d9e9d2deefcd0c88f470d4271246df2bf5add6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad7fc2b8478c658ca841a7ea2671aafe11aeb797 + f5d9e9d2deefcd0c88f470d4271246df2bf5add6 diff --git a/eng/Versions.props b/eng/Versions.props index 783422594..398ff8575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.17 6.0.17 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 - 6.0.17-servicing.23214.11 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 + 6.0.17-servicing.23217.10 0.2.0 - 6.0.409-servicing.23215.3 - 6.0.409-servicing.23215.3 + 6.0.409-servicing.23218.5 + 6.0.409-servicing.23218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.17 From ef68e303f30299e4a2bb873db7fe72ea53b8233b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 10:59:47 -0700 Subject: [PATCH 012/124] Update branding to 6.0.118 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a84d1369..a97433d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ab49d953c3a96b1019fbdc1d4b992820ebc5d3fe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 10:59:52 -0700 Subject: [PATCH 013/124] Update branding to 6.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a43d29388..833dd4f46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c2a7c1a238fda68568943a361083254e7cbd21cb Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 3 May 2023 12:19:12 -0700 Subject: [PATCH 014/124] Switch to debian 11, install libLLDB 9 --- .vsts-ci.yml | 2 +- eng/docker/debian/Dockerfile | 8 ++++++-- test/SdkTests/SdkTests.csproj | 7 ++++++- test/SdkTests/TestsToSkipLinux.xml | 10 ++++++++++ 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 test/SdkTests/TestsToSkipLinux.xml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2a9e08d43..6067e7c1e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -179,7 +179,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Debian_Stretch_Debug_x64: + Build_Debian_11_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index ebafe9adb..e448844a4 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 # Install the deb packaging toolchain we need to build debs RUN apt-get update \ @@ -17,7 +17,7 @@ RUN apt-get update \ # liblldb is needed so deb package build does not throw missing library info errors RUN apt-get update \ - && apt-get -y install liblldb-3.9 \ + && apt-get -y install liblldb-9 \ && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build @@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN apt-get update \ + && apt-get -y install python-is-python2 \ + && rm -rf /var/lib/apt/lists/* RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 2674c0f5a..32f254a89 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -258,7 +258,12 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" - + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml" + + + diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml new file mode 100644 index 000000000..b2bfd698a --- /dev/null +++ b/test/SdkTests/TestsToSkipLinux.xml @@ -0,0 +1,10 @@ + + + + + + From 9c98d91d6db213788b3e06089668f897934875ec Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 4 May 2023 16:09:44 -0500 Subject: [PATCH 015/124] Fix Download MSFT sdk Tarball pattern (#16329) --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 488425c79..9ae170d1c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-!(*-*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: From aa85b410d28b2f86d0d69f1ea3d6bbd6b4f16ba0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 8 May 2023 05:48:25 -0700 Subject: [PATCH 016/124] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16330) Co-authored-by: Matt Thalman Co-authored-by: Jason Zhai --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 488425c79..9ae170d1c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-!(*-*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: From 0214289b98afab8120648ec34202cd9c6037965b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 20:56:05 +0000 Subject: [PATCH 017/124] Merged PR 31218: [internal/release/6.0.3xx] 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.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23252.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23252.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23253.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23253.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23261.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.312 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.312-servicing.23213.13 to 6.0.312-servicing.23218.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.312 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_g... --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 3 files changed, 66 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdb6685f9..d10a82c28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ - + - + - - + - - + @@ -43,17 +41,15 @@ - + - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74d6eb48f..b806bf3d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 0642fba66a9347d8b2550181eb17cf4f24fad77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + bacc9fceb336ee1b1f9acae25caabae88b43cc14 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a4a285f074250f192ab49ecb4a80c9ce11adb7e3 + 7cb3955a498e7c378c075b50f69b72ef12cca9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62f868ad40f9193a94695eaad6c5233190d110 + ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62f868ad40f9193a94695eaad6c5233190d110 + ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d diff --git a/eng/Versions.props b/eng/Versions.props index 997f2d0fd..4c2802234 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.17 - 6.0.17 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 + 6.0.18-servicing.23261.2 0.2.0 - 6.0.312-servicing.23218.6 - 6.0.312-servicing.23218.6 + 6.0.313-servicing.23261.9 + 6.0.313-servicing.23261.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23253.8 + 6.0.18-servicing.23253.8 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.17-servicing.23213.12 - 6.0.17-servicing.23213.12 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23252.3 + 6.0.18-servicing.23252.3 + 6.0.18 + 6.0.18 From 1d5188379db294dec0753666898e1fec0ea8fa16 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 23:56:26 +0000 Subject: [PATCH 018/124] Merged PR 31287: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230517.19 - **Date Produced**: May 17, 2023 9:23:43 PM UTC - **Commit**: 326ba9e30e560c6d20c18f60394d1af5523b5a01 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.409-servicing.23218.5 to 6.0.410-servicing.23267.19][2] - **Microsoft.NET.Sdk**: [from 6.0.409-servicing.23218.5 to 6.0.410-servicing.23267.19][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23261.3][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23261.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.5][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][4] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.5][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][4] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.17 to 6.0.18][4] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.17 to 6.0.18][4] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.17 to 6.0.18][5] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][5] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **dotnet-dev-certs**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **dotnet-user-secrets**: [from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23266.7][5] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.409 to 6.0.410][6] - **Microsoft.TemplateEngine.Cli**: [from 6.0.409-rtm.23213.14 to 6.0.410-rtm.23261.12][6] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.409 to 6.0.410][6] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.17-servicing.23213.7 to 6.0.18-servicing.23258.5][8] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf5d9e9d2de&targetVersion=GC326ba9e30e&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCcf2cbab34d&targetVersion=GC7882... --- NuGet.config | 20 ++++----- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0c2db74e..5addf7d71 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ - + - + - - + - - + @@ -43,18 +41,16 @@ - + - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb93eb12a..25aeedd4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + 9fa9da7badeacc7c8e89547a466b92232ae127bf @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1d32cba54f57b8436de0e670f9157857ea658381 + 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5d9e9d2deefcd0c88f470d4271246df2bf5add6 + 326ba9e30e560c6d20c18f60394d1af5523b5a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5d9e9d2deefcd0c88f470d4271246df2bf5add6 + 326ba9e30e560c6d20c18f60394d1af5523b5a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b + bd8f52b18e0976ce565161b6603b7ffc8f0b5153 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 49ec29055..ed23edb1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 - 6.0.17-servicing.23213.7 + 6.0.18-servicing.23258.5 - 6.0.409 + 6.0.410 @@ -44,20 +44,20 @@ - 6.0.17 - 6.0.17 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 0.2.0 - 6.0.409-servicing.23218.5 - 6.0.409-servicing.23218.5 + 6.0.410-servicing.23267.19 + 6.0.410-servicing.23267.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.5 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.17-servicing.23213.12 - 6.0.17-servicing.23213.12 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23261.3 + 6.0.18-servicing.23261.3 + 6.0.18 + 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.409 + 6.0.410 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 0c3baf4363ffa2d0ce630addfadbe1d6394f86e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 16:45:43 +0000 Subject: [PATCH 019/124] Merged PR 31306: [internal/release/6.0.3xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23252.3 to 6.0.18-servicing.23261.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23252.3 to 6.0.18-servicing.23261.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23253.8 to 6.0.18-servicing.23266.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23253.8 to 6.0.18-servicing.23266.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23266.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.312 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.312-servicing.23218.4 to 6.0.313-servicing.23261.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.312 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNe... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index d10a82c28..e10b02079 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b806bf3d8..c5847440b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0642fba66a9347d8b2550181eb17cf4f24fad77f + 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bacc9fceb336ee1b1f9acae25caabae88b43cc14 + 9fa9da7badeacc7c8e89547a466b92232ae127bf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50ae99bb195c2cef8cc2920ff77cd83ccd1d1243 + 3d33aeef3a5c521114e067c8078f4069c6598fc3 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7cb3955a498e7c378c075b50f69b72ef12cca9f5 + 109b3f1b3ec1cded20fbfd552a732a2849271e8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d + 30032717b19a14558f5392495e0ad002864023ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac7e7ee45a3e2a6353031d7df4bbabf88ae0669d + 30032717b19a14558f5392495e0ad002864023ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b + bd8f52b18e0976ce565161b6603b7ffc8f0b5153 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4c2802234..ab7bad292 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 - 6.0.17-servicing.23213.7 + 6.0.18-servicing.23258.5 - 6.0.312 + 6.0.313 @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 - 6.0.18-servicing.23261.2 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 + 6.0.18-servicing.23266.7 0.2.0 - 6.0.313-servicing.23261.9 - 6.0.313-servicing.23261.9 + 6.0.313-servicing.23267.17 + 6.0.313-servicing.23267.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23253.8 - 6.0.18-servicing.23253.8 + 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.5 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23252.3 - 6.0.18-servicing.23252.3 + 6.0.18-servicing.23261.3 + 6.0.18-servicing.23261.3 6.0.18 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.312 + 6.0.313 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 090a8ab5b65ba3506aa94fed7a06d3ae43ec0378 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 20:41:43 +0000 Subject: [PATCH 020/124] Merged PR 31302: [internal/release/6.0.1xx] 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.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.17-servicing.23213.12 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.17-servicing.23217.10 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.117 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.117-servicing.23213.12 to 6.0.118-servicing.23267.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.117 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23213.3 to 6.0.18-servicing.23252.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.17-servicing... --- NuGet.config | 23 ++++----- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82c9e4a45..9c39f4e5e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,21 @@ - + - - + - + - - + - - + @@ -45,19 +42,17 @@ - + - + - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240288f03..a3be18b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cf2cbab34d18c578eaced5a9429c6b2df3c471d0 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c5dca375ba37a494ac5b8a1e228a7ca8484613c1 + 7195ea21f172746226a84887af2fd0742d8439f8 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8c3336aaeb266735521b3f71476df551bd06916 + caf01ccdbf375f8948c61038f623eab6a97467b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8c3336aaeb266735521b3f71476df551bd06916 + caf01ccdbf375f8948c61038f623eab6a97467b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8c3336aaeb266735521b3f71476df551bd06916 + caf01ccdbf375f8948c61038f623eab6a97467b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b + 272eaf52662cce6f63d94bf9a33f530e5930f5b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b + 272eaf52662cce6f63d94bf9a33f530e5930f5b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 24e38444348603b9b97149b5e3ffb73f7baddc85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b + 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 275d1fa1fa5df44c2189d3976a351ed001e6f7b4 + a91ee4835f3c2bb33a4295ba3aae43479b50564d https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c9bb267c1..72aca4ead 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.17-servicing.23213.3 + 6.0.18-servicing.23252.5 - 6.0.17-servicing.23213.7 + 6.0.18-servicing.23261.2 - 6.0.117 + 6.0.118 @@ -44,44 +44,44 @@ - 6.0.17 - 6.0.17 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 - 6.0.17-servicing.23217.10 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 0.2.0 - 6.0.117-servicing.23218.4 - 6.0.117-servicing.23218.4 + 6.0.118-servicing.23268.8 + 6.0.118-servicing.23268.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.17-servicing.23213.12 - 6.0.17-servicing.23213.12 - 6.0.17 - 6.0.17 + 6.0.18-servicing.23267.2 + 6.0.18-servicing.23267.2 + 6.0.18 + 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.117 + 6.0.118 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.17 + 6.0.18 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 98c3e32451300747fb3d8c5d1407fdd80d0b2b92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 20:43:21 +0000 Subject: [PATCH 021/124] Merged PR 31327: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23258.5 to 6.0.18-servicing.23261.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2... --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5addf7d71..e6b836bc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25aeedd4e..6c605f6ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + 24e38444348603b9b97149b5e3ffb73f7baddc85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd8f52b18e0976ce565161b6603b7ffc8f0b5153 + 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed23edb1a..54ff10e4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23252.5 - 6.0.18-servicing.23258.5 + 6.0.18-servicing.23261.2 @@ -46,30 +46,30 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 0.2.0 - 6.0.410-servicing.23267.19 - 6.0.410-servicing.23267.19 + 6.0.410-servicing.23268.2 + 6.0.410-servicing.23268.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.18-servicing.23266.5 - 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23261.3 - 6.0.18-servicing.23261.3 + 6.0.18-servicing.23267.2 + 6.0.18-servicing.23267.2 6.0.18 6.0.18 From de8c9e71bd1ef01f245d601910b2ef56cbb94002 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 19 May 2023 16:20:00 +0000 Subject: [PATCH 022/124] Merged PR 31351: Update source-build XML test baseline The System.Runtime.CompilerServices.Unsafe.xml file no longer is reported as a missing XML doc from the source-build output. Removing it from the baseline. --- .../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 f8ee70b62797d9e043883758741928dc2278e0a5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:36:12 +0000 Subject: [PATCH 023/124] Merged PR 31385: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23261.2 to 6.0.18-servicing.23268.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a... --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6b836bc7..6cf1e814d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c605f6ce..955547a0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - beb9b36629d3628fa469e87853cc2a6cca880c53 + c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - beb9b36629d3628fa469e87853cc2a6cca880c53 + c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 + f82a2b2d304233b5e27a18fbc2ff65ede97e37eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 54ff10e4b..12e8015b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23252.5 + 6.0.18-servicing.23268.4 - 6.0.18-servicing.23261.2 + 6.0.18-servicing.23268.3 @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 0.2.0 - 6.0.410-servicing.23268.2 - 6.0.410-servicing.23268.2 + 6.0.410-servicing.23269.5 + 6.0.410-servicing.23269.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23266.17 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.10 + 6.0.18-servicing.23268.10 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23267.2 - 6.0.18-servicing.23267.2 + 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.4 6.0.18 6.0.18 From a398440ac7f7db95a0b5104e029086c760b871d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:50:27 +0000 Subject: [PATCH 024/124] Merged PR 31383: [internal/release/6.0.1xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23267.2 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23267.15 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.118-servicing.23267.5 to 6.0.118-servicing.23268.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c39f4e5e..0ff632e49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c3f5b81a..19c7d74d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 822d7be63c77a447a8c72234a478a7ddc2101217 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7195ea21f172746226a84887af2fd0742d8439f8 + 119232c91c39668e983be4558d944dc81115b434 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - caf01ccdbf375f8948c61038f623eab6a97467b6 + 63d39d83cb835e91b98fbeea39958537a4537713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - caf01ccdbf375f8948c61038f623eab6a97467b6 + 63d39d83cb835e91b98fbeea39958537a4537713 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - caf01ccdbf375f8948c61038f623eab6a97467b6 + 63d39d83cb835e91b98fbeea39958537a4537713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 272eaf52662cce6f63d94bf9a33f530e5930f5b7 + 2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 272eaf52662cce6f63d94bf9a33f530e5930f5b7 + 2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 + f82a2b2d304233b5e27a18fbc2ff65ede97e37eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d5e03dc8a..66cdb781e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23252.5 + 6.0.18-servicing.23268.4 - 6.0.18-servicing.23261.2 + 6.0.18-servicing.23268.3 @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 - 6.0.18-servicing.23267.15 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 0.2.0 - 6.0.118-servicing.23268.8 - 6.0.118-servicing.23268.8 + 6.0.118-servicing.23269.4 + 6.0.118-servicing.23269.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23266.17 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.10 + 6.0.18-servicing.23268.10 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23267.2 - 6.0.18-servicing.23267.2 + 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.4 6.0.18 6.0.18 From 443a92855f1e57ad4f78365acf5c6bfe759113f8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 19:22:46 +0000 Subject: [PATCH 025/124] Merged PR 31395: [internal/release/6.0.3xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23268.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23268.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23268.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.313-servicing.23261.11 to 6.0.313-servicing.23268.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.A... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index e10b02079..23889d3cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5847440b..0fc1b8d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + e79c355ec611c39c236842d55b62dfbfc1a228d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + 320aeb73d891e262d000327191c61a0f74e2e918 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 320aeb73d891e262d000327191c61a0f74e2e918 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 119232c91c39668e983be4558d944dc81115b434 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 109b3f1b3ec1cded20fbfd552a732a2849271e8b + 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30032717b19a14558f5392495e0ad002864023ab + 43570358e714de8f182a5dd2cb69ca805d6581cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30032717b19a14558f5392495e0ad002864023ab + 43570358e714de8f182a5dd2cb69ca805d6581cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd8f52b18e0976ce565161b6603b7ffc8f0b5153 + f82a2b2d304233b5e27a18fbc2ff65ede97e37eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ab7bad292..667fb4293 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23268.4 - 6.0.18-servicing.23258.5 + 6.0.18-servicing.23268.3 @@ -46,30 +46,30 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 + 6.0.18-servicing.23268.16 0.2.0 - 6.0.313-servicing.23267.17 - 6.0.313-servicing.23267.17 + 6.0.313-servicing.23269.9 + 6.0.313-servicing.23269.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.18-servicing.23266.5 - 6.0.18-servicing.23266.5 + 6.0.18-servicing.23268.10 + 6.0.18-servicing.23268.10 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23261.3 - 6.0.18-servicing.23261.3 + 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.4 6.0.18 6.0.18 From 5efa4daa65780496831ec3c8b5e4cb048c4bd7ff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 19:50:00 +0000 Subject: [PATCH 026/124] Merged PR 31398: [internal/release/6.0.1xx] 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.DotNet.Common.ItemTemplates**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.118-servicing.23268.20 to 6.0.118-servicing.23269.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230519.10 - **Date Produced**: May 19, 2023 7:14:56 PM UTC - **Commit**: 27be6925f7669ffedd0dabe11bddec20cfb3d6fc - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23269.4 to 6.0.118-servicing.23269.10][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23269.4 to 6.0.118-servicing.23269.10][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.118 to 6.0.118][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.118-servicing.23268.20 to 6.0.118-servicing.23269.3][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.118 to 6.0.118][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2615ab2362&targetVersion=GC27be6925f7&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC63d39d83cb&targetVersion=GC9d4fcb0fa4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0ff632e49..849d80e9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19c7d74d9..4e1b2687e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63d39d83cb835e91b98fbeea39958537a4537713 + 9d4fcb0fa4867411dce1339944c2ec0815034a70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63d39d83cb835e91b98fbeea39958537a4537713 + 9d4fcb0fa4867411dce1339944c2ec0815034a70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63d39d83cb835e91b98fbeea39958537a4537713 + 9d4fcb0fa4867411dce1339944c2ec0815034a70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd + 27be6925f7669ffedd0dabe11bddec20cfb3d6fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd + 27be6925f7669ffedd0dabe11bddec20cfb3d6fc diff --git a/eng/Versions.props b/eng/Versions.props index 66cdb781e..3d8edae25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.118-servicing.23269.4 - 6.0.118-servicing.23269.4 + 6.0.118-servicing.23269.10 + 6.0.118-servicing.23269.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5df0d9a01c879877f6dd0acc61817e16e3e2d2c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:28:42 +0000 Subject: [PATCH 027/124] Merged PR 31406: [internal/release/6.0.1xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230519.18 - **Date Produced**: May 19, 2023 8:33:19 PM UTC - **Commit**: 2377cfd304a7a1611445f9c322162c3a23c2ef4a - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23269.10 to 6.0.118-servicing.23269.18][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23269.10 to 6.0.118-servicing.23269.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC27be6925f7&targetVersion=GC2377cfd304&_a=files [2]: https://d... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 849d80e9a..b3c1a17f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e1b2687e..5b315c75b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9d4fcb0fa4867411dce1339944c2ec0815034a70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27be6925f7669ffedd0dabe11bddec20cfb3d6fc + 2377cfd304a7a1611445f9c322162c3a23c2ef4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27be6925f7669ffedd0dabe11bddec20cfb3d6fc + 2377cfd304a7a1611445f9c322162c3a23c2ef4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f82a2b2d304233b5e27a18fbc2ff65ede97e37eb + 7cd35b1648ac297ea6404c1f7645aaae8a216938 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3d8edae25..590ef4f0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.6 @@ -56,8 +56,8 @@ - 6.0.118-servicing.23269.10 - 6.0.118-servicing.23269.10 + 6.0.118-servicing.23269.18 + 6.0.118-servicing.23269.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23268.4 - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 From b6b7bfa5e92ede21d0dace802d4ab508b32d2729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:29:46 +0000 Subject: [PATCH 028/124] Merged PR 31408: [internal/release/6.0.3xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230519.19 - **Date Produced**: May 19, 2023 8:41:21 PM UTC - **Commit**: 27e299c7e96eb96f798581d96cf0cf9d5917a340 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23269.9 to 6.0.313-servicing.23269.19][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23269.9 to 6.0.313-servicing.23269.19][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC43570358e7&targetVersion=GC27e299c7e9&_a=files [2]: https://dev... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23889d3cb..68b334424 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fc1b8d3f..d566c0058 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43570358e714de8f182a5dd2cb69ca805d6581cc + 27e299c7e96eb96f798581d96cf0cf9d5917a340 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43570358e714de8f182a5dd2cb69ca805d6581cc + 27e299c7e96eb96f798581d96cf0cf9d5917a340 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f82a2b2d304233b5e27a18fbc2ff65ede97e37eb + 7cd35b1648ac297ea6404c1f7645aaae8a216938 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 667fb4293..e76aa8468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.6 @@ -56,8 +56,8 @@ - 6.0.313-servicing.23269.9 - 6.0.313-servicing.23269.9 + 6.0.313-servicing.23269.19 + 6.0.313-servicing.23269.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23268.4 - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 From e4bd2e65f0a29182f870652d97a91a410bff0e64 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:30:15 +0000 Subject: [PATCH 029/124] Merged PR 31407: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (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/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230519.20 - **Date Produced**: May 19, 2023 8:41:07 PM UTC - **Commit**: a61ce7bb43104606df14c04d902c2d243a3a50c3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23269.5 to 6.0.410-servicing.23269.20][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23269.5 to 6.0.410-servicing.23269.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc6d43dc3a4&targetVersion=GCa61ce7bb43&_a=files [2]: https://dev... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cf1e814d..7d8b1d42f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955547a0e..95a7cbfbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e79c355ec611c39c236842d55b62dfbfc1a228d5 + 6cc1fd96eb2b8be53291236de88a007ac81f99bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 + a61ce7bb43104606df14c04d902c2d243a3a50c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c6d43dc3a4cb4821ad81b42d97df9e7df0f2bf10 + a61ce7bb43104606df14c04d902c2d243a3a50c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f82a2b2d304233b5e27a18fbc2ff65ede97e37eb + 7cd35b1648ac297ea6404c1f7645aaae8a216938 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 12e8015b3..be23a6ad2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.6 @@ -56,8 +56,8 @@ - 6.0.410-servicing.23269.5 - 6.0.410-servicing.23269.5 + 6.0.410-servicing.23269.20 + 6.0.410-servicing.23269.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23268.4 - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 From f13163a368442a984712810bf1fc02fb2c7a282f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:01 +0000 Subject: [PATCH 030/124] Merged PR 31445: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230522.6 - **Date Produced**: May 22, 2023 2:52:43 PM UTC - **Commit**: 729e6b285aea5ba07102855f74a51234c5e7a6bf - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23269.18 to 6.0.118-servicing.23272.6][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23269.18 to 6.0.118-servicing.23272.6][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.18 to 6.0.18][2] - **Mi... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3c1a17f0..0cf673651 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b315c75b..4062b4581 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9d4fcb0fa4867411dce1339944c2ec0815034a70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2377cfd304a7a1611445f9c322162c3a23c2ef4a + 729e6b285aea5ba07102855f74a51234c5e7a6bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2377cfd304a7a1611445f9c322162c3a23c2ef4a + 729e6b285aea5ba07102855f74a51234c5e7a6bf diff --git a/eng/Versions.props b/eng/Versions.props index 590ef4f0f..288da4c7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.118-servicing.23269.18 - 6.0.118-servicing.23269.18 + 6.0.118-servicing.23272.6 + 6.0.118-servicing.23272.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23268.10 - 6.0.18-servicing.23268.10 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.18 From 6f2c3204ac12da6ecec49d2fdf532cf83acc5bcd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:14 +0000 Subject: [PATCH 031/124] Merged PR 31446: [internal/release/6.0.3xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230522.7 - **Date Produced**: May 22, 2023 2:54:27 PM UTC - **Commit**: fb967c6347d470d72897e1bd1e0fe1bc9d3e997a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Runt... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68b334424..4ae07eb47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d566c0058..2a4767c38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5d160bc14947eb77de730179ef7bb3146a1d37e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27e299c7e96eb96f798581d96cf0cf9d5917a340 + fb967c6347d470d72897e1bd1e0fe1bc9d3e997a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27e299c7e96eb96f798581d96cf0cf9d5917a340 + fb967c6347d470d72897e1bd1e0fe1bc9d3e997a diff --git a/eng/Versions.props b/eng/Versions.props index e76aa8468..0d027ccd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.313-servicing.23269.19 - 6.0.313-servicing.23269.19 + 6.0.313-servicing.23272.7 + 6.0.313-servicing.23272.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23268.10 - 6.0.18-servicing.23268.10 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.18 From b8721936343cc594471dc0d093dbd7d0277d883f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:27 +0000 Subject: [PATCH 032/124] Merged PR 31447: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.8 - **Date Produced**: May 22, 2023 2:57:08 PM UTC - **Commit**: 814ec5ad6d1ea981aac992273c1149d2969800ba - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23269.20 to 6.0.410-servicing.23272.8][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23269.20 to 6.0.410-servicing.23272.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Runt... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d8b1d42f..32e2719f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95a7cbfbd..80692ddc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6cc1fd96eb2b8be53291236de88a007ac81f99bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 320aeb73d891e262d000327191c61a0f74e2e918 + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 119232c91c39668e983be4558d944dc81115b434 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a61ce7bb43104606df14c04d902c2d243a3a50c3 + 814ec5ad6d1ea981aac992273c1149d2969800ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a61ce7bb43104606df14c04d902c2d243a3a50c3 + 814ec5ad6d1ea981aac992273c1149d2969800ba diff --git a/eng/Versions.props b/eng/Versions.props index be23a6ad2..4c93d9cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 - 6.0.18-servicing.23268.16 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.410-servicing.23269.20 - 6.0.410-servicing.23269.20 + 6.0.410-servicing.23272.8 + 6.0.410-servicing.23272.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.18-servicing.23268.10 - 6.0.18-servicing.23268.10 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.18 From d85bce333f1a5574278a8921dc4b47b14386a27b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:27:52 +0000 Subject: [PATCH 033/124] Merged PR 31456: [internal/release/6.0.1xx] 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.DotNet.Common.ItemTemplates**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.118-servicing.23269.3 to 6.0.118-servicing.23272.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.118 to 6.0.118 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230522.15 - **Date Produced**: May 22, 2023 4:20:28 PM UTC - **Commit**: 94f038df6b435aa72d1175c8bc1253bf2d9aa6ab - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23272.6 to 6.0.118-servicing.23272.15][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23272.6 to 6.0.118-servicing.23272.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.118 to 6.0.118][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.118-servicing.23269.3 to 6.0.118-servicing.23272.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.118 to 6.0.118][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC729e6b285a&targetVersion=GC94f038df6b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC9d4fcb0fa4&targetVersion=GCa23430d931&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0cf673651..1bf7b15c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4062b4581..f3545e7e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9d4fcb0fa4867411dce1339944c2ec0815034a70 + a23430d931218c8b2ffe6a51d120cd12fccece49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9d4fcb0fa4867411dce1339944c2ec0815034a70 + a23430d931218c8b2ffe6a51d120cd12fccece49 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9d4fcb0fa4867411dce1339944c2ec0815034a70 + a23430d931218c8b2ffe6a51d120cd12fccece49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 729e6b285aea5ba07102855f74a51234c5e7a6bf + 94f038df6b435aa72d1175c8bc1253bf2d9aa6ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 729e6b285aea5ba07102855f74a51234c5e7a6bf + 94f038df6b435aa72d1175c8bc1253bf2d9aa6ab diff --git a/eng/Versions.props b/eng/Versions.props index 288da4c7c..8bd7baaed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.118-servicing.23272.6 - 6.0.118-servicing.23272.6 + 6.0.118-servicing.23272.15 + 6.0.118-servicing.23272.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fc16b3685bb747a9a7f784d4f58d3ade4b6e0b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:02 +0000 Subject: [PATCH 034/124] Merged PR 31455: [internal/release/6.0.3xx] 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.DotNet.Common.ItemTemplates**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230522.16 - **Date Produced**: May 22, 2023 4:19:43 PM UTC - **Commit**: 2d505333fdcbcff7e5344aa046c39452643ecc09 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.313 to 6.0.313][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.313 to 6.0.313][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfb967c6347&targetVersion=GC2d505333fd&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5d160bc149&targetVersion=GC61b9e8db59&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ae07eb47..a663dd331 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a4767c38..8b50d592a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d160bc14947eb77de730179ef7bb3146a1d37e2 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb967c6347d470d72897e1bd1e0fe1bc9d3e997a + 2d505333fdcbcff7e5344aa046c39452643ecc09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb967c6347d470d72897e1bd1e0fe1bc9d3e997a + 2d505333fdcbcff7e5344aa046c39452643ecc09 diff --git a/eng/Versions.props b/eng/Versions.props index 0d027ccd4..56d20d0f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.7 - 6.0.313-servicing.23272.7 + 6.0.313-servicing.23272.16 + 6.0.313-servicing.23272.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af57c55c7f0cb20fbfa5c148cc91d13a6d3163ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:07 +0000 Subject: [PATCH 035/124] Merged PR 31463: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.27 - **Date Produced**: May 22, 2023 7:28:30 PM UTC - **Commit**: dfaebbad22b58193db81ac408655711a264f952b - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.8 to 6.0.410-servicing.23272.27][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.8 to 6.0.410-servicing.23272.27][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC814ec5ad6d&targetVersion=GCdfaebbad22&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80692ddc3..9c82f3384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 814ec5ad6d1ea981aac992273c1149d2969800ba + dfaebbad22b58193db81ac408655711a264f952b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 814ec5ad6d1ea981aac992273c1149d2969800ba + dfaebbad22b58193db81ac408655711a264f952b diff --git a/eng/Versions.props b/eng/Versions.props index 4c93d9cd3..4b2f93c6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.8 - 6.0.410-servicing.23272.8 + 6.0.410-servicing.23272.27 + 6.0.410-servicing.23272.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8b476fbe60becae6d0c3d36b7ba964aeee3523d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:06 +0000 Subject: [PATCH 036/124] Merged PR 31466: [internal/release/6.0.1xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230522.29 - **Date Produced**: May 22, 2023 9:52:17 PM UTC - **Commit**: 597ab8665d3b6fa5d1bad36724a3303aac430a5e - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23272.15 to 6.0.118-servicing.23272.29][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23272.15 to 6.0.118-servicing.23272.29][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC94f038df6b&targetVersion=GC597ab8665d&_a=files [2]: https://d... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1bf7b15c1..9a62b5fa1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3545e7e7..87d6419c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a23430d931218c8b2ffe6a51d120cd12fccece49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94f038df6b435aa72d1175c8bc1253bf2d9aa6ab + 597ab8665d3b6fa5d1bad36724a3303aac430a5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94f038df6b435aa72d1175c8bc1253bf2d9aa6ab + 597ab8665d3b6fa5d1bad36724a3303aac430a5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8bd7baaed..482816c44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 @@ -56,8 +56,8 @@ - 6.0.118-servicing.23272.15 - 6.0.118-servicing.23272.15 + 6.0.118-servicing.23272.29 + 6.0.118-servicing.23272.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 6.0.18 6.0.18 From 4985279bcb64c58fee0be4c2bef6c0f02bb130aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:11 +0000 Subject: [PATCH 037/124] Merged PR 31467: [internal/release/6.0.3xx] 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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230522.30 - **Date Produced**: May 22, 2023 9:52:42 PM UTC - **Commit**: 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1] - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.16 to 6.0.313-servicing.23272.30][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2d505333fd&targetVersion=GC0916fe5674&_a=files [2]: https://d... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a663dd331..dfabbd633 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b50d592a..e812a0193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d505333fdcbcff7e5344aa046c39452643ecc09 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d505333fdcbcff7e5344aa046c39452643ecc09 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 56d20d0f0..febf9abac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.16 - 6.0.313-servicing.23272.16 + 6.0.313-servicing.23272.30 + 6.0.313-servicing.23272.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 6.0.18 6.0.18 From 02627d94e213afd3e8c9dc085dbf652399590f51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:16 +0000 Subject: [PATCH 038/124] Merged PR 31468: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (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/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.31 - **Date Produced**: May 22, 2023 9:58:29 PM UTC - **Commit**: 9edbc4da0c5288d32b998064289b5c548e389253 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.27 to 6.0.410-servicing.23272.31][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdfaebbad22&targetVersion=GC9edbc4da0c&_a=files [2]: https://d... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32e2719f0..fb5f93c07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c82f3384..28470fa9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dfaebbad22b58193db81ac408655711a264f952b + 9edbc4da0c5288d32b998064289b5c548e389253 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dfaebbad22b58193db81ac408655711a264f952b + 9edbc4da0c5288d32b998064289b5c548e389253 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4b2f93c6e..437ca086f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.27 - 6.0.410-servicing.23272.27 + 6.0.410-servicing.23272.31 + 6.0.410-servicing.23272.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 6.0.18 6.0.18 From 28c7c894a318575fbc2f290db2c5b0d95bf1fc60 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 23:53:24 +0000 Subject: [PATCH 039/124] Merged PR 31474: [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.DotNet.Common.ItemTemplates**: from 6.0.410 to 6.0.410 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.410 to 6.0.410 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230522.38 - **Date Produced**: May 22, 2023 11:21:44 PM UTC - **Commit**: 3936afb953219ad1e565eca91e78f32e906d19f9 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1] - **Microsoft.NET.Sdk**: [from 6.0.410-servicing.23272.31 to 6.0.410-servicing.23272.38][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.410 to 6.0.410][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.410-rtm.23261.12 to 6.0.410-rtm.23272.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.410 to 6.0.410][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9edbc4da0c&targetVersion=GC3936afb953&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC85e4c28245&targetVersion=GC9cd9762fb7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb5f93c07..8e5a345de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28470fa9b..d3289d5b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 85e4c2824577397d49037ae98fc601f4fd9e3ccb + 9cd9762fb7eee396cc62d03e16c78f3565c220a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9edbc4da0c5288d32b998064289b5c548e389253 + 3936afb953219ad1e565eca91e78f32e906d19f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9edbc4da0c5288d32b998064289b5c548e389253 + 3936afb953219ad1e565eca91e78f32e906d19f9 diff --git a/eng/Versions.props b/eng/Versions.props index 437ca086f..14811a9e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.410-servicing.23272.31 - 6.0.410-servicing.23272.31 + 6.0.410-servicing.23272.38 + 6.0.410-servicing.23272.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7cbeda80a9593dbb354e784864e6965bcbc457d8 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:45 -0700 Subject: [PATCH 040/124] Update branding to 6.0.119 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eaa125d3c..4530c1629 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c9406fa27b3adbf190ef396cfc4d73aa87b22ce4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:49 -0700 Subject: [PATCH 041/124] Update branding to 6.0.314 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 833dd4f46..5e816e476 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 35376d26f102a4446d5b1fae21ef37b1ba60161e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:53 -0700 Subject: [PATCH 042/124] Update branding to 6.0.411 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1fe96be53..84717c399 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f671b74651cd24ff1b6e6e0e03cc9dbca3fbca61 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:22:54 -0700 Subject: [PATCH 043/124] Update ManualVersions.props --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f30..fb41f0bad 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From 806ef9c26b08aa3a0f7fc6206fc759de38203b17 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:24:53 -0700 Subject: [PATCH 044/124] Update ManualVersions.props --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f30..fb41f0bad 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From c9f58f8391c90df2c65d89d8b3383e1004c424d8 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:26:29 -0700 Subject: [PATCH 045/124] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f30..fb41f0bad 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From 04bf45ed6ed8f3db69bbb6d570d264367a2d87c3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Jun 2023 08:03:37 +0000 Subject: [PATCH 046/124] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Build: from 17.4.4 to 17.4.6 (parent: Microsoft.NET.Sdk) --- NuGet.config | 16 +++++++++------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb9bd53aa..5e70fca1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,25 @@ + + + + - + - - + - @@ -46,15 +48,15 @@ + + - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 811773cf7..8307f8d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 55a9757a052de9da9c0d5a66c17ff5676e5cf302 @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 8e9cb295288f13095e9b7739cc4cbb04e9d246d2 + 020b625cf1f16f4a4f22b3c15a015c1160467ed5 diff --git a/eng/Versions.props b/eng/Versions.props index a69885a3e..625c317cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.107 - 7.0.107-servicing.23275.8 - 7.0.107-servicing.23275.8 + 7.0.108 + 7.0.108-servicing.23314.6 + 7.0.108-servicing.23314.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 298f1196d19c18952566381428b06260fb4b1d1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 20:46:29 +0000 Subject: [PATCH 047/124] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5 --- NuGet.config | 10 +++---- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 6 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index 8e5a345de..7dd0c5e03 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -41,16 +40,15 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3289d5b4..e3a560abf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9da3f850..3fbf82613 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da..0e10e7db6 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -141,14 +145,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -216,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -227,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 1f0711594..b358f87d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" } } From 146d6510b5b21ec8e1d9dc5a66763fdc635d51e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 20:51:46 +0000 Subject: [PATCH 048/124] Update dependencies from https://github.com/dotnet/arcade build 20230613.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23313.4 --- NuGet.config | 13 +++------- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 6 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index fb9bd53aa..3015a14c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,19 @@ + + - - - - - - @@ -46,15 +42,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 811773cf7..d3e33549a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 59ac824080b9807fd91dbc8a6d2b4447e74874ab https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a69885a3e..27c843fa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23211.2 + 7.0.0-beta.23313.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e3ba93980..ef337eac5 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -142,14 +146,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -217,7 +227,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -228,7 +238,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 550a365a9..30cab30b8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.105", + "dotnet": "7.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23313.4" } } From 5dd48067185caaceb205f0d444e96ad778f40ac8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 21:19:12 +0000 Subject: [PATCH 049/124] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5 --- NuGet.config | 11 +++----- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 6 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index 9a62b5fa1..f233ad36b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,18 @@ + + - - - - @@ -42,17 +40,16 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87d6419c2..1d77af516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 0febd3d43..6eaaec694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da..0e10e7db6 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -141,14 +145,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -216,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -227,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 1f0711594..b358f87d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" } } From 078d557112cc8744f218b5b33d521138fd60491d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 15 Jun 2023 22:31:35 -0700 Subject: [PATCH 050/124] Fix the build errors --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d5f2aadb..c9c491dee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,6 @@ - - From 3777d6aac5ecb4117da770301b1a970a107e7b30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Jun 2023 18:22:31 +0000 Subject: [PATCH 051/124] Update dependencies from https://github.com/dotnet/arcade build 20230616.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23313.4 -> To Version 7.0.0-beta.23316.4 --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffac45e52..5ee25bfce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,6 @@ - - - @@ -41,9 +38,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a92a3984d..fb01ce224 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 - + https://github.com/dotnet/arcade - 59ac824080b9807fd91dbc8a6d2b4447e74874ab + e5a90b587998f96289f8814de46553c0f9667eb8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f0f30eae3..7ca80b170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23313.4 + 7.0.0-beta.23316.4 diff --git a/global.json b/global.json index 30cab30b8..c39b8898d 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.23313.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23313.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23316.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23316.4" } } From 53e9a51eb5f69b1e94e6058cab0b934958074bb6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 19:25:33 +0000 Subject: [PATCH 052/124] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 84 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e70fca1b..2337fad73 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - - - + - - - - - + + - + + @@ -48,15 +44,15 @@ - - - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85cc11e2d..ffee20318 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + ef5ffb51ac08239cf74366ca7a99d738afdf6953 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55a9757a052de9da9c0d5a66c17ff5676e5cf302 + 578b4bb4995d42b87bcf783167f1e60c10831230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + 8324ea1e8a1daabdee5390cf0150b63f9d61554c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + 0384a8ccb0b68916b599cf92419f895f6dabd1fa https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3d0a49305..21997d251 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 @@ -56,13 +56,13 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.8 + 7.0.8 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 + 7.0.8-servicing.23314.7 0.2.0 @@ -70,32 +70,32 @@ 7.0.108 - 7.0.108-servicing.23314.6 - 7.0.108-servicing.23314.6 + 7.0.108-servicing.23315.40 + 7.0.108-servicing.23315.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.3 + 7.0.4 - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23313.27 + 7.0.8-servicing.23313.27 + 7.0.8 + 7.0.8 + 7.0.8 + 7.0.8 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23315.5 + 7.0.8-servicing.23315.5 + 7.0.8 + 7.0.8 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.8 + 7.0.8 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a0f1d99cf7e91193b50d38bfb4f308d2b0f074fc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 22:23:25 +0000 Subject: [PATCH 053/124] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2337fad73..99211be6b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffee20318..15d16b61e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef5ffb51ac08239cf74366ca7a99d738afdf6953 + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578b4bb4995d42b87bcf783167f1e60c10831230 + 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 diff --git a/eng/Versions.props b/eng/Versions.props index 21997d251..32dc1550b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.8 7.0.8 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 - 7.0.8-servicing.23314.7 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.108 - 7.0.108-servicing.23315.40 - 7.0.108-servicing.23315.40 + 7.0.108-servicing.23316.35 + 7.0.108-servicing.23316.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98ab45b66f640b766fdaabb7690b0c0ebacd60d7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 19 Jun 2023 16:15:48 +0000 Subject: [PATCH 054/124] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230619.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.304 -> To Version 7.0.305 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.NETCore.Platforms,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.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.7 -> To Version 7.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++ eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 94 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee25bfce..e34a7cc19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -38,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb01ce224..692a81a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 562e99a8c49241d8a01db278541ceef9c3cafd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 80034989d137b7f61735ce4e9a47a99ee79c2174 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9abb6bda1703918c0172e5170b66af31867fdeeb + 2e8cd941158191d8a939d1b6cf65df42353cc8b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + 8324ea1e8a1daabdee5390cf0150b63f9d61554c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + 0384a8ccb0b68916b599cf92419f895f6dabd1fa https://github.com/dotnet/fsharp @@ -133,9 +133,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 + e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb @@ -149,13 +149,13 @@ c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 07e2947214f1a9f28a3517762c939d5bebb5f525 + 212455df784ee3d6bc40abd80a0b5f13174043e2 - + https://github.com/dotnet/msbuild - 07e2947214f1a9f28a3517762c939d5bebb5f525 + 212455df784ee3d6bc40abd80a0b5f13174043e2 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7ca80b170..ba019612c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23314.7 @@ -56,22 +56,22 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.8 + 7.0.8 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 + 7.0.8-servicing.23315.16 0.2.0 - 7.0.304 - 7.0.304-servicing.23275.9 - 7.0.304-servicing.23275.9 + 7.0.305 + 7.0.305-servicing.23319.4 + 7.0.305-servicing.23319.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,24 +82,24 @@ - 7.0.3 + 7.0.4 - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23313.27 + 7.0.8-servicing.23313.27 + 7.0.8 + 7.0.8 + 7.0.8 + 7.0.8 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23315.5 + 7.0.8-servicing.23315.5 + 7.0.8 + 7.0.8 @@ -197,7 +197,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230405-08 + 17.6.3-release-20230616-01 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.8 + 7.0.8 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 523e11f7dfce79dbb6b4cf27454a9862b096b4f2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 19 Jun 2023 12:19:35 -0500 Subject: [PATCH 055/124] Update source-build-tarball-build-official.yml triggers (#16733) --- eng/source-build-tarball-build-official.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5423bbd70..7164fafb7 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -8,9 +8,9 @@ resources: branches: include: - release/6.0.1xx - - internal/release/6.0.1xx + - internal/release/6.0.1xx* - release/7.0.1xx - - internal/release/7.0.1xx + - internal/release/7.0.1xx* stages: - build From 2c285f563ad6256005b8dfe3bf4e34dbdaff567e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:32 -0700 Subject: [PATCH 056/124] Update branding to 6.0.120 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6eaaec694..36c7bd2a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7ffe202ef66f4b7271fa5d9481d6cf800c73a4c4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:37 -0700 Subject: [PATCH 057/124] Update branding to 6.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 882aabe10..967fd94f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 4359922858a58e60c62804abe186cebc15fc389c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:43 -0700 Subject: [PATCH 058/124] Update branding to 6.0.412 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3fbf82613..4083592e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 92014f47c6b26566430e1f7b3fbecc6fef475b97 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:48 -0700 Subject: [PATCH 059/124] Update branding to 7.0.109 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 27c843fa4..30c7672e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 8eb4655e323c3beb4794174b0de7234da08620b0 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 19 Jun 2023 10:36:54 -0700 Subject: [PATCH 060/124] Update branding to 7.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7ca80b170..797c58f9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 5740db2e46c7b031d644644883be32cf1a01f2a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jun 2023 03:45:35 +0000 Subject: [PATCH 061/124] Update dependencies from https://github.com/dotnet/sdk build 20230620.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23320.18 -> To Version 7.0.400-preview.23320.35 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks From Version 12.7.0-beta.23320.2 -> To Version 12.7.0-beta.23320.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 988ad5596..1d1d63220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 47b06d63fa7c1a7f00a77add7636340a63a0d00e + e9cfaa2972679cbd3325a3af525bbe64e72d3c26 - + https://github.com/dotnet/sdk - 47b06d63fa7c1a7f00a77add7636340a63a0d00e + e9cfaa2972679cbd3325a3af525bbe64e72d3c26 - + https://github.com/dotnet/sdk - 47b06d63fa7c1a7f00a77add7636340a63a0d00e + e9cfaa2972679cbd3325a3af525bbe64e72d3c26 - + https://github.com/dotnet/sdk - 47b06d63fa7c1a7f00a77add7636340a63a0d00e + e9cfaa2972679cbd3325a3af525bbe64e72d3c26 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 512eac4b458953da405f51ec0ae7766bcb7b32e5 - + https://github.com/dotnet/fsharp - c2fa112f2685984b8f56c13c19cb29c4db4a383b + a225a7d2494183ffa2a43d16efd9f2f93b9b7a98 - + https://github.com/dotnet/fsharp - c2fa112f2685984b8f56c13c19cb29c4db4a383b + a225a7d2494183ffa2a43d16efd9f2f93b9b7a98 @@ -144,23 +144,23 @@ linker - + https://github.com/dotnet/roslyn - b0b4061b8210ce3bdba3581db0646211ede15990 + 50aa37f11d39a55f70254eca281749dc40cb52ee - + https://github.com/dotnet/msbuild - cf384834ddc8c5e6e5f58b1d90768cea9541e801 + d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 - + https://github.com/dotnet/msbuild - cf384834ddc8c5e6e5f58b1d90768cea9541e801 + d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 - + https://github.com/nuget/nuget.client - 1c0f0fbf5d880695c94a394b1062136c24db6bcc + 488693efb590056b7f9e07d3a376d17c60d7f9e6 diff --git a/eng/Versions.props b/eng/Versions.props index 844a769aa..453edbe30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23320.18 - 7.0.400-preview.23320.18 - 7.0.400-preview.23320.18 + 7.0.400-preview.23320.35 + 7.0.400-preview.23320.35 + 7.0.400-preview.23320.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23319.5 + 4.7.0-3.23320.5 From a3474d9e1c7f292d11bfbcf008e2b0087dc0c5fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jun 2023 04:49:54 +0000 Subject: [PATCH 062/124] Update dependencies from https://github.com/dotnet/sdk build 20230620.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23320.18 -> To Version 7.0.400-preview.23320.37 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks From Version 12.7.0-beta.23320.2 -> To Version 12.7.0-beta.23320.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d1d63220..c943a67e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - e9cfaa2972679cbd3325a3af525bbe64e72d3c26 + fbaac5e966232a678a68c9df272227cbe85e7d5c - + https://github.com/dotnet/sdk - e9cfaa2972679cbd3325a3af525bbe64e72d3c26 + fbaac5e966232a678a68c9df272227cbe85e7d5c - + https://github.com/dotnet/sdk - e9cfaa2972679cbd3325a3af525bbe64e72d3c26 + fbaac5e966232a678a68c9df272227cbe85e7d5c - + https://github.com/dotnet/sdk - e9cfaa2972679cbd3325a3af525bbe64e72d3c26 + fbaac5e966232a678a68c9df272227cbe85e7d5c diff --git a/eng/Versions.props b/eng/Versions.props index 453edbe30..c0c492d6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23320.35 - 7.0.400-preview.23320.35 - 7.0.400-preview.23320.35 + 7.0.400-preview.23320.37 + 7.0.400-preview.23320.37 + 7.0.400-preview.23320.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83d8c761bdea42d33efca3d06e7aa958819e6a7e Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 21 Jun 2023 14:20:41 -0700 Subject: [PATCH 063/124] Update poison-usage baseline (#16775) --- .../assets/baselines/PoisonUsage.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 9428e5b29..e29c81347 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -20,15 +20,6 @@ AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute From 5a4f609a92dd5d79eb94ca32f428a820efb06514 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:54:52 +0000 Subject: [PATCH 064/124] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16773) [release/7.0.4xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c943a67e2..748c55e00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - fbaac5e966232a678a68c9df272227cbe85e7d5c + e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 - + https://github.com/dotnet/sdk - fbaac5e966232a678a68c9df272227cbe85e7d5c + e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 - + https://github.com/dotnet/sdk - fbaac5e966232a678a68c9df272227cbe85e7d5c + e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 - + https://github.com/dotnet/sdk - fbaac5e966232a678a68c9df272227cbe85e7d5c + e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 diff --git a/eng/Versions.props b/eng/Versions.props index c0c492d6e..51b9a45ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23320.37 - 7.0.400-preview.23320.37 - 7.0.400-preview.23320.37 + 7.0.400-preview.23321.4 + 7.0.400-preview.23321.4 + 7.0.400-preview.23321.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8fa4a8d83bb9de77ae5229b36a63c13f0dfa7f1e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 13:13:28 +0000 Subject: [PATCH 065/124] Merged PR 32045: [internal/release/7.0.1xx] 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 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Build**: from 17.4.6 to 17.4.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23313.27 t... --- NuGet.config | 20 ++++---- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99211be6b..07a65d2c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d16b61e..a6bbb65f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9a84e296a15c55431a8cefcf9ecce83db1ec98 + 02690a4117050269e2100f67e6bb1d5abb5cb694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8324ea1e8a1daabdee5390cf0150b63f9d61554c + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0384a8ccb0b68916b599cf92419f895f6dabd1fa + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 020b625cf1f16f4a4f22b3c15a015c1160467ed5 + 6918b863aa37ad0699f98482fbab9f7a52e65a92 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0d271ac80..9907f4ab3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.6 - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.9 @@ -56,22 +56,22 @@ - 7.0.8 - 7.0.8 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 + 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 0.2.0 - 7.0.108 - 7.0.108-servicing.23316.35 - 7.0.108-servicing.23316.35 + 7.0.109 + 7.0.109-servicing.23321.34 + 7.0.109-servicing.23321.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.8-servicing.23313.27 - 7.0.8-servicing.23313.27 - 7.0.8 - 7.0.8 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.8-servicing.23315.5 - 7.0.8-servicing.23315.5 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.8 - 7.0.8 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From f500069cb7cdd01b435961287361b9ad21203c67 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 13:13:33 +0000 Subject: [PATCH 066/124] Merged PR 32044: [internal/release/7.0.3xx] 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 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23211.1 to 7.0.100-1.23321.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.6.6 to 17.6.8 (parent: ... --- NuGet.config | 20 +++---- eng/Version.Details.xml | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++--------- 3 files changed, 91 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index e34a7cc19..2ae8fcee2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 692a81a31..b2371cf7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 562e99a8c49241d8a01db278541ceef9c3cafd7a + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 80034989d137b7f61735ce4e9a47a99ee79c2174 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e8cd941158191d8a939d1b6cf65df42353cc8b9 + ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8324ea1e8a1daabdee5390cf0150b63f9d61554c + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0384a8ccb0b68916b599cf92419f895f6dabd1fa + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c + 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 linker @@ -149,13 +149,13 @@ c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 212455df784ee3d6bc40abd80a0b5f13174043e2 + c70978d4d2178cc5c53d3e1946d187a2ddc41931 - + https://github.com/dotnet/msbuild - 212455df784ee3d6bc40abd80a0b5f13174043e2 + c70978d4d2178cc5c53d3e1946d187a2ddc41931 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8ac45d6c9..669e80753 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.6 - 7.0.8-servicing.23314.7 + 7.0.9-servicing.23321.9 @@ -56,22 +56,22 @@ - 7.0.8 - 7.0.8 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 - 7.0.8-servicing.23315.16 + 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 0.2.0 - 7.0.305 - 7.0.305-servicing.23319.4 - 7.0.305-servicing.23319.4 + 7.0.306 + 7.0.306-servicing.23321.40 + 7.0.306-servicing.23321.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.8-servicing.23313.27 - 7.0.8-servicing.23313.27 - 7.0.8 - 7.0.8 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.8-servicing.23315.5 - 7.0.8-servicing.23315.5 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.8 - 7.0.8 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 2b8b3238efe3503bc2679af1d5de6053e107f535 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 17:23:28 +0000 Subject: [PATCH 067/124] Merged PR 32177: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230622.6 - **Date Produced**: June 22, 2023 4:39:37 PM UTC - **Commit**: e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC02690a4117&targetVersion=GCe4f279b133&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07a65d2c0..d977b32d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6bbb65f2..36e803a0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02690a4117050269e2100f67e6bb1d5abb5cb694 + e4f279b13323ec1e4ca16a5f0d44abf1bba14326 diff --git a/eng/Versions.props b/eng/Versions.props index 9907f4ab3..c53aeef9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.109 - 7.0.109-servicing.23321.34 - 7.0.109-servicing.23321.34 + 7.0.109-servicing.23322.6 + 7.0.109-servicing.23322.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0baee9a10c2399a800ae5bc2f9b66aec34fbe450 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 21:25:37 +0000 Subject: [PATCH 068/124] Update dependencies from https://github.com/dotnet/sdk build 20230622.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23321.4 -> To Version 7.0.400-preview.23322.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.7.0-beta.23320.4 -> To Version 12.7.0-beta.23322.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 748c55e00..642be5cbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 + 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f - + https://github.com/dotnet/sdk - e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 + 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f - + https://github.com/dotnet/sdk - e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 + 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f - + https://github.com/dotnet/sdk - e2699dbb7b2269ddd86f933b0d7cb0a72c79c6a4 + 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 512eac4b458953da405f51ec0ae7766bcb7b32e5 - + https://github.com/dotnet/fsharp - a225a7d2494183ffa2a43d16efd9f2f93b9b7a98 + 3b723067a1be6d2e960125bd841c7d87b68a83f1 - + https://github.com/dotnet/fsharp - a225a7d2494183ffa2a43d16efd9f2f93b9b7a98 + 3b723067a1be6d2e960125bd841c7d87b68a83f1 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 50aa37f11d39a55f70254eca281749dc40cb52ee + 1418690ab283793bfe5fc3da00f7533683f5f56b diff --git a/eng/Versions.props b/eng/Versions.props index 51b9a45ad..f9938f58d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23321.4 - 7.0.400-preview.23321.4 - 7.0.400-preview.23321.4 + 7.0.400-preview.23322.20 + 7.0.400-preview.23322.20 + 7.0.400-preview.23322.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23320.5 + 4.7.0-3.23321.5 From 1dbbc5252014f8b5233c91a722fce75bbeecb46c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 22 Jun 2023 22:11:11 +0000 Subject: [PATCH 069/124] Merged PR 32192: Set OmniSharp run script to be executable Backport of https://github.com/dotnet/installer/pull/16772 --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 56f14043b..f8d6ce417 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -6,6 +6,7 @@ using System; using System.Diagnostics; using System.IO; using System.Net.Http; +using System.Security.AccessControl; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -66,6 +67,9 @@ public class OmniSharpTests : SmokeTests Directory.CreateDirectory(OmniSharpDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + + // Ensure the run script is executable (see https://github.com/OmniSharp/omnisharp-roslyn/issues/2547) + File.SetUnixFileMode($"{OmniSharpDirectory}/run", UnixFileMode.UserRead | UnixFileMode.UserExecute); } } } From a975c9588df0b05f7dda9ea6a6ad29ecf7577c7b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:24:11 +0000 Subject: [PATCH 070/124] Merged PR 32191: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230622.18 - **Date Produced**: June 22, 2023 7:43:04 PM UTC - **Commit**: 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe4f279b133&targetVersion=GC2b3241fd09&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d977b32d7..704eeb938 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36e803a0f..fba6bea06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4f279b13323ec1e4ca16a5f0d44abf1bba14326 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 diff --git a/eng/Versions.props b/eng/Versions.props index c53aeef9f..a8fd47da5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.109 - 7.0.109-servicing.23322.6 - 7.0.109-servicing.23322.6 + 7.0.109-servicing.23322.18 + 7.0.109-servicing.23322.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 941cc45db58e2fcaf61b6aeca707b0ed6681e2b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 00:45:04 +0000 Subject: [PATCH 071/124] Update dependencies from https://github.com/dotnet/sdk build 20230622.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23322.20 -> To Version 7.0.400-preview.23322.23 Dependency coherency updates Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview-23320-09 -> To Version 17.7.0-preview-23321-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 642be5cbc..bfd4fa0b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f + cf49039317fd704c0b07309712f920994de9feb6 - + https://github.com/dotnet/sdk - 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f + cf49039317fd704c0b07309712f920994de9feb6 - + https://github.com/dotnet/sdk - 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f + cf49039317fd704c0b07309712f920994de9feb6 - + https://github.com/dotnet/sdk - 568e80bfe25c217f0bd05ec23075f3ddd1f7c62f + cf49039317fd704c0b07309712f920994de9feb6 @@ -149,11 +149,11 @@ 1418690ab283793bfe5fc3da00f7533683f5f56b - + https://github.com/dotnet/msbuild d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 - + https://github.com/dotnet/msbuild d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 diff --git a/eng/Versions.props b/eng/Versions.props index f9938f58d..004c25749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23322.20 - 7.0.400-preview.23322.20 - 7.0.400-preview.23322.20 + 7.0.400-preview.23322.23 + 7.0.400-preview.23322.23 + 7.0.400-preview.23322.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7364b47e3e548db13e6aae283bf77b89ea6fd5ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 02:09:03 +0000 Subject: [PATCH 072/124] Update dependencies from https://github.com/dotnet/sdk build 20230622.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23322.20 -> To Version 7.0.400-preview.23322.27 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 7.0.100-1.23211.1 -> To Version 7.0.100-1.23321.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd4fa0b8..1491e15a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - cf49039317fd704c0b07309712f920994de9feb6 + 263a820e9c2daa8d1584dc434dce79f6b0591e8d - + https://github.com/dotnet/sdk - cf49039317fd704c0b07309712f920994de9feb6 + 263a820e9c2daa8d1584dc434dce79f6b0591e8d - + https://github.com/dotnet/sdk - cf49039317fd704c0b07309712f920994de9feb6 + 263a820e9c2daa8d1584dc434dce79f6b0591e8d - + https://github.com/dotnet/sdk - cf49039317fd704c0b07309712f920994de9feb6 + 263a820e9c2daa8d1584dc434dce79f6b0591e8d @@ -138,15 +138,15 @@ 919ec8358820228cc5fa77ef000051c1d6875399 - + https://github.com/dotnet/linker - 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c + 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 linker - + https://github.com/dotnet/roslyn - 1418690ab283793bfe5fc3da00f7533683f5f56b + 17dcec138afd78a265be020ef8ca0e22a254aa88 diff --git a/eng/Versions.props b/eng/Versions.props index 004c25749..ea63f3415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23322.23 - 7.0.400-preview.23322.23 - 7.0.400-preview.23322.23 + 7.0.400-preview.23322.27 + 7.0.400-preview.23322.27 + 7.0.400-preview.23322.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23321.5 + 4.7.0-3.23321.7 From 350b126ad80aa0649a61d0dc50a17832f2c4b941 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 13:32:54 +0000 Subject: [PATCH 073/124] Update dependencies from https://github.com/dotnet/sdk build 20230623.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23322.20 -> To Version 7.0.400-preview.23323.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 7.0.100-1.23211.1 -> To Version 7.0.100-1.23321.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1491e15a8..a1157280d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 263a820e9c2daa8d1584dc434dce79f6b0591e8d + 84dba95babb0001684954fb66915412839ce566e - + https://github.com/dotnet/sdk - 263a820e9c2daa8d1584dc434dce79f6b0591e8d + 84dba95babb0001684954fb66915412839ce566e - + https://github.com/dotnet/sdk - 263a820e9c2daa8d1584dc434dce79f6b0591e8d + 84dba95babb0001684954fb66915412839ce566e - + https://github.com/dotnet/sdk - 263a820e9c2daa8d1584dc434dce79f6b0591e8d + 84dba95babb0001684954fb66915412839ce566e diff --git a/eng/Versions.props b/eng/Versions.props index ea63f3415..6f1f16126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23322.27 - 7.0.400-preview.23322.27 - 7.0.400-preview.23322.27 + 7.0.400-preview.23323.1 + 7.0.400-preview.23323.1 + 7.0.400-preview.23323.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f7ebafe7bcf94d92ed5909399113ea05d8a3ab1 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 23 Jun 2023 16:27:22 +0200 Subject: [PATCH 074/124] .NET Source-Build 6.0.118 June 2023 Updates (#16670) --- eng/Versions.props | 2 +- global.json | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MissingXmlDoc.txt | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 36c7bd2a5..fa3ce0164 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.116 + 6.0.119 diff --git a/global.json b/global.json index b358f87d3..31e65ea4d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.119", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index f35f08d02..735427521 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116" + "dotnet": "6.0.118" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", 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 3d408da2886068857156d7e5e788153eeb24118e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 14:43:37 +0000 Subject: [PATCH 075/124] Update dependencies from https://github.com/dotnet/sdk build 20230623.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23322.20 -> To Version 7.0.400-preview.23323.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 7.0.100-1.23211.1 -> To Version 7.0.100-1.23321.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1157280d..494ff0e4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 84dba95babb0001684954fb66915412839ce566e + af30c43af60570ee26314433a8e410e725327a83 - + https://github.com/dotnet/sdk - 84dba95babb0001684954fb66915412839ce566e + af30c43af60570ee26314433a8e410e725327a83 - + https://github.com/dotnet/sdk - 84dba95babb0001684954fb66915412839ce566e + af30c43af60570ee26314433a8e410e725327a83 - + https://github.com/dotnet/sdk - 84dba95babb0001684954fb66915412839ce566e + af30c43af60570ee26314433a8e410e725327a83 diff --git a/eng/Versions.props b/eng/Versions.props index 6f1f16126..430c750b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23323.1 - 7.0.400-preview.23323.1 - 7.0.400-preview.23323.1 + 7.0.400-preview.23323.2 + 7.0.400-preview.23323.2 + 7.0.400-preview.23323.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce757d5247cf207ee60cada438b8d7be34d9bf9d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 23 Jun 2023 09:29:09 -0700 Subject: [PATCH 076/124] Update Implicit version for the OOB release --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f9938f58d..e2491f313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 30 32 17 - 18 + 19 From c255b45852b212d2e7d5c8c7c431da7e9168664c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 23 Jun 2023 12:27:37 -0500 Subject: [PATCH 077/124] .NET Source-Build 7.0.108 June 2023 OOB Updates (#16795) --- eng/Versions.props | 4 ++-- global.json | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 30c7672e8..81fc3e7ae 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.107 - 7.0.107 + 7.0.108 + 7.0.108 diff --git a/global.json b/global.json index 30cab30b8..eaf4d3f50 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107", + "dotnet": "7.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 5782f6cac..95586bbec 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107" + "dotnet": "7.0.108" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 1aeb92395a4b9595f6d7f902c378edeb020836a0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 23 Jun 2023 13:31:22 -0500 Subject: [PATCH 078/124] Fix SDK version of source-build global.json (#16798) --- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MissingXmlDoc.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 735427521..daa061377 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118" + "dotnet": "6.0.119" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", 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 1a158e260d1730dbcbc507e3da1affe5b16a443c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 20:49:15 +0000 Subject: [PATCH 079/124] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16805) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.7.0-beta.23322.4 to 12.7.0-beta.23323.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23322.4 to 7.0.400-beta.23323.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23321.7 to 4.7.0-3.23322.2 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.7.0-preview.3.93 to 6.7.0-rc.100 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 494ff0e4f..dfef81f6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - af30c43af60570ee26314433a8e410e725327a83 + 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 - + https://github.com/dotnet/sdk - af30c43af60570ee26314433a8e410e725327a83 + 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 - + https://github.com/dotnet/sdk - af30c43af60570ee26314433a8e410e725327a83 + 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 - + https://github.com/dotnet/sdk - af30c43af60570ee26314433a8e410e725327a83 + 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 512eac4b458953da405f51ec0ae7766bcb7b32e5 - + https://github.com/dotnet/fsharp - 3b723067a1be6d2e960125bd841c7d87b68a83f1 + 6f9c92a4453adc06e346cdad745e00d8728b1c55 - + https://github.com/dotnet/fsharp - 3b723067a1be6d2e960125bd841c7d87b68a83f1 + 6f9c92a4453adc06e346cdad745e00d8728b1c55 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 17dcec138afd78a265be020ef8ca0e22a254aa88 + 832d1ac5b2acde9163c9491c514869c9d5cfe722 @@ -158,9 +158,9 @@ d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 - + https://github.com/nuget/nuget.client - 488693efb590056b7f9e07d3a376d17c60d7f9e6 + 7672998c625fe99464d221d5daa0685f7462a365 diff --git a/eng/Versions.props b/eng/Versions.props index 430c750b5..0ceedf78c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23323.2 - 7.0.400-preview.23323.2 - 7.0.400-preview.23323.2 + 7.0.400-preview.23323.9 + 7.0.400-preview.23323.9 + 7.0.400-preview.23323.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23321.7 + 4.7.0-3.23322.2 From b5182adaab90d3561822bb8725ecea6b5bdae7f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 20:54:14 +0000 Subject: [PATCH 080/124] Update dependencies from https://github.com/dotnet/sdk build 20230623.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23323.9 -> To Version 7.0.400-preview.23323.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfef81f6b..fc7532393 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 + 0e69533a906902d1394bb722e4809a76c3e24861 - + https://github.com/dotnet/sdk - 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 + 0e69533a906902d1394bb722e4809a76c3e24861 - + https://github.com/dotnet/sdk - 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 + 0e69533a906902d1394bb722e4809a76c3e24861 - + https://github.com/dotnet/sdk - 76bdca7492a6be3fa8f272312ad0a43cf7d020f1 + 0e69533a906902d1394bb722e4809a76c3e24861 diff --git a/eng/Versions.props b/eng/Versions.props index 0ceedf78c..a57dcc82e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23323.9 - 7.0.400-preview.23323.9 - 7.0.400-preview.23323.9 + 7.0.400-preview.23323.10 + 7.0.400-preview.23323.10 + 7.0.400-preview.23323.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f1f74e41bd87d25cee6811b758202246d648369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jun 2023 21:57:32 +0000 Subject: [PATCH 081/124] Update dependencies from https://github.com/dotnet/sdk build 20230623.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23323.9 -> To Version 7.0.400-preview.23323.13 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc7532393..7408a5f44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 0e69533a906902d1394bb722e4809a76c3e24861 + 4682a5bf6314529730e2d489dcc8d1e920a2311c - + https://github.com/dotnet/sdk - 0e69533a906902d1394bb722e4809a76c3e24861 + 4682a5bf6314529730e2d489dcc8d1e920a2311c - + https://github.com/dotnet/sdk - 0e69533a906902d1394bb722e4809a76c3e24861 + 4682a5bf6314529730e2d489dcc8d1e920a2311c - + https://github.com/dotnet/sdk - 0e69533a906902d1394bb722e4809a76c3e24861 + 4682a5bf6314529730e2d489dcc8d1e920a2311c diff --git a/eng/Versions.props b/eng/Versions.props index a57dcc82e..c3d0be500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23323.10 - 7.0.400-preview.23323.10 - 7.0.400-preview.23323.10 + 7.0.400-preview.23323.13 + 7.0.400-preview.23323.13 + 7.0.400-preview.23323.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a2836e990eb993db3159e24c374cb29f4118364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jun 2023 04:15:26 +0000 Subject: [PATCH 082/124] Update dependencies from https://github.com/dotnet/sdk build 20230624.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23323.9 -> To Version 7.0.400-preview.23324.7 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.100 -> To Version 6.7.0-rc.106 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7408a5f44..a40281a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 4682a5bf6314529730e2d489dcc8d1e920a2311c + d3daf69397230ef1fd358a1385219a79dd4877f3 - + https://github.com/dotnet/sdk - 4682a5bf6314529730e2d489dcc8d1e920a2311c + d3daf69397230ef1fd358a1385219a79dd4877f3 - + https://github.com/dotnet/sdk - 4682a5bf6314529730e2d489dcc8d1e920a2311c + d3daf69397230ef1fd358a1385219a79dd4877f3 - + https://github.com/dotnet/sdk - 4682a5bf6314529730e2d489dcc8d1e920a2311c + d3daf69397230ef1fd358a1385219a79dd4877f3 @@ -158,9 +158,9 @@ d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 - + https://github.com/nuget/nuget.client - 7672998c625fe99464d221d5daa0685f7462a365 + 4b6a87bfe90d247f961eba41d63dbf418a56fdcc diff --git a/eng/Versions.props b/eng/Versions.props index c3d0be500..a2b75297f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23323.13 - 7.0.400-preview.23323.13 - 7.0.400-preview.23323.13 + 7.0.400-preview.23324.7 + 7.0.400-preview.23324.7 + 7.0.400-preview.23324.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a8638d3f5f7652b4b0573b6ca2f288f329f317e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jun 2023 05:39:41 +0000 Subject: [PATCH 083/124] Update dependencies from https://github.com/dotnet/sdk build 20230624.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23324.7 -> To Version 7.0.400-preview.23324.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 4.7.0-3.23322.2 -> To Version 4.7.0-3.23324.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee25bfce..7841c2810 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a40281a58..565c2a206 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - d3daf69397230ef1fd358a1385219a79dd4877f3 + 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe - + https://github.com/dotnet/sdk - d3daf69397230ef1fd358a1385219a79dd4877f3 + 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe - + https://github.com/dotnet/sdk - d3daf69397230ef1fd358a1385219a79dd4877f3 + 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe - + https://github.com/dotnet/sdk - d3daf69397230ef1fd358a1385219a79dd4877f3 + 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 832d1ac5b2acde9163c9491c514869c9d5cfe722 + d0f4099ffa7f8ff31fd397a4a96f404e1cd7dfc7 - + https://github.com/dotnet/msbuild - d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 + 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 - + https://github.com/dotnet/msbuild - d30eef85d29102bdc0be8d1ad3ed7dd321341fa6 + 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 diff --git a/eng/Versions.props b/eng/Versions.props index 7b82eb580..6b2643a0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23324.7 - 7.0.400-preview.23324.7 - 7.0.400-preview.23324.7 + 7.0.400-preview.23324.10 + 7.0.400-preview.23324.10 + 7.0.400-preview.23324.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23322.2 + 4.7.0-3.23324.1 From aa2e8554354b5a48ba45fea7064ccd337f35c867 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jun 2023 22:10:55 +0000 Subject: [PATCH 084/124] Update dependencies from https://github.com/dotnet/sdk build 20230626.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23324.10 -> To Version 7.0.400-preview.23326.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23324.1 -> To Version 4.7.0-3.23326.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 565c2a206..50a5d1e54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe + 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 - + https://github.com/dotnet/sdk - 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe + 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 - + https://github.com/dotnet/sdk - 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe + 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 - + https://github.com/dotnet/sdk - 46ff42ebbd51b93dcca4977d77ad0cdd60619bfe + 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - d0f4099ffa7f8ff31fd397a4a96f404e1cd7dfc7 + 419ee237406466eebd6bdfbf932a31e26971ec4c diff --git a/eng/Versions.props b/eng/Versions.props index 6b2643a0d..15d55526b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23324.10 - 7.0.400-preview.23324.10 - 7.0.400-preview.23324.10 + 7.0.400-preview.23326.9 + 7.0.400-preview.23326.9 + 7.0.400-preview.23326.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23324.1 + 4.7.0-3.23326.2 From 3f0b2f9109149ee6934d980a567fa98a08158129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jun 2023 03:27:19 +0000 Subject: [PATCH 085/124] Update dependencies from https://github.com/dotnet/sdk build 20230626.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23326.9 -> To Version 7.0.400-preview.23326.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50a5d1e54..1de84995e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 + 02385f72d32c194f6d29aec65ea7ffcb571a56d4 - + https://github.com/dotnet/sdk - 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 + 02385f72d32c194f6d29aec65ea7ffcb571a56d4 - + https://github.com/dotnet/sdk - 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 + 02385f72d32c194f6d29aec65ea7ffcb571a56d4 - + https://github.com/dotnet/sdk - 08892312aaab51b4141ebe8fdfd76e33f7cf5a39 + 02385f72d32c194f6d29aec65ea7ffcb571a56d4 diff --git a/eng/Versions.props b/eng/Versions.props index 15d55526b..e34aa65c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23326.9 - 7.0.400-preview.23326.9 - 7.0.400-preview.23326.9 + 7.0.400-preview.23326.10 + 7.0.400-preview.23326.10 + 7.0.400-preview.23326.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 80b28a2fda4ba4cf4afb1bb77bb386b4ef8f70f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jun 2023 08:16:48 +0000 Subject: [PATCH 086/124] Update dependencies from https://github.com/dotnet/sdk build 20230627.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23326.10 -> To Version 7.0.400-preview.23327.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23326.2 -> To Version 4.7.0-3.23326.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1de84995e..c8d618789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 02385f72d32c194f6d29aec65ea7ffcb571a56d4 + d8e3201b5923b6297e714c866fd2758d75788f56 - + https://github.com/dotnet/sdk - 02385f72d32c194f6d29aec65ea7ffcb571a56d4 + d8e3201b5923b6297e714c866fd2758d75788f56 - + https://github.com/dotnet/sdk - 02385f72d32c194f6d29aec65ea7ffcb571a56d4 + d8e3201b5923b6297e714c866fd2758d75788f56 - + https://github.com/dotnet/sdk - 02385f72d32c194f6d29aec65ea7ffcb571a56d4 + d8e3201b5923b6297e714c866fd2758d75788f56 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 419ee237406466eebd6bdfbf932a31e26971ec4c + bdbf1cb87abc8f9554ee331a1113d533ae5ec5fb diff --git a/eng/Versions.props b/eng/Versions.props index e34aa65c0..ef744fdc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23326.10 - 7.0.400-preview.23326.10 - 7.0.400-preview.23326.10 + 7.0.400-preview.23327.1 + 7.0.400-preview.23327.1 + 7.0.400-preview.23327.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23326.2 + 4.7.0-3.23326.8 From 1f1e39cae90765425ff706f1c081d2dd094a99fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 23:57:56 +0000 Subject: [PATCH 087/124] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16835) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.7.0-beta.23323.1 to 12.7.0-beta.23327.7 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23323.1 to 7.0.400-beta.23327.7 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.7.0-rc.106 to 6.7.0-rc.110 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8d618789..fc1f147a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - d8e3201b5923b6297e714c866fd2758d75788f56 + db293d5c5e41d25fcf956332afc4aa76688454c6 - + https://github.com/dotnet/sdk - d8e3201b5923b6297e714c866fd2758d75788f56 + db293d5c5e41d25fcf956332afc4aa76688454c6 - + https://github.com/dotnet/sdk - d8e3201b5923b6297e714c866fd2758d75788f56 + db293d5c5e41d25fcf956332afc4aa76688454c6 - + https://github.com/dotnet/sdk - d8e3201b5923b6297e714c866fd2758d75788f56 + db293d5c5e41d25fcf956332afc4aa76688454c6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 512eac4b458953da405f51ec0ae7766bcb7b32e5 - + https://github.com/dotnet/fsharp - 6f9c92a4453adc06e346cdad745e00d8728b1c55 + 060334590be6d648bfc8783ccb927768c8f1ff15 - + https://github.com/dotnet/fsharp - 6f9c92a4453adc06e346cdad745e00d8728b1c55 + 060334590be6d648bfc8783ccb927768c8f1ff15 @@ -158,9 +158,9 @@ 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 - + https://github.com/nuget/nuget.client - 4b6a87bfe90d247f961eba41d63dbf418a56fdcc + c5bd16462dc64f2f3608837b4a261547f2b739da diff --git a/eng/Versions.props b/eng/Versions.props index ef744fdc4..e441f1f95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23327.1 - 7.0.400-preview.23327.1 - 7.0.400-preview.23327.1 + 7.0.400-preview.23327.13 + 7.0.400-preview.23327.13 + 7.0.400-preview.23327.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d7c3fdc0ba32940032d5760c46b224ec0a6d2e38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 08:07:13 +0000 Subject: [PATCH 088/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23327.13 -> To Version 7.0.400-preview.23328.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23326.8 -> To Version 4.7.0-3.23327.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc1f147a0..902895dd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - db293d5c5e41d25fcf956332afc4aa76688454c6 + 75a8d367accf059e7c86ec0aadef18bb0101c08f - + https://github.com/dotnet/sdk - db293d5c5e41d25fcf956332afc4aa76688454c6 + 75a8d367accf059e7c86ec0aadef18bb0101c08f - + https://github.com/dotnet/sdk - db293d5c5e41d25fcf956332afc4aa76688454c6 + 75a8d367accf059e7c86ec0aadef18bb0101c08f - + https://github.com/dotnet/sdk - db293d5c5e41d25fcf956332afc4aa76688454c6 + 75a8d367accf059e7c86ec0aadef18bb0101c08f @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - bdbf1cb87abc8f9554ee331a1113d533ae5ec5fb + 575bc42589145ba18b4f1cc2267d02695f861d8f diff --git a/eng/Versions.props b/eng/Versions.props index e441f1f95..de2f3a1d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23327.13 - 7.0.400-preview.23327.13 - 7.0.400-preview.23327.13 + 7.0.400-preview.23328.1 + 7.0.400-preview.23328.1 + 7.0.400-preview.23328.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23326.8 + 4.7.0-3.23327.5 From 44cbd3f10ee044327083d43c5cbcfeacbee2ed13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 09:11:33 +0000 Subject: [PATCH 089/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.1 -> To Version 7.0.400-preview.23328.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 902895dd8..1a580e174 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 75a8d367accf059e7c86ec0aadef18bb0101c08f + addd779bc6c18e7cf6800ed3fbac3cd9dd15513e - + https://github.com/dotnet/sdk - 75a8d367accf059e7c86ec0aadef18bb0101c08f + addd779bc6c18e7cf6800ed3fbac3cd9dd15513e - + https://github.com/dotnet/sdk - 75a8d367accf059e7c86ec0aadef18bb0101c08f + addd779bc6c18e7cf6800ed3fbac3cd9dd15513e - + https://github.com/dotnet/sdk - 75a8d367accf059e7c86ec0aadef18bb0101c08f + addd779bc6c18e7cf6800ed3fbac3cd9dd15513e diff --git a/eng/Versions.props b/eng/Versions.props index de2f3a1d8..62027b05d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23328.1 - 7.0.400-preview.23328.1 - 7.0.400-preview.23328.1 + 7.0.400-preview.23328.4 + 7.0.400-preview.23328.4 + 7.0.400-preview.23328.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5421ee80f1bac70cf552c01402a9b4bfc0640e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 20:11:08 +0000 Subject: [PATCH 090/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.4 -> To Version 7.0.400-preview.23328.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a580e174..cd220440a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - addd779bc6c18e7cf6800ed3fbac3cd9dd15513e + 68770fec5758ade321290620432cd63c22e06f77 - + https://github.com/dotnet/sdk - addd779bc6c18e7cf6800ed3fbac3cd9dd15513e + 68770fec5758ade321290620432cd63c22e06f77 - + https://github.com/dotnet/sdk - addd779bc6c18e7cf6800ed3fbac3cd9dd15513e + 68770fec5758ade321290620432cd63c22e06f77 - + https://github.com/dotnet/sdk - addd779bc6c18e7cf6800ed3fbac3cd9dd15513e + 68770fec5758ade321290620432cd63c22e06f77 diff --git a/eng/Versions.props b/eng/Versions.props index 62027b05d..243414d04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23328.4 - 7.0.400-preview.23328.4 - 7.0.400-preview.23328.4 + 7.0.400-preview.23328.10 + 7.0.400-preview.23328.10 + 7.0.400-preview.23328.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 428ddea82c977e4c949c9ea97cbe63bb4e15e55e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 20:53:22 +0000 Subject: [PATCH 091/124] Update dependencies from https://github.com/dotnet/test-templates build 20230628.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23320.1 -> To Version 1.1.0-rc.23328.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a580e174..dec306624 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 - e713da5f1f9a4b5918810af40d1a2867d46c8b85 + 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/test-templates - e713da5f1f9a4b5918810af40d1a2867d46c8b85 + 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/test-templates - e713da5f1f9a4b5918810af40d1a2867d46c8b85 + 8cfe653fec0848f0745d1285f4bacb7195298b94 diff --git a/eng/Versions.props b/eng/Versions.props index 62027b05d..cc08be307 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23320.1 - 1.1.0-rc.23320.1 - 1.1.0-rc.23320.1 + 1.1.0-rc.23328.1 + 1.1.0-rc.23328.1 + 1.1.0-rc.23328.1 From e212e45f8fcabaa09940b43feb5f07b3ed5b9eab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 22:06:27 +0000 Subject: [PATCH 092/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.4 -> To Version 7.0.400-preview.23328.13 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.110 -> To Version 6.7.0-rc.111 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd220440a..cb2d591cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 68770fec5758ade321290620432cd63c22e06f77 + c602f4179adcc6c814c0458ba1ff2261b9204f3e - + https://github.com/dotnet/sdk - 68770fec5758ade321290620432cd63c22e06f77 + c602f4179adcc6c814c0458ba1ff2261b9204f3e - + https://github.com/dotnet/sdk - 68770fec5758ade321290620432cd63c22e06f77 + c602f4179adcc6c814c0458ba1ff2261b9204f3e - + https://github.com/dotnet/sdk - 68770fec5758ade321290620432cd63c22e06f77 + c602f4179adcc6c814c0458ba1ff2261b9204f3e @@ -158,9 +158,9 @@ 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 - + https://github.com/nuget/nuget.client - c5bd16462dc64f2f3608837b4a261547f2b739da + 13f2b6af6e9864711e815cfbffd7aa5015c52cec diff --git a/eng/Versions.props b/eng/Versions.props index 243414d04..a0635081c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23328.10 - 7.0.400-preview.23328.10 - 7.0.400-preview.23328.10 + 7.0.400-preview.23328.13 + 7.0.400-preview.23328.13 + 7.0.400-preview.23328.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68cdde0b2b19a13cebdd2c37c08b721f9621d314 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jun 2023 23:06:54 +0000 Subject: [PATCH 093/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.4 -> To Version 7.0.400-preview.23328.16 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.110 -> To Version 6.7.0-rc.111 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb2d591cf..92920c2d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - c602f4179adcc6c814c0458ba1ff2261b9204f3e + f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f - + https://github.com/dotnet/sdk - c602f4179adcc6c814c0458ba1ff2261b9204f3e + f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f - + https://github.com/dotnet/sdk - c602f4179adcc6c814c0458ba1ff2261b9204f3e + f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f - + https://github.com/dotnet/sdk - c602f4179adcc6c814c0458ba1ff2261b9204f3e + f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f diff --git a/eng/Versions.props b/eng/Versions.props index a0635081c..c7773745b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23328.13 - 7.0.400-preview.23328.13 - 7.0.400-preview.23328.13 + 7.0.400-preview.23328.16 + 7.0.400-preview.23328.16 + 7.0.400-preview.23328.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a2aaec327330d7005e287070a0c9af3f89ee087 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jun 2023 00:15:34 +0000 Subject: [PATCH 094/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.4 -> To Version 7.0.400-preview.23328.17 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,NuGet.Build.Tasks,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.7 -> To Version 7.0.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92920c2d2..6a638fed0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 952eba8226df6323cee48d83e9351a3ea7a9dd35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 952eba8226df6323cee48d83e9351a3ea7a9dd35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 952eba8226df6323cee48d83e9351a3ea7a9dd35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + 952eba8226df6323cee48d83e9351a3ea7a9dd35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 4b0550942d7e38bf28dcfddb955e616290b83787 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + 3c37ef8f5358abb303c05d299f029fca7d867d56 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f + e1ca2c617583d345175ef11f0dbaced2ec3bc802 - + https://github.com/dotnet/sdk - f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f + e1ca2c617583d345175ef11f0dbaced2ec3bc802 - + https://github.com/dotnet/sdk - f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f + e1ca2c617583d345175ef11f0dbaced2ec3bc802 - + https://github.com/dotnet/sdk - f92e0aeb9a4a724c7b14f37d9228f5f6025b0e1f + e1ca2c617583d345175ef11f0dbaced2ec3bc802 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + f0734135e45ca51f532dd8304e7d120ba027399a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + b10173d88dc484c1462d387c131bdd4c639927e9 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index c7773745b..0dc73cd66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23318.2 - 7.0.7-servicing.23274.5 + 7.0.8-servicing.23318.3 @@ -56,22 +56,22 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.8 + 7.0.8 + 7.0.8-servicing.23318.7 + 7.0.8-servicing.23318.7 + 7.0.8-servicing.23318.7 + 7.0.8-servicing.23318.7 + 7.0.8-servicing.23318.7 0.2.0 - 7.0.400-preview.23328.16 - 7.0.400-preview.23328.16 - 7.0.400-preview.23328.16 + 7.0.400-preview.23328.17 + 7.0.400-preview.23328.17 + 7.0.400-preview.23328.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23318.7 + 7.0.8-servicing.23318.7 + 7.0.8 + 7.0.8 + 7.0.8 + 7.0.8 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.8-servicing.23319.1 + 7.0.8-servicing.23319.1 + 7.0.8 + 7.0.8 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.8 + 7.0.8 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7fd565591e5e370f45c1f4ea59d30c5e136ebcf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jun 2023 03:16:51 +0000 Subject: [PATCH 095/124] Update dependencies from https://github.com/dotnet/sdk build 20230628.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23328.17 -> To Version 7.0.400-preview.23328.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23327.5 -> To Version 4.7.0-3.23328.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index faadeeddd..396245be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/sdk - e1ca2c617583d345175ef11f0dbaced2ec3bc802 + 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 - + https://github.com/dotnet/sdk - e1ca2c617583d345175ef11f0dbaced2ec3bc802 + 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 - + https://github.com/dotnet/sdk - e1ca2c617583d345175ef11f0dbaced2ec3bc802 + 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 - + https://github.com/dotnet/sdk - e1ca2c617583d345175ef11f0dbaced2ec3bc802 + 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 575bc42589145ba18b4f1cc2267d02695f861d8f + 44ee200c0358f7e0451e7705e5183adc3af060f8 diff --git a/eng/Versions.props b/eng/Versions.props index 462fe41e2..276920ca7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23328.17 - 7.0.400-preview.23328.17 - 7.0.400-preview.23328.17 + 7.0.400-preview.23328.19 + 7.0.400-preview.23328.19 + 7.0.400-preview.23328.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23327.5 + 4.7.0-3.23328.9 From a91a5ad1b5c3efefa9e8d4024d59d02309bfcce8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 23:30:32 +0000 Subject: [PATCH 096/124] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16852) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.7.0-beta.23327.7 to 12.7.0-beta.23328.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23327.7 to 7.0.400-beta.23328.4 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23328.9 to 4.7.0-3.23329.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 396245be2..0ee6952f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/sdk - 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 + d439169d65a1495f2dae92b718dc1549d726538d - + https://github.com/dotnet/sdk - 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 + d439169d65a1495f2dae92b718dc1549d726538d - + https://github.com/dotnet/sdk - 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 + d439169d65a1495f2dae92b718dc1549d726538d - + https://github.com/dotnet/sdk - 5c8fc0bac2a0015b33e1d27048ed720bf1ebb5d2 + d439169d65a1495f2dae92b718dc1549d726538d @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b10173d88dc484c1462d387c131bdd4c639927e9 - + https://github.com/dotnet/fsharp - 060334590be6d648bfc8783ccb927768c8f1ff15 + 521a4efba79d9afcfb18bc946d3dda5133252939 - + https://github.com/dotnet/fsharp - 060334590be6d648bfc8783ccb927768c8f1ff15 + 521a4efba79d9afcfb18bc946d3dda5133252939 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 44ee200c0358f7e0451e7705e5183adc3af060f8 + b2bd4936daed91d4efd10c71177f7766823e615c diff --git a/eng/Versions.props b/eng/Versions.props index 276920ca7..168ae576e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23328.19 - 7.0.400-preview.23328.19 - 7.0.400-preview.23328.19 + 7.0.400-preview.23329.8 + 7.0.400-preview.23329.8 + 7.0.400-preview.23329.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23328.9 + 4.7.0-3.23329.1 From 882015fc4a67f0e3ec59f162c6a4776c2ac79f27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:48:09 +0000 Subject: [PATCH 097/124] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#16866) [release/7.0.4xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ee6952f3..f6b8e7028 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,15 +85,15 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/test-templates 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/test-templates 8cfe653fec0848f0745d1285f4bacb7195298b94 diff --git a/eng/Versions.props b/eng/Versions.props index 168ae576e..9ead6cdaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23328.1 - 1.1.0-rc.23328.1 - 1.1.0-rc.23328.1 + 1.1.0-rc.23330.1 + 1.1.0-rc.23330.1 + 1.1.0-rc.23330.1 From 243f48d8e3677a237c492f7f3eebc71d2ccef38f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jun 2023 17:29:31 +0000 Subject: [PATCH 098/124] Update dependencies from https://github.com/dotnet/sdk build 20230630.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23329.8 -> To Version 7.0.400-preview.23330.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6b8e7028..7bd3bff7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 8cfe653fec0848f0745d1285f4bacb7195298b94 - + https://github.com/dotnet/sdk - d439169d65a1495f2dae92b718dc1549d726538d + 9ec662a0a452ac484e8af400a03751a8f7fb576c - + https://github.com/dotnet/sdk - d439169d65a1495f2dae92b718dc1549d726538d + 9ec662a0a452ac484e8af400a03751a8f7fb576c - + https://github.com/dotnet/sdk - d439169d65a1495f2dae92b718dc1549d726538d + 9ec662a0a452ac484e8af400a03751a8f7fb576c - + https://github.com/dotnet/sdk - d439169d65a1495f2dae92b718dc1549d726538d + 9ec662a0a452ac484e8af400a03751a8f7fb576c diff --git a/eng/Versions.props b/eng/Versions.props index 9ead6cdaf..3c73ea87b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23329.8 - 7.0.400-preview.23329.8 - 7.0.400-preview.23329.8 + 7.0.400-preview.23330.8 + 7.0.400-preview.23330.8 + 7.0.400-preview.23330.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From feb42a3adbefd978850d9d75caee9e6928521b0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 21:27:53 +0000 Subject: [PATCH 099/124] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#16875) [release/7.0.4xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bd3bff7e..33c7a754f 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 - 8cfe653fec0848f0745d1285f4bacb7195298b94 + 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/test-templates - 8cfe653fec0848f0745d1285f4bacb7195298b94 + 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/test-templates - 8cfe653fec0848f0745d1285f4bacb7195298b94 + 86fd4cd1c57057f920678e29d6ecbba491abd142 diff --git a/eng/Versions.props b/eng/Versions.props index 3c73ea87b..0ad6ed5f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23330.1 - 1.1.0-rc.23330.1 - 1.1.0-rc.23330.1 + 1.1.0-rc.23330.2 + 1.1.0-rc.23330.2 + 1.1.0-rc.23330.2 From 1adee801d83d1fedc1cee7b32e2882d9d255905f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jun 2023 23:10:14 +0000 Subject: [PATCH 100/124] Update dependencies from https://github.com/dotnet/sdk build 20230630.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23330.8 -> To Version 7.0.400-preview.23330.14 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33c7a754f..0b694fcf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 9ec662a0a452ac484e8af400a03751a8f7fb576c + d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e - + https://github.com/dotnet/sdk - 9ec662a0a452ac484e8af400a03751a8f7fb576c + d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e - + https://github.com/dotnet/sdk - 9ec662a0a452ac484e8af400a03751a8f7fb576c + d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e - + https://github.com/dotnet/sdk - 9ec662a0a452ac484e8af400a03751a8f7fb576c + d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e diff --git a/eng/Versions.props b/eng/Versions.props index 0ad6ed5f9..937e4040a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23330.8 - 7.0.400-preview.23330.8 - 7.0.400-preview.23330.8 + 7.0.400-preview.23330.14 + 7.0.400-preview.23330.14 + 7.0.400-preview.23330.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab99c450a0979d254ccfb39c3555c77154acc140 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:44 -0700 Subject: [PATCH 101/124] Update branding to 6.0.316 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 967fd94f3..9faed2877 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c6222f0702596c999af7cfe453f95135bbcd821f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:50 -0700 Subject: [PATCH 102/124] Update branding to 6.0.413 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4083592e2..21add4a97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 369e1e683a4729dd715961d434ac8e25f133eb13 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:56 -0700 Subject: [PATCH 103/124] Update branding to 7.0.110 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 81fc3e7ae..18aae61db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From fc5f6f47aafe3d255c8b2dace05780fc8fa6a56e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:39:01 -0700 Subject: [PATCH 104/124] Update branding to 7.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 797c58f9b..6b337c475 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 045f0dd6c3af5153ebb37569fe98c332714c2f55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 22:11:21 +0000 Subject: [PATCH 105/124] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16883) [release/7.0.4xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b694fcf9..b50929c80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e + f97bc262de094bebedd63f0120e9a72be17f0c34 - + https://github.com/dotnet/sdk - d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e + f97bc262de094bebedd63f0120e9a72be17f0c34 - + https://github.com/dotnet/sdk - d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e + f97bc262de094bebedd63f0120e9a72be17f0c34 - + https://github.com/dotnet/sdk - d4d84232f11d40dc1bdfc9fa5b0b59767e68a72e + f97bc262de094bebedd63f0120e9a72be17f0c34 diff --git a/eng/Versions.props b/eng/Versions.props index 937e4040a..6d0844177 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23330.14 - 7.0.400-preview.23330.14 - 7.0.400-preview.23330.14 + 7.0.400-preview.23355.3 + 7.0.400-preview.23355.3 + 7.0.400-preview.23355.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e4cf7c70efeb631cee29f59c89f85e3722d1a85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jul 2023 23:51:41 +0000 Subject: [PATCH 106/124] Update dependencies from https://github.com/dotnet/sdk build 20230705.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23355.3 -> To Version 7.0.400-preview.23355.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b50929c80..fb7bbcd30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - f97bc262de094bebedd63f0120e9a72be17f0c34 + 9df98ccdc21730deb00cdcd97ea7a3117e2127df - + https://github.com/dotnet/sdk - f97bc262de094bebedd63f0120e9a72be17f0c34 + 9df98ccdc21730deb00cdcd97ea7a3117e2127df - + https://github.com/dotnet/sdk - f97bc262de094bebedd63f0120e9a72be17f0c34 + 9df98ccdc21730deb00cdcd97ea7a3117e2127df - + https://github.com/dotnet/sdk - f97bc262de094bebedd63f0120e9a72be17f0c34 + 9df98ccdc21730deb00cdcd97ea7a3117e2127df diff --git a/eng/Versions.props b/eng/Versions.props index 6d0844177..272935017 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23355.3 - 7.0.400-preview.23355.3 - 7.0.400-preview.23355.3 + 7.0.400-preview.23355.11 + 7.0.400-preview.23355.11 + 7.0.400-preview.23355.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a0352f5fbc633103de8fc9691bf77cc4bfc6f4b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 6 Jul 2023 10:09:19 -0700 Subject: [PATCH 107/124] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai Co-authored-by: Noah Gilson Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 21add4a97..f9d19a1e0 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.116 + 6.0.119 diff --git a/global.json b/global.json index b358f87d3..31e65ea4d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.119", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" From 263fb022a9940ed5c435d42caeccd123dd8dc028 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 6 Jul 2023 10:10:24 -0700 Subject: [PATCH 108/124] [automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16892) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Nikola Milosavljevic Co-authored-by: Matt Thalman Co-authored-by: Jason Zhai --- eng/Versions.props | 2 +- global.json | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/PoisonUsage.txt | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 272935017..fb22a6054 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,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. --> - 7.0.105 + 7.0.108 diff --git a/global.json b/global.json index c39b8898d..5bf585afe 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107", + "dotnet": "7.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 5782f6cac..95586bbec 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107" + "dotnet": "7.0.108" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 9428e5b29..e29c81347 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -20,15 +20,6 @@ AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute From fd5696554aeafb907663ed0fed8bcc875123a9db Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 7 Jul 2023 13:07:58 -0700 Subject: [PATCH 109/124] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898) Co-authored-by: Nikola Milosavljevic Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Thalman --- src/SourceBuild/tarball/content/build.proj | 4 +- .../content/repos/package-source-build.proj | 2 +- .../assets/baselines/MsftToSbSdk.diff | 17 ----- ...explicit-System.Text.Json-dependency.patch | 73 +++++++++++++++++++ ...explicit-System.Text.Json-dependency.patch | 31 ++++++++ 5 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 3cef840dc..523128954 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -134,7 +134,7 @@ - $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz $(SmokeTestsArtifactsDir)prereq-packages/ @@ -190,7 +190,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj index 0101374dc..44c8e5cf5 100644 --- a/src/SourceBuild/tarball/content/repos/package-source-build.proj +++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj @@ -47,7 +47,7 @@ Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" /> - $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz 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 4e98d267b..1b86a0d2e 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,20 +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.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/ @@ -42,10 +29,6 @@ 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/ diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000..b82faadcd --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 26 Jun 2023 23:46:46 +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/format/pull/1887 +--- + Directory.Packages.props | 1 + + eng/Version.Details.xml | 4 ++++ + eng/Versions.props | 2 ++ + src/dotnet-format.csproj | 6 ++++++ + 4 files changed, 13 insertions(+) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 6b628c22..c9f86593 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -36,5 +36,6 @@ + + + ++ + + +\ No newline at end of file +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index cdfa5f5e..86f02b44 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -13,6 +13,10 @@ + https://github.com/dotnet/command-line-api + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + ++ ++ https://github.com/dotnet/runtime ++ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 27582078..bccaf176 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -20,6 +20,8 @@ + + 2.0.0-beta1.21473.1 + 0.3.0-alpha.21473.1 ++ ++ 6.0.8 + + ++ + + + 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 new file mode 100644 index 000000000..74e217fbe --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,31 @@ +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 e37a97449725008b59a5a894e75549898f996d71 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 7 Jul 2023 15:14:02 -0700 Subject: [PATCH 110/124] Stabil 7.0.4xx will be shipping its final preview next week and so putting out the PR to stabilize branding in preparation for GA release. Update the implicit version to be automatic. This PR should wait till the runtime in SDK has been updated to 7.0.9 on Tuesday I think. I believe some tests will need to be disabled with the implicit version update. --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fb22a6054..f5c2b2711 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,20 +10,20 @@ 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release 30 32 17 - 19 + $([MSBuild]::Add($(VersionFeature), 20)) From 8632e8af4dde9c36bf47f716c92cdad08884afc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jul 2023 11:59:01 +0000 Subject: [PATCH 111/124] Update dependencies from https://github.com/dotnet/sdk build 20230710.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23355.11 -> To Version 7.0.400-preview.23360.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb7bbcd30..7cc3e4bd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 9df98ccdc21730deb00cdcd97ea7a3117e2127df + 042d90d2afb5add459133bf44617b241c5da3d9a - + https://github.com/dotnet/sdk - 9df98ccdc21730deb00cdcd97ea7a3117e2127df + 042d90d2afb5add459133bf44617b241c5da3d9a - + https://github.com/dotnet/sdk - 9df98ccdc21730deb00cdcd97ea7a3117e2127df + 042d90d2afb5add459133bf44617b241c5da3d9a - + https://github.com/dotnet/sdk - 9df98ccdc21730deb00cdcd97ea7a3117e2127df + 042d90d2afb5add459133bf44617b241c5da3d9a diff --git a/eng/Versions.props b/eng/Versions.props index fb22a6054..c299e4ac3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23355.11 - 7.0.400-preview.23355.11 - 7.0.400-preview.23355.11 + 7.0.400-preview.23360.2 + 7.0.400-preview.23360.2 + 7.0.400-preview.23360.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65db63eb44f459af9c57a288c4b49e0147ad6cc3 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Jul 2023 08:06:04 -0500 Subject: [PATCH 112/124] Update format patch --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index b82faadcd..70f2cdd0f 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644 +++ b/eng/Version.Details.xml @@ -13,6 +13,10 @@ https://github.com/dotnet/command-line-api - 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + c776cd4e906b669b9cce1017fee7d0ba9845d163 + + https://github.com/dotnet/runtime @@ -40,7 +40,7 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props From c5f29a611da1d98f24f05608341fd6b1e90ccd5a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Jul 2023 09:31:51 -0500 Subject: [PATCH 113/124] Update format patch --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 70f2cdd0f..3176d939b 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -47,8 +47,8 @@ index 27582078..bccaf176 100644 +++ b/eng/Versions.props @@ -20,6 +20,8 @@ - 2.0.0-beta1.21473.1 - 0.3.0-alpha.21473.1 + 2.0.0-beta4.22504.1 + 0.4.0-alpha.22504.1 + + 6.0.8 From c3be71294785cc541835d15cfb44ebad4cea7271 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jul 2023 03:09:29 +0000 Subject: [PATCH 114/124] Update dependencies from https://github.com/dotnet/sdk build 20230710.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23360.2 -> To Version 7.0.400-preview.23360.14 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23329.1 -> To Version 4.7.0-3.23360.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cc3e4bd9..38d1ec50f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 042d90d2afb5add459133bf44617b241c5da3d9a + 3a4c55c000ef80e90230db94effa3201c0402154 - + https://github.com/dotnet/sdk - 042d90d2afb5add459133bf44617b241c5da3d9a + 3a4c55c000ef80e90230db94effa3201c0402154 - + https://github.com/dotnet/sdk - 042d90d2afb5add459133bf44617b241c5da3d9a + 3a4c55c000ef80e90230db94effa3201c0402154 - + https://github.com/dotnet/sdk - 042d90d2afb5add459133bf44617b241c5da3d9a + 3a4c55c000ef80e90230db94effa3201c0402154 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - b2bd4936daed91d4efd10c71177f7766823e615c + 7c338f34cdccae85b80dc56a60a9e5733f82cfb4 diff --git a/eng/Versions.props b/eng/Versions.props index c299e4ac3..b122a30a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,16 +69,16 @@ - 7.0.400-preview.23360.2 - 7.0.400-preview.23360.2 - 7.0.400-preview.23360.2 + 7.0.400-preview.23360.14 + 7.0.400-preview.23360.14 + 7.0.400-preview.23360.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23329.1 + 4.7.0-3.23360.7 From 62cc192c572bd2f516fad10404d25e0a907fc573 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 11 Jul 2023 03:25:34 -0700 Subject: [PATCH 115/124] Add feed to find package with version 6.0.20 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 7841c2810..b0a17d557 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + From 786df5086099ae3322407f95c3ef3a92e89b49d8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 11 Jul 2023 14:31:03 +0000 Subject: [PATCH 116/124] Resolve source-build patch conflicts --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 3176d939b..65d38d329 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644 +++ b/eng/Version.Details.xml @@ -13,6 +13,10 @@ https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 + e5861a73ad3f08c820319b56b302387a8832ed59 + + https://github.com/dotnet/runtime @@ -40,15 +40,15 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,6 +20,8 @@ - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 + 2.0.0-beta4.22430.1 + 0.4.0-alpha.22430.1 + + 6.0.8 From 2c2d698597be2c62850b4ad5a0b4ddfae66df270 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:34:43 -0500 Subject: [PATCH 117/124] .NET Source-Build 7.0.109 July 2023 Updates (#16943) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6125c0bce..14b81ac22 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.108 - 7.0.108 + 7.0.109 + 7.0.109 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 95586bbec..23dda09a0 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.108" + "dotnet": "7.0.109" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 24d2abce1367ae37e41625b0e92dd039b53a7906 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jul 2023 23:02:44 +0000 Subject: [PATCH 118/124] Update dependencies from https://github.com/dotnet/sdk build 20230711.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23360.14 -> To Version 7.0.400-preview.23361.13 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.NETCore.Platforms,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,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.8 -> To Version 7.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 15 ++++++ eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 3 files changed, 92 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7841c2810..25090e082 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,12 +12,21 @@ + + + + + + + + + @@ -41,9 +50,15 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38d1ec50f..e869e4cd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 952eba8226df6323cee48d83e9351a3ea7a9dd35 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 952eba8226df6323cee48d83e9351a3ea7a9dd35 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 952eba8226df6323cee48d83e9351a3ea7a9dd35 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 952eba8226df6323cee48d83e9351a3ea7a9dd35 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4b0550942d7e38bf28dcfddb955e616290b83787 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3c37ef8f5358abb303c05d299f029fca7d867d56 + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 3a4c55c000ef80e90230db94effa3201c0402154 + 88db4442e64e60579b40145f6dfb44cb55a3104b - + https://github.com/dotnet/sdk - 3a4c55c000ef80e90230db94effa3201c0402154 + 88db4442e64e60579b40145f6dfb44cb55a3104b - + https://github.com/dotnet/sdk - 3a4c55c000ef80e90230db94effa3201c0402154 + 88db4442e64e60579b40145f6dfb44cb55a3104b - + https://github.com/dotnet/sdk - 3a4c55c000ef80e90230db94effa3201c0402154 + 88db4442e64e60579b40145f6dfb44cb55a3104b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f0734135e45ca51f532dd8304e7d120ba027399a + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b10173d88dc484c1462d387c131bdd4c639927e9 + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0 + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index b122a30a6..78171cdd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.8-servicing.23318.2 + 7.0.9-servicing.23321.6 - 7.0.8-servicing.23318.3 + 7.0.9-servicing.23321.9 @@ -56,22 +56,22 @@ - 7.0.8 - 7.0.8 - 7.0.8-servicing.23318.7 - 7.0.8-servicing.23318.7 - 7.0.8-servicing.23318.7 - 7.0.8-servicing.23318.7 - 7.0.8-servicing.23318.7 + 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 0.2.0 - 7.0.400-preview.23360.14 - 7.0.400-preview.23360.14 - 7.0.400-preview.23360.14 + 7.0.400-preview.23361.13 + 7.0.400-preview.23361.13 + 7.0.400-preview.23361.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,24 +82,24 @@ - 7.0.3 + 7.0.4 - 7.0.8-servicing.23318.7 - 7.0.8-servicing.23318.7 - 7.0.8 - 7.0.8 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.8-servicing.23319.1 - 7.0.8-servicing.23319.1 - 7.0.8 - 7.0.8 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.8 - 7.0.8 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 67d2bafabfe9ed42f7286d16099f75c6d164c7ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jul 2023 00:03:10 +0000 Subject: [PATCH 119/124] Update dependencies from https://github.com/dotnet/sdk build 20230711.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23361.13 -> To Version 7.0.400 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25090e082..9b1f3732e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,6 +22,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e869e4cd5..97e9e4563 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 88db4442e64e60579b40145f6dfb44cb55a3104b + 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc - + https://github.com/dotnet/sdk - 88db4442e64e60579b40145f6dfb44cb55a3104b + 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc - + https://github.com/dotnet/sdk - 88db4442e64e60579b40145f6dfb44cb55a3104b + 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc - + https://github.com/dotnet/sdk - 88db4442e64e60579b40145f6dfb44cb55a3104b + 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc diff --git a/eng/Versions.props b/eng/Versions.props index 78171cdd6..d63975f48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23361.13 - 7.0.400-preview.23361.13 - 7.0.400-preview.23361.13 + 7.0.400 + 7.0.400-rtm.23361.22 + 7.0.400-rtm.23361.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7381bec755bbfcd4571a658b0aaca72af9fba3dd Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 12 Jul 2023 01:42:25 -0700 Subject: [PATCH 120/124] Try to resolve source-build patch conflicts --- .../0002-Add-explicit-System.Text.Json-dependency.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 65d38d329..ced7ca579 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644 +++ b/eng/Version.Details.xml @@ -13,6 +13,10 @@ https://github.com/dotnet/command-line-api - e5861a73ad3f08c820319b56b302387a8832ed59 + c776cd4e906b669b9cce1017fee7d0ba9845d163 + + https://github.com/dotnet/runtime @@ -40,15 +40,15 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,6 +20,8 @@ - 2.0.0-beta4.22430.1 - 0.4.0-alpha.22430.1 + 2.0.0-beta4.22504.1 + 0.4.0-alpha.22504.1 + + 6.0.8 From 9460454a1d1e49ef4de50d0a02fe4729b3f665b5 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:51:19 -0700 Subject: [PATCH 121/124] [release/7.0.4xx] Update dependencies from dotnet/arcade (#16963) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index f6bb55426..5ac6f6e06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - @@ -18,9 +17,6 @@ - - - @@ -52,9 +48,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97e9e4563..d9a0b8a87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 11ad2677a..8064bfcfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23316.4 + 7.0.0-beta.23361.2 diff --git a/global.json b/global.json index 5bf585afe..d20ab2569 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.108", + "dotnet": "7.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23316.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23316.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" } } From c94015165387683afeec5063631b23444f5d65b9 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:51:28 -0700 Subject: [PATCH 122/124] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16962) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ae8fcee2..4179b6715 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,20 @@ - + + - - + + @@ -44,14 +45,13 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2371cf7e..b2ef5add6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 - + https://github.com/dotnet/arcade - e5a90b587998f96289f8814de46553c0f9667eb8 + cae11bc40b691f546d788f7ab37f7eaf0e24ded8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 98c0cd847..e4e12c4f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23316.4 + 7.0.0-beta.23361.2 diff --git a/global.json b/global.json index 5bf585afe..d20ab2569 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.108", + "dotnet": "7.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23316.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23316.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" } } From 4c531d279a1aaf495ed1d8d2e329fd72aa84dec2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 12 Jul 2023 23:40:52 -0700 Subject: [PATCH 123/124] Try to resolve source-build patch conflicts --- .../format/0002-Add-explicit-System.Text.Json-dependency.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index ced7ca579..7bfa0e5e0 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -40,7 +40,7 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props From 63048382f3fc366d54a680010da30f4039324132 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 13 Jul 2023 00:12:24 -0700 Subject: [PATCH 124/124] Update format patch --- .../format/0002-Add-explicit-System.Text.Json-dependency.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index 7bfa0e5e0..7cbb79538 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -40,7 +40,7 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props