From 7ce479f5e7ddfcacea4d61b9d96002edd8afa479 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Apr 2022 23:02:41 +0000 Subject: [PATCH 01/13] Merged PR 22398: [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.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.104-servicing.22164.8 to 6.0.105-servicing.22214.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.0.1-1.22157.22 to 4.0.1-1.22181.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b... --- NuGet.config | 12 +- eng/Version.Details.xml | 88 +++++++------- eng/Versions.props | 40 +++---- ...lease-6.0-Build-ProjectTemplates-in-.patch | 113 ------------------ src/redist/targets/GenerateLayout.targets | 25 ++-- 5 files changed, 84 insertions(+), 194 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch diff --git a/NuGet.config b/NuGet.config index 28408ac24..8e3b779f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ + - - - - + + + @@ -41,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf180107c..d5358937b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 167140c0529a64c91f7a82249583ce27e52d28dd + 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9ae0f5d30be2de3c0de61b5673bd8873231d70a + dd34abdadac5668452e0496cfadb6cf985ec3d3f https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 + 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 + 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950 + 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50e695e438ba9f826633d4127d891d53fd972314 + 7882da0274ba2eae36709e648bb85d032402bbb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50e695e438ba9f826633d4127d891d53fd972314 + 7882da0274ba2eae36709e648bb85d032402bbb8 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 27d9215906a62c0a550ba19cd275a2dc94ad88b3 + 487283bcd8d66693091f2800dcf1c8ae37cccdee diff --git a/eng/Versions.props b/eng/Versions.props index ee8500d06..3c72356db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.104 + 6.0.105 @@ -44,20 +44,20 @@ - 6.0.4 - 6.0.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 - 6.0.4-servicing.22172.4 + 6.0.5 + 6.0.5 + 6.0.5-servicing.22214.12 + 6.0.5-servicing.22214.12 + 6.0.5-servicing.22214.12 + 6.0.5-servicing.22214.12 0.2.0 - 6.0.104-servicing.22172.6 - 6.0.104-servicing.22172.6 + 6.0.105-servicing.22217.2 + 6.0.105-servicing.22217.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.4-servicing.22164.4 - 6.0.4-servicing.22164.4 - 6.0.4 - 6.0.4 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22213.9 + 6.0.5-servicing.22213.9 + 6.0.5 + 6.0.5 + 6.0.5 + 6.0.5 2.1.0 - 6.0.4-servicing.22165.2 - 6.0.4-servicing.22165.2 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22213.4 + 6.0.5-servicing.22213.4 + 6.0.5 + 6.0.5 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.104 + 6.0.105 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch deleted file mode 100644 index 7ada1a116..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Godbe -Date: Wed, 23 Mar 2022 09:11:11 -0700 -Subject: [PATCH] Revert "Revert "[release/6.0] Build ProjectTemplates in - Source-Build (#40650)" (#40805)" - -This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df. ---- - Directory.Build.props | 3 +++ - Directory.Build.targets | 9 +++++++-- - .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++- - ...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++- - 4 files changed, 26 insertions(+), 4 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 8f0ac59422..721f099a77 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -30,6 +30,9 @@ - $(MSBuildProjectName.EndsWith('.Test')) OR - $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true - true -+ true - true - true - true -+ Condition="'$(ExcludeFromSourceBuild)' == '' and -+ '$(DotNetBuildFromSource)' == 'true' and -+ '$(IsAspNetCoreApp)' != 'true' and -+ '$(MSBuildProjectName)' != '$(TargetingPackName)' and -+ '$(IsAnalyzersProject)' != 'true' and -+ '$(IsProjectTemplateProject)' != 'true'">true - - -diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -index 8ae5d1c43d..8e0f53957e 100644 ---- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -@@ -1,6 +1,6 @@ -  - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -25,6 +25,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -91,5 +92,11 @@ - - - -+ -+ -+ -+ -+ -+ - - -diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -index 8d6a000d74..35c79a73eb 100644 ---- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -@@ -1,6 +1,6 @@ - - -- -+ - - - $(DefaultNetCoreTargetFramework) -@@ -26,6 +26,7 @@ - - $(MSBuildThisFileDirectory)Interop\ - -+ CheckForSourceBuild; - CompileInterop; - IncludeCompileInteropOutput; - $(ResolveStaticWebAssetsInputsDependsOn) -@@ -93,4 +94,10 @@ - - - -+ -+ -+ -+ -+ -+ - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..e05004e17 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -82,22 +82,21 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - $(SharedFrameworkRid) - linux-x64 - $(AspNetCoreSharedFxInstallerRid) - x64 - aarch64 + $(SharedFrameworkRid) + linux-x64 + $(AspNetCoreInstallerRid) + x64 + aarch64 - aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension) aspnetcore_base_runtime.version From b91ab9e7c612e485dcfd67c3a6b188910e397cba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 19 Apr 2022 00:17:41 +0000 Subject: [PATCH 02/13] Merged PR 22415: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220418.14 - **Date Produced**: April 18, 2022 10:36:29 PM UTC - **Commit**: e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7882da0&targetVersion=GCe910b87&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5358937b..430cf2172 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7882da0274ba2eae36709e648bb85d032402bbb8 + e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7882da0274ba2eae36709e648bb85d032402bbb8 + e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb diff --git a/eng/Versions.props b/eng/Versions.props index 3c72356db..47c530774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.105-servicing.22217.2 - 6.0.105-servicing.22217.2 + 6.0.105-servicing.22218.14 + 6.0.105-servicing.22218.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e572bb4bf77d1e8bb10ec3dabcdd0e4c24fa1779 Mon Sep 17 00:00:00 2001 From: "Michael Simons (VISUAL STUDIO)" Date: Tue, 19 Apr 2022 21:55:58 +0000 Subject: [PATCH 03/13] Merged PR 22459: Update source-build to AspNetCoreSharedFxInstallerRid property rename AspNetCoreSharedFxInstallerRid was renamed to AspNetCoreInstallerRid in https://dev.azure.com/dnceng/internal/_git/dotnet-installer/commit/7ce479f5e7ddfcacea4d61b9d96002edd8afa479. --- src/SourceBuild/tarball/content/repos/installer.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 712d7cd14..e34337b85 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -25,7 +25,7 @@ $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 From 828a7b5e7e65d66a6357b83bab6a0ef4916b6522 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 Apr 2022 20:48:52 +0000 Subject: [PATCH 04/13] Merged PR 22507: [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (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**: 20220420.15 - **Date Produced**: April 20, 2022 5:24:23 PM UTC - **Commit**: 0ad59d00ed13d3b5cd1343efb4dde64714f70063 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe910b87&targetVersion=GC0ad59d0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e3b779f5..a81d8ca64 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 3d789e790..af0b0dba2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e + ad940638f459efe0d17d60ccf52454a32ea7e561 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e + ad940638f459efe0d17d60ccf52454a32ea7e561 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e + ad940638f459efe0d17d60ccf52454a32ea7e561 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb + 0ad59d00ed13d3b5cd1343efb4dde64714f70063 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb + 0ad59d00ed13d3b5cd1343efb4dde64714f70063 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcb07d637abf53791e2c55c63d9207fc3232fe83 + 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47c530774..365ed56bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.4-servicing.22165.3 + 6.0.5-servicing.22215.9 @@ -56,8 +56,8 @@ - 6.0.105-servicing.22218.14 - 6.0.105-servicing.22218.14 + 6.0.105-servicing.22220.15 + 6.0.105-servicing.22220.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.5-servicing.22213.4 - 6.0.5-servicing.22213.4 + 6.0.5-servicing.22215.11 + 6.0.5-servicing.22215.11 6.0.5 6.0.5 From 1c35735293a676e4fbc6d418d14734c38107f6fd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Apr 2022 16:51:36 +0000 Subject: [PATCH 05/13] Merged PR 22538: [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.AspNetCore.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (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**: 20220421.11 - **Date Produced**: April 21, 2022 4:12:47 PM UTC - **Commit**: ce948f426d1c884d4a7315bd4d745590a797bd48 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2] - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2] - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0ad59d0&targetVersion=GCce948f4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- 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 a81d8ca64..b8361e1de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af0b0dba2..6afa55827 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ad59d00ed13d3b5cd1343efb4dde64714f70063 + ce948f426d1c884d4a7315bd4d745590a797bd48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ad59d00ed13d3b5cd1343efb4dde64714f70063 + ce948f426d1c884d4a7315bd4d745590a797bd48 diff --git a/eng/Versions.props b/eng/Versions.props index 365ed56bf..b41ccc6bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.5 6.0.5 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 0.2.0 - 6.0.105-servicing.22220.15 - 6.0.105-servicing.22220.15 + 6.0.105-servicing.22221.11 + 6.0.105-servicing.22221.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 679e7e16e10db371acab506b3941c906b2404473 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 2 May 2022 17:35:55 +0000 Subject: [PATCH 06/13] Merged PR 22616: [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.4-servicing.22164.7 to 6.0.5-servicing.22214.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.5-servicing.22215.9 to 6.0.5-servicing.22215.11 (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**: 20220502.7 - **Date Produced**: May 2, 2022 4:55:06 PM UTC - **Commit**: 1fe572daeeb0436176253f5b54f5591816d6c85e - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22221.11 to 6.0.105-servicing.22252.7][1] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22221.11 to 6.0.105-servicing.22252.7][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.4-servicing.22164.7 to 6.0.5-servicing.22214.3][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.5-servicing.22215.9 to 6.0.5-servicing.22215.11][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCce948f4&targetVersion=GC1fe572d&_a=files [2]: https://dev.azure.com/dnceng/internal/_gi... --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8361e1de..05db78f03 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ + + @@ -14,13 +16,17 @@ + + + + - + @@ -42,14 +48,20 @@ + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6afa55827..d014f22d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad940638f459efe0d17d60ccf52454a32ea7e561 + 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce948f426d1c884d4a7315bd4d745590a797bd48 + 1fe572daeeb0436176253f5b54f5591816d6c85e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce948f426d1c884d4a7315bd4d745590a797bd48 + 1fe572daeeb0436176253f5b54f5591816d6c85e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + a59b5f3bcf2013b0681089930dd18c65f33ec202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b + 89dcce82c0690a9ac94a83594d714e53957a395d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b41ccc6bf..0a3952aa8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.4-servicing.22164.7 + 6.0.5-servicing.22214.3 - 6.0.5-servicing.22215.9 + 6.0.5-servicing.22215.11 @@ -56,8 +56,8 @@ - 6.0.105-servicing.22221.11 - 6.0.105-servicing.22221.11 + 6.0.105-servicing.22252.7 + 6.0.105-servicing.22252.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.5-servicing.22215.11 - 6.0.5-servicing.22215.11 + 6.0.5-servicing.22227.2 + 6.0.5-servicing.22227.2 6.0.5 6.0.5 From 7128856a2f6059b80c4ffb0817c0e3825f289089 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 22:47:48 +0000 Subject: [PATCH 07/13] Merged PR 22674: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220511.22 - **Date Produced**: May 12, 2022 4:28:10 AM UTC - **Commit**: ec869831f5bb2575270c66f8af8e456bf7c3f1ce - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22252.7 to 6.0.106-servicing.22261.22][10] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22252.7 to 6.0.106-servicing.22261.22][10] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.6][11] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6][11] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6][11] - **Microsoft.NETCore.App.Ref**: [from 6.0.5 to 6.0.6][12] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10][12] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][12] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.5 to 6.0.6][12] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.5 to 6.0.6][12] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.6][13] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][13] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **dotnet-dev-certs**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **dotnet-user-secrets**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.105 to 6.0.106][14] - **Microsoft.TemplateEngine.Cli**: [from 6.0.105-servicing.22214.6 to 6.0.106-servicing.22255.5][14] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.105 to 6.0.106][14] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][11] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.5-servicing.22214.3 to 6.0.6-servicing.22255.2][15] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][11] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.5-servicing.22215.11 to 6.0.6-servicing.22255.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10][12] [10]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1fe572d&targetVersion=GCec86983&_a=files [11]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC65aaba1&targetVersion=GCbc63032&_a=fil... --- NuGet.config | 28 ++++--------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05db78f03..df1f6804d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,20 @@ - - - + - - - + - - - + - + @@ -47,21 +41,15 @@ - - - + - - - + - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d9e9a0f5..35ac15a00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fe572daeeb0436176253f5b54f5591816d6c85e + ec869831f5bb2575270c66f8af8e456bf7c3f1ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fe572daeeb0436176253f5b54f5591816d6c85e + ec869831f5bb2575270c66f8af8e456bf7c3f1ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a59b5f3bcf2013b0681089930dd18c65f33ec202 + 83daf50cbdf69c702829df567ac0d737007083ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89dcce82c0690a9ac94a83594d714e53957a395d + 736757c0193667dc19c6d9d132d93a52cc8e4805 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b7a4188d6..e26fe6829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.5-servicing.22214.3 + 6.0.6-servicing.22255.2 - 6.0.5-servicing.22215.11 + 6.0.6-servicing.22255.5 - 6.0.105 + 6.0.106 @@ -44,20 +44,20 @@ - 6.0.5 - 6.0.5 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 + 6.0.6 + 6.0.6 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 0.2.0 - 6.0.105-servicing.22252.7 - 6.0.105-servicing.22252.7 + 6.0.106-servicing.22261.22 + 6.0.106-servicing.22261.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.5-servicing.22213.9 - 6.0.5-servicing.22213.9 - 6.0.5 - 6.0.5 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22255.10 + 6.0.6-servicing.22255.10 + 6.0.6 + 6.0.6 + 6.0.6 + 6.0.6 2.1.0 - 6.0.5-servicing.22227.2 - 6.0.5-servicing.22227.2 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22260.6 + 6.0.6-servicing.22260.6 + 6.0.6 + 6.0.6 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.105 + 6.0.106 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From ed954e2e8ea877f3e5c67eb4bbcf50a55417c05d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 13 May 2022 18:36:15 +0000 Subject: [PATCH 08/13] Merged PR 22933: [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.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22262.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22262.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22262.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22262.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22262.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22262.13 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22262.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3 (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**: 20220513.17 - **Date Produced**: May 13, 2022 5:00:27 PM UTC - **Commit**: 2edc185eb00a7796ec08fcd4dacf9371ebc22d18 -... --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++-------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index df1f6804d..be3625ca4 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 d5c4a33fc..dd7a305b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 8814216150171a5709d04f24fef6ee818a0f3906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 8814216150171a5709d04f24fef6ee818a0f3906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 8814216150171a5709d04f24fef6ee818a0f3906 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bc63032a084340c7ac42b47fecb9dc0b4d0c9373 + 8814216150171a5709d04f24fef6ee818a0f3906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09f40738cea0abc19e06851eb2180e4724870288 + 06cf4193eee8e5e02705e1abb43a8125dea17607 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec869831f5bb2575270c66f8af8e456bf7c3f1ce + 2edc185eb00a7796ec08fcd4dacf9371ebc22d18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec869831f5bb2575270c66f8af8e456bf7c3f1ce + 2edc185eb00a7796ec08fcd4dacf9371ebc22d18 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 83daf50cbdf69c702829df567ac0d737007083ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 736757c0193667dc19c6d9d132d93a52cc8e4805 + 22e5c7054042ed6d7f2b419e292c1e119cb1ee4b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 72632c761..0ac0db4a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.6-servicing.22255.5 + 6.0.6-servicing.22262.7 @@ -46,18 +46,18 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 - 6.0.6-servicing.22260.10 + 6.0.6-servicing.22262.13 + 6.0.6-servicing.22262.13 + 6.0.6-servicing.22262.13 + 6.0.6-servicing.22262.13 0.2.0 - 6.0.106-servicing.22261.22 - 6.0.106-servicing.22261.22 + 6.0.106-servicing.22263.17 + 6.0.106-servicing.22263.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.6-servicing.22255.10 - 6.0.6-servicing.22255.10 + 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.3 6.0.6 6.0.6 6.0.6 @@ -78,8 +78,8 @@ - 6.0.6-servicing.22260.6 - 6.0.6-servicing.22260.6 + 6.0.6-servicing.22262.8 + 6.0.6-servicing.22262.8 6.0.6 6.0.6 From efc9131ae7a770ec9054d4e1d6da15e6c2de09bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 13:59:10 +0000 Subject: [PATCH 09/13] Merged PR 22952: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220514.4 - **Date Produced**: May 14, 2022 4:49:00 PM UTC - **Commit**: 88b5a51849971c58edc03efce7a2a03f4c6de418 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.106-servicing.22263.17 to 6.0.106-servicing.22264.4][1] - **Microsoft.NET.Sdk**: [from 6.0.106-servicing.22263.17 to 6.0.106-servicing.22264.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2edc185&targetVersion=GC88b5a51&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd7a305b8..a2dfe9702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2edc185eb00a7796ec08fcd4dacf9371ebc22d18 + 88b5a51849971c58edc03efce7a2a03f4c6de418 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2edc185eb00a7796ec08fcd4dacf9371ebc22d18 + 88b5a51849971c58edc03efce7a2a03f4c6de418 diff --git a/eng/Versions.props b/eng/Versions.props index 0ac0db4a0..d627cd6fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.106-servicing.22263.17 - 6.0.106-servicing.22263.17 + 6.0.106-servicing.22264.4 + 6.0.106-servicing.22264.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From edf995073b2c3fa578777f75a729f93a2d13574f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 16:43:17 +0000 Subject: [PATCH 10/13] Merged PR 22956: [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.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22262.8 to 6.0.6-servicing.22263.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22262.8 to 6.0.6-servicing.22263.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22262.13 to 6.0.6-servicing.22263.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22262.13 to 6.0.6-servicing.22263.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22262.13 to 6.0.6-servicing.22263.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22262.13 to 6.0.6-servicing.22263.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22255.5 to 6.0.106-servicing.22263.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22262.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22262.7 to 6.0.6-servicing.22262.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.Sh... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index be3625ca4..0b958ca2d 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 50d91f39b..3dd12b4d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8814216150171a5709d04f24fef6ee818a0f3906 + a6abee58c814e3dcf3626a5130dbcc11a2934f57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8814216150171a5709d04f24fef6ee818a0f3906 + a6abee58c814e3dcf3626a5130dbcc11a2934f57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8814216150171a5709d04f24fef6ee818a0f3906 + a6abee58c814e3dcf3626a5130dbcc11a2934f57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8814216150171a5709d04f24fef6ee818a0f3906 + a6abee58c814e3dcf3626a5130dbcc11a2934f57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06cf4193eee8e5e02705e1abb43a8125dea17607 + 5158b1f9c6a80a02ffa1c8e1291be15668b58973 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 + d6a76a0832326bf4205ea7c7d667c6799d062609 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 + d6a76a0832326bf4205ea7c7d667c6799d062609 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 + d6a76a0832326bf4205ea7c7d667c6799d062609 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88b5a51849971c58edc03efce7a2a03f4c6de418 + 620ff93251cbdbda8863b5329f4b44c6897382ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88b5a51849971c58edc03efce7a2a03f4c6de418 + 620ff93251cbdbda8863b5329f4b44c6897382ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83daf50cbdf69c702829df567ac0d737007083ca + 54bce5195f3b5bdfd25a40d86f71c344d1a53052 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 22e5c7054042ed6d7f2b419e292c1e119cb1ee4b + b42c3f500c891e4cfcdb67ff07c7a911e9db96a7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e5ed8a755..3b2120f4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22255.2 + 6.0.6-servicing.22262.5 - 6.0.6-servicing.22262.7 + 6.0.6-servicing.22262.12 @@ -46,18 +46,18 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22262.13 - 6.0.6-servicing.22262.13 - 6.0.6-servicing.22262.13 - 6.0.6-servicing.22262.13 + 6.0.6-servicing.22263.10 + 6.0.6-servicing.22263.10 + 6.0.6-servicing.22263.10 + 6.0.6-servicing.22263.10 0.2.0 - 6.0.106-servicing.22264.4 - 6.0.106-servicing.22264.4 + 6.0.106-servicing.22266.5 + 6.0.106-servicing.22266.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.6-servicing.22263.3 - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.9 + 6.0.6-servicing.22263.9 6.0.6 6.0.6 6.0.6 @@ -78,8 +78,8 @@ - 6.0.6-servicing.22262.8 - 6.0.6-servicing.22262.8 + 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.3 6.0.6 6.0.6 From fcaa73f5f09c375f62f0ed6e51463ec5e2378dac Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 May 2022 16:48:52 +0000 Subject: [PATCH 11/13] Merged PR 22991: [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**: - **NuGet.Build.Tasks**: from 6.0.0 to 6.0.2-rc.3 (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**: 20220517.4 - **Date Produced**: May 17, 2022 3:25:33 PM UTC - **Commit**: 5d63f71c200563163e0fcff8f4a77c9e60b428f1 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.106-servicing.22266.5 to 6.0.106-servicing.22267.4][1] - **Microsoft.NET.Sdk**: [from 6.0.106-servicing.22266.5 to 6.0.106-servicing.22267.4][1] - **NuGet.Build.Tasks**: [from 6.0.0 to 6.0.2-rc.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC620ff93&targetVersion=GC5d63f71&_a=files [2]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GC078701b&targetVersion=GCa5782fa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dd12b4d3..a195dd13a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d6a76a0832326bf4205ea7c7d667c6799d062609 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 620ff93251cbdbda8863b5329f4b44c6897382ea + 5d63f71c200563163e0fcff8f4a77c9e60b428f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 620ff93251cbdbda8863b5329f4b44c6897382ea + 5d63f71c200563163e0fcff8f4a77c9e60b428f1 @@ -151,9 +151,9 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - - https://github.com/nuget/nuget.client - 078701b97eeef2283c1f4605032b5bcf55a80653 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a5782faf46b91a7b43935a28d1e185e79a50588a diff --git a/eng/Versions.props b/eng/Versions.props index 3b2120f4c..7d93987b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.106-servicing.22266.5 - 6.0.106-servicing.22266.5 + 6.0.106-servicing.22267.4 + 6.0.106-servicing.22267.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f22c390e034ba0877ca4dea4985256019dc28ba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 19:54:48 +0000 Subject: [PATCH 12/13] Merged PR 23022: [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.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22263.3 to 6.0.106-servicing.22267.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22262.5 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22262.12 to 6.0.6-servicing.22267.2 (parent... --- 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 0b958ca2d..7132d739a 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 a195dd13a..b7b90e356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d63f71c200563163e0fcff8f4a77c9e60b428f1 + e63285207de6e585dc4be11472a284ed57fa2e35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d63f71c200563163e0fcff8f4a77c9e60b428f1 + e63285207de6e585dc4be11472a284ed57fa2e35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 54bce5195f3b5bdfd25a40d86f71c344d1a53052 + 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b42c3f500c891e4cfcdb67ff07c7a911e9db96a7 + e36f1456f1c6aff57150a30ac06f3cceaf2b2785 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7d93987b4..e28eda2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22262.5 + 6.0.6-servicing.22266.9 - 6.0.6-servicing.22262.12 + 6.0.6-servicing.22267.2 @@ -46,30 +46,30 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 0.2.0 - 6.0.106-servicing.22267.4 - 6.0.106-servicing.22267.4 + 6.0.106-servicing.22268.6 + 6.0.106-servicing.22268.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 6.0.4 - 6.0.6-servicing.22263.9 - 6.0.6-servicing.22263.9 + 6.0.6-servicing.22267.7 + 6.0.6-servicing.22267.7 6.0.6 6.0.6 6.0.6 @@ -78,8 +78,8 @@ - 6.0.6-servicing.22263.3 - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22267.5 + 6.0.6-servicing.22267.5 6.0.6 6.0.6 From 523fd953a3cb8b1a7d6658b31fb21c7711820098 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 19 May 2022 14:28:32 +0000 Subject: [PATCH 13/13] Merged PR 23035: [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.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22267.4 to 6.0.106-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22268.4 (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**: 20220518.20 - **Date Produced**: May 18, 2022 10:38:32 PM UTC - **Commit**: 5080045df61ed4394fb46368acaa7ba7c7d2f664 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.106-se... --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7132d739a..7e3e7efe1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7b90e356..8c2d0d531 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e63285207de6e585dc4be11472a284ed57fa2e35 + 5080045df61ed4394fb46368acaa7ba7c7d2f664 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e63285207de6e585dc4be11472a284ed57fa2e35 + 5080045df61ed4394fb46368acaa7ba7c7d2f664 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e36f1456f1c6aff57150a30ac06f3cceaf2b2785 + dabcf2041548f7594b21e9bf865463abdfd14307 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e28eda2d7..0ea02773f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.2 + 6.0.6-servicing.22268.4 @@ -46,18 +46,18 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.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 0.2.0 - 6.0.106-servicing.22268.6 - 6.0.106-servicing.22268.6 + 6.0.106-servicing.22268.20 + 6.0.106-servicing.22268.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.5 + 6.0.6-servicing.22268.6 + 6.0.6-servicing.22268.6 6.0.6 6.0.6