From 14440e8880f6d9c1ce0ae674fd03018914291e4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Mar 2024 16:16:26 +0000 Subject: [PATCH 01/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.128-servicing.24120.32 -> To Version 6.0.129-servicing.24164.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.28 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++------------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index a363b139a..de1262b59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,19 +17,12 @@ - - - - - - + - - - + @@ -49,22 +43,16 @@ + - - - - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7593483ca..5b90f1c70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + d45b35a0a9e4371b0e0db674629a9732623013fa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 34a109148c7d8a2c8e6431e83e4bce5712dd8083 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + dd340b191b388fd448494f70a126ce8db511bba4 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1adb0ada3366f315e32a2b6c80971aafda533569 + d3b0f643e7fa72d3353ee0fca4a7e90307996782 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1adb0ada3366f315e32a2b6c80971aafda533569 + d3b0f643e7fa72d3353ee0fca4a7e90307996782 diff --git a/eng/Versions.props b/eng/Versions.props index 422a2518c..7951e6e13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.128 + 6.0.129 @@ -44,20 +44,20 @@ - 6.0.28 - 6.0.28 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 + 6.0.29 + 6.0.29 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 0.2.0 - 6.0.128-servicing.24120.32 - 6.0.128-servicing.24120.32 + 6.0.129-servicing.24164.22 + 6.0.129-servicing.24164.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.28-servicing.24120.3 - 6.0.28-servicing.24120.3 - 6.0.28 - 6.0.28 + 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.5 + 6.0.29 + 6.0.29 @@ -123,7 +123,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.128 + 6.0.129 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 8bcbf5023ed574f3a6ad0188f3ada68ac615e8ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:24:29 +0000 Subject: [PATCH 02/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24164.22 -> To Version 6.0.129-servicing.24169.24 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.28 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 +++---- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++--------- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index de1262b59..5b2d2df41 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,14 @@ - + - - - + @@ -43,11 +41,12 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b90f1c70..c5958af64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3b0f643e7fa72d3353ee0fca4a7e90307996782 + 1e5245ab3dc1b2a74e9a8b5aee22117af962ef9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3b0f643e7fa72d3353ee0fca4a7e90307996782 + 1e5245ab3dc1b2a74e9a8b5aee22117af962ef9b @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 925c59b436d60b9cd6b5df54c3f9be13a9512c95 + bc697dd84500aeee0bcb6323e64967222f90c2aa https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 7951e6e13..de8801ef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,34 +46,34 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 0.2.0 - 6.0.129-servicing.24164.22 - 6.0.129-servicing.24164.22 + 6.0.129-servicing.24169.24 + 6.0.129-servicing.24169.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.12 + 6.0.13 - 6.0.28-servicing.24120.7 - 6.0.28-servicing.24120.7 - 6.0.28 - 6.0.28 - 6.0.28 - 6.0.28 + 6.0.29-servicing.24164.14 + 6.0.29-servicing.24164.14 + 6.0.29 + 6.0.29 + 6.0.29 + 6.0.29 2.1.0 From 901b28a14497147326bfe3b1c28f660e4b76b218 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 23:47:12 +0000 Subject: [PATCH 03/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24169.24 -> To Version 6.0.129-servicing.24169.40 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 5b2d2df41..ad8450f72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5958af64..3e2756518 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e5245ab3dc1b2a74e9a8b5aee22117af962ef9b + 45400bbdea7af9f7cf531634e1299ad22a537cec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e5245ab3dc1b2a74e9a8b5aee22117af962ef9b + 45400bbdea7af9f7cf531634e1299ad22a537cec - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9de94bff9795bb0644835098b91e81edccfaa367 + 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 + 573c73a5486beb4de70c4b628df1825540ea1d83 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index de8801ef7..34d0d40f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24120.4 + 6.0.29-servicing.24165.6 - 6.0.28-servicing.24120.2 + 6.0.29-servicing.24168.9 @@ -56,8 +56,8 @@ - 6.0.129-servicing.24169.24 - 6.0.129-servicing.24169.24 + 6.0.129-servicing.24169.40 + 6.0.129-servicing.24169.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24162.5 - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24169.12 + 6.0.29-servicing.24169.12 6.0.29 6.0.29 From 6a532bd002f8bc7ac81dfe2d8a68b6f35a3080bc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:14:17 +0000 Subject: [PATCH 04/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24169.40 -> To Version 6.0.129-servicing.24169.68 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad8450f72..bf7ff722c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e2756518..09fa56dd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45400bbdea7af9f7cf531634e1299ad22a537cec + 6afbebcce0315fdcd675ed5bbc95d48228febc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45400bbdea7af9f7cf531634e1299ad22a537cec + 6afbebcce0315fdcd675ed5bbc95d48228febc65 diff --git a/eng/Versions.props b/eng/Versions.props index 34d0d40f5..da980693a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.129-servicing.24169.40 - 6.0.129-servicing.24169.40 + 6.0.129-servicing.24169.68 + 6.0.129-servicing.24169.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.29-servicing.24164.14 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 + 6.0.29-servicing.24169.13 6.0.29 6.0.29 6.0.29 From 6fe79a1f6d62a49753a3fd931b0cfa7809e699b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:31:43 +0000 Subject: [PATCH 05/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24169.68 -> To Version 6.0.129-servicing.24169.81 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.129 -> To Version 6.0.129 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bf7ff722c..9c31388e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09fa56dd7..27190d709 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6afbebcce0315fdcd675ed5bbc95d48228febc65 + c38b65897660f3e6fec8724b432cc91039ac5da9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6afbebcce0315fdcd675ed5bbc95d48228febc65 + c38b65897660f3e6fec8724b432cc91039ac5da9 diff --git a/eng/Versions.props b/eng/Versions.props index da980693a..a8a0a2f8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.129-servicing.24169.68 - 6.0.129-servicing.24169.68 + 6.0.129-servicing.24169.81 + 6.0.129-servicing.24169.81 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 46bfd19f84c3a74939f70398977d580db32e579d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:16:55 +0000 Subject: [PATCH 06/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24169.81 -> To Version 6.0.129-servicing.24169.88 Dependency coherency updates 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 From Version 6.0.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 9c31388e0..a3eff8f72 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 27190d709..619fe7dfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c38b65897660f3e6fec8724b432cc91039ac5da9 + 1db16cc09d2fa098a64b4c44e68b28d31787eaa4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c38b65897660f3e6fec8724b432cc91039ac5da9 + 1db16cc09d2fa098a64b4c44e68b28d31787eaa4 diff --git a/eng/Versions.props b/eng/Versions.props index a8a0a2f8c..39d496173 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 0.2.0 - 6.0.129-servicing.24169.81 - 6.0.129-servicing.24169.81 + 6.0.129-servicing.24169.88 + 6.0.129-servicing.24169.88 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da77e88cf1afd7c9eb32990406b9d19cac05a4b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 18:34:52 +0000 Subject: [PATCH 07/10] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.129-servicing.24169.88 -> To Version 6.0.129-servicing.24170.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.29 -> To Version 6.0.29 (parent: Microsoft.NET.Sdk --- 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 a3eff8f72..11ca5be80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 619fe7dfc..88cfe14cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1db16cc09d2fa098a64b4c44e68b28d31787eaa4 + 6eebf20617894911baf34f5e049bc58d6442ef61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1db16cc09d2fa098a64b4c44e68b28d31787eaa4 + 6eebf20617894911baf34f5e049bc58d6442ef61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d + 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 573c73a5486beb4de70c4b628df1825540ea1d83 + f3f959782e4e407301c19cd90dc0d1da329425bf https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 39d496173..f6d094684 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.29-servicing.24165.6 + 6.0.29-servicing.24169.15 - 6.0.29-servicing.24168.9 + 6.0.29-servicing.24169.12 @@ -56,8 +56,8 @@ - 6.0.129-servicing.24169.88 - 6.0.129-servicing.24169.88 + 6.0.129-servicing.24170.2 + 6.0.129-servicing.24170.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24169.12 - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24169.26 + 6.0.29-servicing.24169.26 6.0.29 6.0.29 From 54b2376d9c13a8a93d5d2635b9b8e7d69b94d01d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 00:59:50 +0000 Subject: [PATCH 08/10] Merged PR 38440: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.28 to 6.0.29 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [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**: - **Date Produced**: March 21, 2024 10:02:31 PM UTC - **Commit**: 1e23809f0f06f412276e6caaa012a8d7dddd1c73 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24170.2 to 6.0.129-servicing.24171.8][1] - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24170.2 to 6.0.129-servicing.24171.8][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] - **Microsoft.NETCor... --- NuGet.config | 9 ++++---- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11ca5be80..6e7165984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,15 @@ - + + - + @@ -41,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88cfe14cf..75cc6c555 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6eebf20617894911baf34f5e049bc58d6442ef61 + 1e23809f0f06f412276e6caaa012a8d7dddd1c73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6eebf20617894911baf34f5e049bc58d6442ef61 + 1e23809f0f06f412276e6caaa012a8d7dddd1c73 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - bc697dd84500aeee0bcb6323e64967222f90c2aa + 5a6205aabc468d65922f79266532e0eea9ca97ec https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f6d094684..cc9a07376 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 0.2.0 - 6.0.129-servicing.24170.2 - 6.0.129-servicing.24170.2 + 6.0.129-servicing.24171.8 + 6.0.129-servicing.24171.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.29-servicing.24169.13 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 + 6.0.29-servicing.24171.5 6.0.29 6.0.29 6.0.29 @@ -193,7 +193,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.28 + 6.0.29 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 880d165719260d0f7edd81a91881947c2cc33c3c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 16:08:41 +0000 Subject: [PATCH 09/10] Merged PR 38455: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.129 to 6.0.129 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.129-servicing.24169.8 to 6.0.129-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.129 to 6.0.129 (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**: - **Date Produced**: March 22, 2024 1:23:16 AM UTC - **Commit**: 2b0455d3437ef2eb6fdf72a2e306d644b601860a - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24171.8 to 6.0.129-servicing.24171.13][1] - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24171.8 to 6.0.129-servicing.24171.13][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.129 to 6.0.129][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.129-servicing.24169.8 to 6.0.129-servicing.24171.8][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.129 to 6.0.129][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1e23809f0f06f412276e6caaa012a8d7dddd1c73&targetVersion=GC2b0455d3437ef2eb6fdf72a2e306d644b601860a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeeb3cfb682dcc33df2c90a25677ce26d4a7d57c7&targetVersion=GCf68b1f215211a807960d4d4094e3380307fbfc0f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e7165984..42f2fef47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75cc6c555..b2941f357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e23809f0f06f412276e6caaa012a8d7dddd1c73 + 2b0455d3437ef2eb6fdf72a2e306d644b601860a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e23809f0f06f412276e6caaa012a8d7dddd1c73 + 2b0455d3437ef2eb6fdf72a2e306d644b601860a diff --git a/eng/Versions.props b/eng/Versions.props index cc9a07376..eadd5a12f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.129-servicing.24171.8 - 6.0.129-servicing.24171.8 + 6.0.129-servicing.24171.13 + 6.0.129-servicing.24171.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c9bddb16035cbe6bf19e7cad6d2c694154529b4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 17:14:54 +0000 Subject: [PATCH 10/10] Merged PR 38481: [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.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (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**: - **Date Produced**: March 22, 2024 4:35:37 PM UTC - **Commit**: c5a811d50196cfc9525891c16b256ee4962b20e1 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24171.13 to 6.0.129-servicing.24172.15][1] - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24171.13 to 6.0.129-servicing.24172.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2b0455d3437ef2eb6fdf72a2e306d644b601860a&targetVersion=GCc5a811... --- 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 42f2fef47..67c3b97e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2941f357..75308f04d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating f68b1f215211a807960d4d4094e3380307fbfc0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b0455d3437ef2eb6fdf72a2e306d644b601860a + c5a811d50196cfc9525891c16b256ee4962b20e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b0455d3437ef2eb6fdf72a2e306d644b601860a + c5a811d50196cfc9525891c16b256ee4962b20e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 + 6525c5174ef1b8ee5b29c397e8a4b76e76487927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3f959782e4e407301c19cd90dc0d1da329425bf + 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index eadd5a12f..9bb819b0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.29-servicing.24169.15 + 6.0.29-servicing.24171.6 - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24171.7 @@ -56,8 +56,8 @@ - 6.0.129-servicing.24171.13 - 6.0.129-servicing.24171.13 + 6.0.129-servicing.24172.15 + 6.0.129-servicing.24172.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.29-servicing.24169.26 - 6.0.29-servicing.24169.26 + 6.0.29-servicing.24171.9 + 6.0.29-servicing.24171.9 6.0.29 6.0.29