From 6af34f16266eb99ba78e66dbe5a7dec756d72232 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:01:59 +0000 Subject: [PATCH 1/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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 | 36 ++++----------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..25b3d1da7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,19 @@ - - - + - - - + - - - + - - - + - - - + @@ -54,23 +44,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..66d5805f9 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 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + 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 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + ce000d354195dfb9e0f8039a74d303f61afcf9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + 226928a35528d63540ed0c8eb4f749d51c9667e9 https://github.com/dotnet/fsharp @@ -167,13 +167,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 3012a3afa..19fce438b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23570.16 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23572.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.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 0.2.0 - 7.0.311 - 7.0.311-servicing.23523.38 - 7.0.311-servicing.23523.38 + 7.0.312 + 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,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.23572.3 + 7.0.15-servicing.23572.3 + 7.0.15 + 7.0.15 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9840fd11dbffdee6c797f8daec3a15c8186e2cc2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 17:45:14 +0000 Subject: [PATCH 2/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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 | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25b3d1da7..65e2ee623 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d5805f9..65785a115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ce000d354195dfb9e0f8039a74d303f61afcf9c9 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 226928a35528d63540ed0c8eb4f749d51c9667e9 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19fce438b..018a55ab1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23570.16 + 7.0.15-servicing.23573.3 - 7.0.15-servicing.23572.2 + 7.0.15-servicing.23573.2 @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 + 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 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.14 - 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.32 + 7.0.312-servicing.23573.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23572.3 - 7.0.15-servicing.23572.3 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 7.0.15 7.0.15 From 5465d933ea269f8a784cdc7af14107f42ed026fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:06 +0000 Subject: [PATCH 3/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 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 65e2ee623..24168537a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65785a115..2b505f556 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 - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda diff --git a/eng/Versions.props b/eng/Versions.props index 018a55ab1..96257c41d 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.312 - 7.0.312-servicing.23573.32 - 7.0.312-servicing.23573.32 + 7.0.312-servicing.23578.4 + 7.0.312-servicing.23578.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bf37478b6ca1e4e7251f1c4d47a9cce103f170f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:58:43 +0000 Subject: [PATCH 4/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 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 24168537a..529a9110e 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 59e1f894d..0dafb4b3c 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 - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f 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 96257c41d..b5858e711 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.312 - 7.0.312-servicing.23578.4 - 7.0.312-servicing.23578.4 + 7.0.312-servicing.23579.10 + 7.0.312-servicing.23579.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,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 3c375371e94111e8ca72395e195c0b24f19e23fe Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:16:27 -0800 Subject: [PATCH 5/9] 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 0dafb4b3c..d2b434cf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From a36d95f8809690ca0f0d7bcec7d4da89e313eb85 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 29 Nov 2023 22:28:51 +0000 Subject: [PATCH 6/9] Merged PR 35684: Update source build externals and add internal auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b434cf4..0fad8e220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..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: Fri, 1 Dec 2023 20:00:07 +0000 Subject: [PATCH 7/9] Merged PR 35748: 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 02e1c50cd..4c531da6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 059cd2aa3bb714bd4934b23f3eedc4564815ecce Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:43 +0000 Subject: [PATCH 8/9] Merged PR 35764: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 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:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20231201.26 - **Date Produced**: December 1, 2023 9:22:43 PM UTC - **Commit**: a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.312 to 7.0.312][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.NET.Sdk**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][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=GC4e72473553&targetVersion=GCa87e751ac0... --- 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 529a9110e..2102f9bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c531da6e..9a29a0c14 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 - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c diff --git a/eng/Versions.props b/eng/Versions.props index aa9d370e1..2db776d1f 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.312 - 7.0.312-servicing.23579.10 - 7.0.312-servicing.23579.10 + 7.0.312-servicing.23601.26 + 7.0.312-servicing.23601.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48bc53793dab3cc1b9a911044ab90117d858a4ae Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:47:54 -0600 Subject: [PATCH 9/9] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> -