From ed49dd9da16af3e3a5b71f5e3bef901e0c45e2a6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 17:38:16 +0000 Subject: [PATCH 1/4] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.0.2-rc.3 to 6.0.2-rc.5 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 -------- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e3e7efe1..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99bd9d4dd..0ada89108 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5080045df61ed4394fb46368acaa7ba7c7d2f664 + 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5080045df61ed4394fb46368acaa7ba7c7d2f664 + 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac @@ -151,9 +151,9 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a5782faf46b91a7b43935a28d1e185e79a50588a + + https://github.com/nuget/nuget.client + 75551652b352f860ea0b29095b64fa63715dd672 diff --git a/eng/Versions.props b/eng/Versions.props index c0c0820cc..92eb5d22a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.106-servicing.22268.20 - 6.0.106-servicing.22268.20 + 6.0.107-servicing.22321.28 + 6.0.107-servicing.22321.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From beddbdec0a0aaea3ff106a2bc4713ec5d87bf63f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 21:39:15 +0000 Subject: [PATCH 2/4] Merged PR 23696: [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.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22268.6 to 6.0.107-servicing.22315.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22268.4 to 6.0.7-servicing.22321.2 (parent:... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..c8fde6e36 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ada89108..0806d52ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac + 8fb31b0f731d911fd9460780fab6134bf910befe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac + 8fb31b0f731d911fd9460780fab6134bf910befe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - dabcf2041548f7594b21e9bf865463abdfd14307 + 6bdf005a9fdcade55cc00e6359e69b247740e097 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 92eb5d22a..0aa6b816d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.6-servicing.22267.5 + 6.0.7-servicing.22314.5 - 6.0.6-servicing.22268.4 + 6.0.7-servicing.22321.2 - 6.0.106 + 6.0.107 @@ -44,44 +44,44 @@ - 6.0.6 - 6.0.6 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 + 6.0.7 + 6.0.7 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 0.2.0 - 6.0.107-servicing.22321.28 - 6.0.107-servicing.22321.28 + 6.0.107-servicing.22322.8 + 6.0.107-servicing.22322.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.4 + 6.0.5 - 6.0.6-servicing.22267.7 - 6.0.6-servicing.22267.7 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.2 + 6.0.7-servicing.22322.2 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 2.1.0 - 6.0.6-servicing.22268.6 - 6.0.6-servicing.22268.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22321.2 + 6.0.7-servicing.22321.2 + 6.0.7 + 6.0.7 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.106 + 6.0.107 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 6a808a4c486bf5f6bcf69424b029d215937e11bb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jun 2022 14:52:37 +0000 Subject: [PATCH 3/4] Merged PR 23715: [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.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.7-servicing.22314.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.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**: 20220622.34 - **Date Produced**: June 23, 2022 5:04:19 AM UTC - **Commit**: 336044192d20c6c49968ffc53bbc8ca363bd94e8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.7 to 6.0.7][6] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22321.2 to 6.0.7-servicing.2... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8fde6e36..f569adcbc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0806d52ee..fa80176e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6bdf005a9fdcade55cc00e6359e69b247740e097 + 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0aa6b816d..b7e5aecbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.7-servicing.22314.5 + 6.0.7-servicing.22322.3 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.2 @@ -46,18 +46,18 @@ 6.0.7 6.0.7 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 0.2.0 - 6.0.107-servicing.22322.8 - 6.0.107-servicing.22322.8 + 6.0.107-servicing.22322.34 + 6.0.107-servicing.22322.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.7-servicing.22321.2 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.3 + 6.0.7-servicing.22322.3 6.0.7 6.0.7 From 5ddc14fb7c42d6ac7a4c0238111c0774e647c4b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 19:39:12 +0000 Subject: [PATCH 4/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.107-servicing.22322.34 -> To Version 6.0.107-servicing.22323.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.107 -> To Version 6.0.107 (parent: Microsoft.NET.Sdk --- 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 f569adcbc..08ee9c28b 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 fa80176e9..e311e0115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 336044192d20c6c49968ffc53bbc8ca363bd94e8 + ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 336044192d20c6c49968ffc53bbc8ca363bd94e8 + ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda diff --git a/eng/Versions.props b/eng/Versions.props index b7e5aecbe..79487d28b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.107-servicing.22322.34 - 6.0.107-servicing.22322.34 + 6.0.107-servicing.22323.13 + 6.0.107-servicing.22323.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)