From 970db731165bcfd117ae55e73571a31998252633 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Mar 2024 17:42:42 +0000 Subject: [PATCH 01/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.33 -> To Version 6.0.421-servicing.24164.28 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 047b2c714..f816bed10 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,19 +17,12 @@ - - - - - - + - - - + @@ -49,21 +43,15 @@ + - - - - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955dc44a4..783e1338d 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6969baea023232e2739e505f3723228f949d8fa + 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1d600871abca733031eac0a17821179193da113 + 02aa9c44a4c781d17845ad6806fd049d1e887d1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1d600871abca733031eac0a17821179193da113 + 02aa9c44a4c781d17845ad6806fd049d1e887d1c diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63..b1f2540d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.420 + 6.0.421 @@ -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.420-servicing.24120.33 - 6.0.420-servicing.24120.33 + 6.0.421-servicing.24164.28 + 6.0.421-servicing.24164.28 $(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.420 + 6.0.421 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 87d5a28661032c0a90ee61775a7832a3d3c27052 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:23:07 +0000 Subject: [PATCH 02/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24164.28 -> To Version 6.0.421-servicing.24169.23 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.400 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 f816bed10..32dd6c662 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,14 @@ - + - - - + @@ -43,9 +41,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783e1338d..21b0bbbb7 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 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02aa9c44a4c781d17845ad6806fd049d1e887d1c + 5a8272ec1b63f6eab4b8530aaf3074333b991a6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 02aa9c44a4c781d17845ad6806fd049d1e887d1c + 5a8272ec1b63f6eab4b8530aaf3074333b991a6c @@ -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 b1f2540d5..b802dae23 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.421-servicing.24164.28 - 6.0.421-servicing.24164.28 + 6.0.421-servicing.24169.23 + 6.0.421-servicing.24169.23 $(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 2f55738e866a250997fddeebbf6f32a21aa2bdea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 23:44:24 +0000 Subject: [PATCH 03/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.23 -> To Version 6.0.421-servicing.24169.39 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 32dd6c662..bdf08c7f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21b0bbbb7..2ee8900d7 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 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a8272ec1b63f6eab4b8530aaf3074333b991a6c + f2fb75391dcd7a292028a959be31c3767bab1848 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a8272ec1b63f6eab4b8530aaf3074333b991a6c + f2fb75391dcd7a292028a959be31c3767bab1848 - + 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 b802dae23..39ef1e11b 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.421-servicing.24169.23 - 6.0.421-servicing.24169.23 + 6.0.421-servicing.24169.39 + 6.0.421-servicing.24169.39 $(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 b033e3b8b9834cd06cf15fe23228064a92d51362 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:17:59 +0000 Subject: [PATCH 04/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.39 -> To Version 6.0.421-servicing.24169.69 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 bdf08c7f3..c873f2e57 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ee8900d7..46807d178 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 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fb75391dcd7a292028a959be31c3767bab1848 + 6d1821ce9263e25b061088f76e1dbce46dd2b880 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fb75391dcd7a292028a959be31c3767bab1848 + 6d1821ce9263e25b061088f76e1dbce46dd2b880 diff --git a/eng/Versions.props b/eng/Versions.props index 39ef1e11b..70de9ef41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.39 - 6.0.421-servicing.24169.39 + 6.0.421-servicing.24169.69 + 6.0.421-servicing.24169.69 $(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 a33fcd95493366afba308ef71dd6cceef4e3ba35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:25:21 +0000 Subject: [PATCH 05/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.69 -> To Version 6.0.421-servicing.24169.80 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.421 -> To Version 6.0.421 (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 c873f2e57..29cd3c9ba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46807d178..4ea76f5c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58 + 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1821ce9263e25b061088f76e1dbce46dd2b880 + 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d1821ce9263e25b061088f76e1dbce46dd2b880 + 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 diff --git a/eng/Versions.props b/eng/Versions.props index 70de9ef41..da8c5d0f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24169.69 - 6.0.421-servicing.24169.69 + 6.0.421-servicing.24169.80 + 6.0.421-servicing.24169.80 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67f037f97b1d039ad45cf52245564fcb2ea25ff3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:02:01 +0000 Subject: [PATCH 06/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.69 -> To Version 6.0.421-servicing.24169.87 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,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 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 29cd3c9ba..dc2e47645 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 4ea76f5c3..f6417885a 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 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 + 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 785e5d1b37dfbed3ac4e14d97e9c9bce19bd5b13 + 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 diff --git a/eng/Versions.props b/eng/Versions.props index da8c5d0f4..a5522845d 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.421-servicing.24169.80 - 6.0.421-servicing.24169.80 + 6.0.421-servicing.24169.87 + 6.0.421-servicing.24169.87 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a5315624e6a8ed8e3d117e8bcfa00949a0084a5d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 18:38:49 +0000 Subject: [PATCH 07/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.421-servicing.24169.87 -> To Version 6.0.421-servicing.24170.1 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 dc2e47645..16ef8d37e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6417885a..1a6ee7c29 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 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 + ec94b98111e1980885848558410affc81762ac45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a9a0d0eee37bf18c160287530f7e72fc92f5ac9 + ec94b98111e1980885848558410affc81762ac45 - + 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 a5522845d..5ff685d89 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.421-servicing.24169.87 - 6.0.421-servicing.24169.87 + 6.0.421-servicing.24170.1 + 6.0.421-servicing.24170.1 $(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 5102888162e96c2d53eaed1aec16c880aefc202c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 00:59:50 +0000 Subject: [PATCH 08/11] Merged PR 38441: [internal/release/6.0.4xx] 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.400**: 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 21, 2024 10:02:30 PM UTC - **Commit**: 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24170.1 to 6.0.421-servicing.24171.7][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 16ef8d37e..d8928b16e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,15 @@ - + + - + @@ -41,10 +42,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a6ee7c29..48895926f 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 86fb50d661cb520041b127141b6bb8a53769ee6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec94b98111e1980885848558410affc81762ac45 + 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec94b98111e1980885848558410affc81762ac45 + 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 @@ -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 5ff685d89..ab968b36b 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.421-servicing.24170.1 - 6.0.421-servicing.24170.1 + 6.0.421-servicing.24171.7 + 6.0.421-servicing.24171.7 $(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.3.303 15.4.303 6.0.5 - 6.0.28 + 6.0.29 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 3d530de7d4a8dd74d026d358b7a7807ca5c1eca4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 16:08:37 +0000 Subject: [PATCH 09/11] Merged PR 38454: [internal/release/6.0.4xx] 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.421 to 6.0.421 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.421 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 22, 2024 1:23:09 AM UTC - **Commit**: 6f9b73911c7a5bd447666c341acc4fffe64635b5 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.7 to 6.0.421-servicing.24171.14][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.421 to 6.0.421][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.421-rtm.24169.9 to 6.0.421-rtm.24171.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.421 to 6.0.421][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC60e470eb7aa4134da472ce7a9d89a59bc2d845e4&targetVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC86fb50d661cb520041b127141b6bb8a53769ee6f&targetVersion=GC9ebb8d1d13e5672c54d1682cdc82eb5f474b9586&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 d8928b16e..4113aa77c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48895926f..d8f475c41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 86fb50d661cb520041b127141b6bb8a53769ee6f + 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 + 6f9b73911c7a5bd447666c341acc4fffe64635b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60e470eb7aa4134da472ce7a9d89a59bc2d845e4 + 6f9b73911c7a5bd447666c341acc4fffe64635b5 diff --git a/eng/Versions.props b/eng/Versions.props index ab968b36b..80d155bab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.421-servicing.24171.7 - 6.0.421-servicing.24171.7 + 6.0.421-servicing.24171.14 + 6.0.421-servicing.24171.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04f27549cdbdcb0d6784037693769c93ed1de787 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 17:14:54 +0000 Subject: [PATCH 10/11] Merged PR 38480: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: - **Date Produced**: March 22, 2024 4:35:16 PM UTC - **Commit**: e35ea426ec2ee54f57501b661ec7d656caf480d6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][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=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&targetVersion=GCe35ea4... --- 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 4113aa77c..558decbcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8f475c41..7e1a5316a 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 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9b73911c7a5bd447666c341acc4fffe64635b5 + e35ea426ec2ee54f57501b661ec7d656caf480d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9b73911c7a5bd447666c341acc4fffe64635b5 + e35ea426ec2ee54f57501b661ec7d656caf480d6 - + 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 80d155bab..5d400d24e 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.421-servicing.24171.14 - 6.0.421-servicing.24171.14 + 6.0.421-servicing.24172.16 + 6.0.421-servicing.24172.16 $(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 From fbfea7c0c3ebaad4c2c08399b7a9f613c3a42084 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 18:00:04 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/arcade build 20240404.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 2 +- eng/common/templates-official/jobs/jobs.yml | 2 +- .../templates-official/post-build/post-build.yml | 8 ++++---- .../steps/component-governance.yml | 2 +- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 11 files changed, 33 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 558decbcb..6e7ea226c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,27 @@ + + + + - + + + + @@ -42,15 +49,20 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e18ace87d..4894786e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2122820b..750eeae57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24176.9 + 6.0.0-beta.24204.4 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index e0e9a4bc5..08df56375 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -43,7 +43,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows variables: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 96be5e6e1..f5fa09f41 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -50,7 +50,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 3d8b0b966..e96ec3cbe 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -7,7 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog pool: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows condition: '' dependsOn: '' diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 669ccd48f..c124aa995 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -92,7 +92,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 96048b1ba..fce0d0bf5 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -103,7 +103,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -143,7 +143,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -206,7 +206,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -258,7 +258,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index dd968ea93..ab4fa5d59 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.24176.9", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4" } }