From b5cff2c060b5b4427d69dc3941ce702de71f220d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 09:44:49 +0000 Subject: [PATCH 01/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ + - - - + - - - + - - - + - - - + @@ -51,20 +44,15 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..7cfc48c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a42e5dcf5..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23573.3 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23573.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 - 7.0.114 - 7.0.114-servicing.23523.36 - 7.0.114-servicing.23523.36 + 7.0.115 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 + 7.0.15 + 7.0.15 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6e81116e906f2cbf27e6c1d67068c05182c8a471 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:33 +0000 Subject: [PATCH 02/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529576f58..d1253ca2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..169f1cad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..410f1b3f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23571.10 + 7.0.115-servicing.23571.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 777556879646f1dc25b82c0a5736ff4b6ca4162b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:41 +0000 Subject: [PATCH 03/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1253ca2d..07374752c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 169f1cad1..a348c8fa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d diff --git a/eng/Versions.props b/eng/Versions.props index 410f1b3f0..92a56de33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23571.10 - 7.0.115-servicing.23571.10 + 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 02b92181eb69e909194f7fe59b249e7436a6f0d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:50 +0000 Subject: [PATCH 04/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07374752c..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a348c8fa1..7cfc48c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 diff --git a/eng/Versions.props b/eng/Versions.props index 92a56de33..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.11 - 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f0a96cb187bf2263a492fa639c4c36509dc07dd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:59 +0000 Subject: [PATCH 05/16] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk From b78e462adb3c9734cad6f24bec1fe69cb73afac9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:47 +0000 Subject: [PATCH 06/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529576f58..b3682484a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..3b6bc0be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..e6bd74f8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23578.5 + 7.0.115-servicing.23578.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 923551b0bef564e0d325066df6fe56e61b2cc63e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:59:42 +0000 Subject: [PATCH 07/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3682484a..e926b86a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 159d5de6d..2e9c5c1c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6bd74f8d..c4318dd50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23578.5 - 7.0.115-servicing.23578.5 + 7.0.115-servicing.23579.12 + 7.0.115-servicing.23579.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 4366b12f01574e3e8f88a7922caa401c07b7f7b3 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:13:56 -0800 Subject: [PATCH 08/16] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9c5c1c7..1fcfa9e54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From d7ebc6f15ed405fc7d86585b92db0df3afcfb28c Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 10:38:00 -0800 Subject: [PATCH 09/16] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..f2c4d2133 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 10:42:21 -0800 Subject: [PATCH 10/16] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index f2c4d2133..55d1c4ff9 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 11:04:21 -0800 Subject: [PATCH 11/16] Make auth more general --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 55d1c4ff9..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:48:39 +0000 Subject: [PATCH 12/16] Merged PR 35683: Update source build externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcfa9e54..d4f781536 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 From 2f13a3f01e350e2452bd746e0b5fe9849a860d43 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:03 +0000 Subject: [PATCH 13/16] Merged PR 35747: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4f781536..0bb7129fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From d0b4dae10e083ee6d27565f6473e5671bdafa21d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:36 +0000 Subject: [PATCH 14/16] Merged PR 35763: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20231201.25 - **Date Produced**: December 1, 2023 9:21:41 PM UTC - **Commit**: c0aa76c865eb72b183247119752dfabca811f17a - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.115 to 7.0.115][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.NET.Sdk**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1d1af5d700&targetVersion=GCc0aa76c865... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e926b86a7..637dd025e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb7129fd..64be1c99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a diff --git a/eng/Versions.props b/eng/Versions.props index c4318dd50..0173becfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23579.12 - 7.0.115-servicing.23579.12 + 7.0.115-servicing.23601.25 + 7.0.115-servicing.23601.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3513a14922a0b38eb3ec27e4e5a695d4231016ed Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:45:25 -0600 Subject: [PATCH 15/16] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..34dea7b25 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -174,7 +174,7 @@ Date: Wed, 10 Jan 2024 08:45:59 -0600 Subject: [PATCH 16/16] Remove extra line --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 34dea7b25..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,7 +172,6 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> -