From 3b57a2b9a489dfc145a2f3794e674019ebd601d7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 17:16:34 +0000 Subject: [PATCH 01/28] 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/28] 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 03/28] 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 04/28] 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 05/28] 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 06/28] 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 07/28] 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 08/28] 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 9c98d91d6db213788b3e06089668f897934875ec Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 4 May 2023 16:09:44 -0500 Subject: [PATCH 09/28] 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 0214289b98afab8120648ec34202cd9c6037965b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 May 2023 20:56:05 +0000 Subject: [PATCH 10/28] 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 11/28] 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 12/28] 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 de8c9e71bd1ef01f245d601910b2ef56cbb94002 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 19 May 2023 16:20:00 +0000 Subject: [PATCH 13/28] 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 a398440ac7f7db95a0b5104e029086c760b871d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:50:27 +0000 Subject: [PATCH 14/28] 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 15/28] 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 16/28] 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 17/28] 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 18/28] 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 f13163a368442a984712810bf1fc02fb2c7a282f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:28:01 +0000 Subject: [PATCH 19/28] 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 20/28] 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 d85bce333f1a5574278a8921dc4b47b14386a27b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:27:52 +0000 Subject: [PATCH 21/28] 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 22/28] 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 b8b476fbe60becae6d0c3d36b7ba964aeee3523d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 22:23:06 +0000 Subject: [PATCH 23/28] 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 24/28] 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 7cbeda80a9593dbb354e784864e6965bcbc457d8 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Jun 2023 13:10:45 -0700 Subject: [PATCH 25/28] 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 26/28] 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 f671b74651cd24ff1b6e6e0e03cc9dbca3fbca61 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:22:54 -0700 Subject: [PATCH 27/28] 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 28/28] 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