From 3b57a2b9a489dfc145a2f3794e674019ebd601d7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 17:16:34 +0000 Subject: [PATCH 01/11] 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 f1a405947785344bd1f4078525a61a82463c0671 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:11 +0000 Subject: [PATCH 02/11] 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 13565e2b982ef0e66e92b2337389f6b6eaebdee1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 16 Apr 2023 17:23:35 +0000 Subject: [PATCH 03/11] 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 934a4f73a91e9fcb85a65fe3888f26adfb1a33c9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 16:36:48 +0000 Subject: [PATCH 04/11] 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 0214289b98afab8120648ec34202cd9c6037965b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 20:56:05 +0000 Subject: [PATCH 05/11] 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 0c3baf4363ffa2d0ce630addfadbe1d6394f86e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 16:45:43 +0000 Subject: [PATCH 06/11] 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 443a92855f1e57ad4f78365acf5c6bfe759113f8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 19:22:46 +0000 Subject: [PATCH 07/11] 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 b6b7bfa5e92ede21d0dace802d4ab508b32d2729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:29:46 +0000 Subject: [PATCH 08/11] 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 6f2c3204ac12da6ecec49d2fdf532cf83acc5bcd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:14 +0000 Subject: [PATCH 09/11] 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 9fc16b3685bb747a9a7f784d4f58d3ade4b6e0b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:02 +0000 Subject: [PATCH 10/11] 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 4985279bcb64c58fee0be4c2bef6c0f02bb130aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:11 +0000 Subject: [PATCH 11/11] 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