From fd20a7aec63381294f027e608be848cba2bba65f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Oct 2022 17:40:02 +0000 Subject: [PATCH 01/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221024.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22524.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35f36b8ec..ab210ee70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 2477d388d8663fe6a3f1c82376600dbb19bd217d + 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 From 1c98222124d160734055f25d134b063835713e6a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 25 Oct 2022 17:02:51 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b5c5c827..6bfce60af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -41,14 +44,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab210ee70..a5716024f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 + 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 From 48cf81fcc68a992c756421937cfb876f89e44cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 23:40:32 +0000 Subject: [PATCH 03/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6bfce60af..f8607453f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,15 +16,10 @@ - - - - - @@ -45,17 +41,13 @@ + - - - - - From a37b94428373178f66775791a8ea5ab0a9681a09 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 05:28:18 +0000 Subject: [PATCH 04/20] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22558.7 --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/dotnet-install.sh | 4 ++-- eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8607453f..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -40,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5716024f..f2aefea3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ebdb6d1f5..27d9d8d29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22558.7 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..b09ea669f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef880..6c7a851a8 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901..8facf9ad2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From b3add4e9b98b4ab96bee412cc864ba66dd224ae7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 19:09:15 +0000 Subject: [PATCH 05/20] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2aefea3e..cd92817aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 62921932b..5256df87a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 8facf9ad2..e7ba925c7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" } } From b11f5b701c6acfcafe8c955c26865d6268c11cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 21:33:39 +0000 Subject: [PATCH 06/20] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22561.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd92817aa..58a7a8f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5256df87a..ad5802566 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index e7ba925c7..30864f9a7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" } } From e47b02315a26e457f16c293a60abcdd4f381fd84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 18:16:09 +0000 Subject: [PATCH 07/20] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221115.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.306-servicing.22523.22 -> To Version 6.0.307-servicing.22565.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.11 -> To Version 6.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..de1764744 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 58a7a8f4e..6fc565e6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f diff --git a/eng/Versions.props b/eng/Versions.props index ad5802566..8268cf49a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.306 + 6.0.307 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 0.2.0 - 6.0.306-servicing.22523.22 - 6.0.306-servicing.22523.22 + 6.0.307-servicing.22565.5 + 6.0.307-servicing.22565.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22561.4 + 6.0.12-servicing.22561.4 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.306 + 6.0.307 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 958a92b77c43e25035ef2505a82358d1d9d49b28 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Nov 2022 16:55:23 +0000 Subject: [PATCH 08/20] Merged PR 27536: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221116.5 - **Date Produced**: November 16, 2022 6:08:24 PM UTC - **Commit**: 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCae16998&targetVersion=GC14940c9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC621e64b&targetVersion=GC441cb92&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 de1764744..fe4877de7 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 6fc565e6e..db1e290c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc diff --git a/eng/Versions.props b/eng/Versions.props index 8268cf49a..cf52dcf31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 0.2.0 - 6.0.307-servicing.22565.5 - 6.0.307-servicing.22565.5 + 6.0.307-servicing.22566.5 + 6.0.307-servicing.22566.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 262e147b0fdfeff7c35c4dc59162efb2aa273a31 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 03:05:33 +0000 Subject: [PATCH 09/20] Merged PR 27620: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.26 to 6.0.307-servicing.22564.36 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221117.19 - **Date Produced**: November 17, 2022 10:16:18 PM UTC - **Commit**: 9111e1c94790e09cf4743a2571d8c4fa660ad37d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22561.4 t... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe4877de7..b05b9cb3c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db1e290c1..b9f1966d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d diff --git a/eng/Versions.props b/eng/Versions.props index cf52dcf31..fe7cb3d9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 0.2.0 - 6.0.307-servicing.22566.5 - 6.0.307-servicing.22566.5 + 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22561.4 - 6.0.12-servicing.22561.4 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 6.0.12 6.0.12 6.0.12 From d0a2e7a4be924164f800631ffeb139af90d853b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 16:11:28 +0000 Subject: [PATCH 10/20] Merged PR 27640: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221117.31 - **Date Produced**: November 18, 2022 3:03:04 AM UTC - **Commit**: 68caa23a95462cda1e340e8fe4789125422fcda1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9111e1c&targetVersion=GC68caa23&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7f5bdb9&targetVersion=GC42a1b9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b05b9cb3c..1dc2e5478 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 b9f1966d3..8694529b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 diff --git a/eng/Versions.props b/eng/Versions.props index fe7cb3d9a..1401ec5ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22567.19 - 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.31 + 6.0.307-servicing.22567.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 224289d7fb63f0b1d8c24b580c1f2a661c5e5818 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:42:16 +0000 Subject: [PATCH 11/20] Merged PR 27685: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221119.2 - **Date Produced**: November 19, 2022 6:06:33 PM UTC - **Commit**: 088530583952a8bc3348eedca0403b7e8dc37012 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][5] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.12 to 6.0.12][5] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][6] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][6] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-dev-certs**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-user-secrets**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][7] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22567.7 to 6.0.307-servicing.22568.6][7] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][7] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC68caa23&targetVersion=GC0885305&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC086f577&targetVersion=GC6a747bb&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC42a1b9e&targetVersion=GC16555ee&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [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/DependencyDescription... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dc2e5478..b2164ea3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8694529b0..3b934bddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 diff --git a/eng/Versions.props b/eng/Versions.props index 1401ec5ab..04f09e8d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.307-servicing.22567.31 - 6.0.307-servicing.22567.31 + 6.0.307-servicing.22569.2 + 6.0.307-servicing.22569.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.12 From d8baae5792c628492ba86bc6c51a3cbd2036d732 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 01:12:05 +0000 Subject: [PATCH 12/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22560.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b934bddc..b737f2472 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 + 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 From 8179bb6bb8d5add743c0406ab04ffcf6e6f9126b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 02:53:05 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22570.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b737f2472..7d14babfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 + 38385bc8b19cebe7ae7d20771646158785ee5bdc From c9ce9473e125089aa10770b676d4a19bae4fa067 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:51 +0000 Subject: [PATCH 14/20] Merged PR 27732: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221121.17 - **Date Produced**: November 21, 2022 10:36:24 PM UTC - **Commit**: 923a0bd20698ff7e1109ee8f639240bc089d1ebc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2164ea3b..24c5266f4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d14babfe..4265684a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc diff --git a/eng/Versions.props b/eng/Versions.props index 04f09e8d7..654cca3c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.307-servicing.22569.2 - 6.0.307-servicing.22569.2 + 6.0.307-servicing.22571.17 + 6.0.307-servicing.22571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84a0f82424355693ce7c334f6ab34316a9aa6061 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:21:59 +0000 Subject: [PATCH 15/20] Merged PR 27753: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221122.12 - **Date Produced**: November 22, 2022 5:39:03 PM UTC - **Commit**: 1f6220ecb4f61ace28461f611ab1caeb618d2473 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC923a0bd&targetVersion=GC1f6220e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4437f08&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4265684a5..81d0b6937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 diff --git a/eng/Versions.props b/eng/Versions.props index 654cca3c6..29f930960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22571.17 - 6.0.307-servicing.22571.17 + 6.0.307-servicing.22572.12 + 6.0.307-servicing.22572.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55b7c993a198f292f8bfecec53248902fc53ec6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:25 +0000 Subject: [PATCH 16/20] Merged PR 27853: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221128.7 - **Date Produced**: November 28, 2022 11:33:02 PM UTC - **Commit**: 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5][3] - **Microsoft.... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24c5266f4..1c6f27d32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,10 @@ - + - + @@ -41,15 +42,16 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81d0b6937..60d19a74a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 29f930960..27f4eb485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.307-servicing.22572.12 - 6.0.307-servicing.22572.12 + 6.0.307-servicing.22578.7 + 6.0.307-servicing.22578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From 98712840e7b02488fab96d850bce683b55b27575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 10:33:48 +0000 Subject: [PATCH 17/20] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c6f27d32..af69e5bbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -16,12 +20,20 @@ + + + + + + + + @@ -43,14 +55,26 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d19a74a..c6e3fc6bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 diff --git a/eng/Versions.props b/eng/Versions.props index 42673d128..b409f7267 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22578.7 - 6.0.307-servicing.22578.7 + 6.0.308-servicing.22580.32 + 6.0.308-servicing.22580.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e4e584bbad97007aa734608309d5441031b4537 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 13:31:18 +0000 Subject: [PATCH 18/20] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6e3fc6bb..ed683d37b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + a93f0b1b98f48057457f9532aa3d76f1565b5182 From 985447f2fe9f05c66b071db06b9af726ea83032f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:16 +0000 Subject: [PATCH 19/20] Merged PR 28024: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft... --- NuGet.config | 42 ++++--------------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index af69e5bbf..3b1b4d2fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,33 +7,20 @@ - - - - - - + - - + - - - - - + - - - - + @@ -54,28 +41,15 @@ - - - - - - + - - + - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed683d37b..389032ddb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + bd7407606f49c7bb9ee784c5a5a9c19127c0f081 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 9601ea7b0314d236be4e8dd482e0cc9222e95156 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b409f7267..b1256acd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22579.11 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22580.2 - 6.0.307 + 6.0.308 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.308-servicing.22580.32 - 6.0.308-servicing.22580.32 + 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.1 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.307 + 6.0.308 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From c61979521a4c6136fac9fa4d60f227c7971c6042 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 01:41:45 +0000 Subject: [PATCH 20/20] Merged PR 28083: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221201.36 - **Date Produced**: December 2, 2022 12:32:31 AM UTC - **Commit**: 873cc1a88b27554f9f12d378b91861fc4b82ee56 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.13 to 6.0.13][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe6ee3f4&targetVersion=GC873cc1a&_a=files [2]: https://... --- 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 3b1b4d2fb..f93da753d 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 389032ddb..67f3f2b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd7407606f49c7bb9ee784c5a5a9c19127c0f081 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9601ea7b0314d236be4e8dd482e0cc9222e95156 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b1256acd9..9cf40a422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22579.11 + 6.0.13-servicing.22601.1 - 6.0.13-servicing.22580.2 + 6.0.13-servicing.22601.5 @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.16 - 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.36 + 6.0.308-servicing.22601.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.13-servicing.22601.1 - 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 6.0.13 6.0.13