From 711e262a3e0cc125745383723e996e7a1cb0bf73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 19:39:27 +0000 Subject: [PATCH 1/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20241017.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.35 -> To Version 6.0.36 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.35-servicing.24462.14 -> To Version 6.0.36-servicing.24516.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index d46aa77b1988..eb46a869dc49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,10 +25,7 @@ - - - - + @@ -64,10 +61,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9eb54cf845..3213e2bdccb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,25 +174,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c9e44425226553e639116ff82698cfd2808f7769 + a7dff252f2a6b0ff48ffe946a20584f61282aa13 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3c771b11b318..0f7f07ffa320 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,11 +152,11 @@ - 6.0.35-servicing.24462.14 + 6.0.36-servicing.24516.3 - 6.0.35-servicing.24463.5 + 6.0.36-servicing.24517.2 From 61bb72758d4554a0a5f56f84a28d978627dc9b6a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:35:25 +0000 Subject: [PATCH 2/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241016.4 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24462.14 -> To Version 6.0.36-servicing.24516.4 --- NuGet.config | 10 ++----- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb46a869dc49..062d79abf6b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,7 @@ - - - - + @@ -51,10 +48,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3213e2bdccb6..f40f1400f3d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 41a5af9d2c459a06c0795bf21a1c046200f375bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -194,46 +194,46 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a7dff252f2a6b0ff48ffe946a20584f61282aa13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://github.com/dotnet/razor-compiler @@ -250,21 +250,21 @@ 503deb302b09bbd0ee3cb64e46117fa2d31af442 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0f7f07ffa320..bcb556bfc126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,12 +140,12 @@ - 6.0.35-servicing.24462.14 - 6.0.35 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35 + 6.0.36-servicing.24516.4 + 6.0.36 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36 6.0.3-1.22213.1 6.0.3-1.22213.1 6.0.3-1.22213.1 From 0b05e93054dc6ffcc1bb6415814160bb4b9ee0ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:35:48 +0000 Subject: [PATCH 3/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20241014.21 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Security.Cryptography.Pkcs , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.2 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 062d79abf6b6..69e136076a4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,8 +12,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f40f1400f3d2..81fa7af9ae2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/msbuild @@ -162,9 +162,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c76ac565499f3e7c657126d46c00b67a0d74832c - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/runtime @@ -293,9 +293,9 @@ 10d0f7e94aa45889155c312f51cfc01bf326b853 - - https://github.com/dotnet/runtime - e37fab9fc9f7bce120a7165491ed392a73f8ab51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 @@ -316,9 +316,9 @@ https://github.com/dotnet/arcade bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index bcb556bfc126..0970b782b608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,14 +29,14 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 6.0.0 - 6.0.4 + 6.0.5 6.0.0-beta.24508.2 3.1.0 4.3.0 4.3.0 4.0.5 6.0.0 - 6.0.0 + 6.0.1 4.6.0 2.0.0-beta4.22363.1 1.0.0-preview5.1.22263.1 @@ -44,13 +44,13 @@ - 6.0.35 - 6.0.35-servicing.24459.18 - 6.0.35 + 6.0.36 + 6.0.36-servicing.24514.21 + 6.0.36 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 6.0.1 - 6.0.35 - 6.0.35-servicing.24459.18 + 6.0.2 + 6.0.36 + 6.0.36-servicing.24514.21 6.0.0-preview.7.21363.9 6.0.1 6.0.1 @@ -86,7 +86,7 @@ 6.0.0 - 6.0.0 + 6.0.1 6.0.0 6.0.0 From 11a28dd9f8aef5f9cd558735bfb2093595b35b4c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:36:14 +0000 Subject: [PATCH 4/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20241015.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.427 -> To Version 6.0.427 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69e136076a4a..2cf8ca553dea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,7 @@ - - - - + @@ -41,10 +38,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81fa7af9ae2f..5ebea86aed6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0970b782b608..e7a7f8cc8518 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,7 +119,7 @@ - 6.0.427-rtm.24466.3 + 6.0.427-rtm.24515.7 6.0.427 6.0.427 6.0.427