From 728212525f56b62e79402f8ff9dac1d64608e5bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:56:47 +0000 Subject: [PATCH 1/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.117 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.16 -> To Version 7.0.17 (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 3fddfa878..229d9e9e6 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 351bf8ed3..1b4ea62e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a1ed9ad1c..7b8737c3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -56,22 +56,22 @@ - 7.0.16 - 7.0.16 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 - 7.0.116 - 7.0.116-servicing.24069.8 - 7.0.116-servicing.24069.8 + 7.0.117 + 7.0.117-servicing.24116.16 + 7.0.117-servicing.24116.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 + 7.0.17 + 7.0.17 @@ -229,8 +229,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 83ba947f1177b92fc813d72f7da46beda0c8a782 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:26:15 +0000 Subject: [PATCH 2/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 --- 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 229d9e9e6..d7f14bc97 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 1b4ea62e8..7d35d485c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 diff --git a/eng/Versions.props b/eng/Versions.props index 7b8737c3f..fbe049837 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.16 - 7.0.117-servicing.24116.16 + 7.0.117-servicing.24116.58 + 7.0.117-servicing.24116.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f837228db5a86e6390968fb854793a4a89728419 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:39:11 +0000 Subject: [PATCH 3/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.74 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7f14bc97..c8b00d0aa 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 7d35d485c..a47e01646 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fbe049837..7e7b7c8d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.58 - 7.0.117-servicing.24116.58 + 7.0.117-servicing.24116.74 + 7.0.117-servicing.24116.74 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From 20666fac28d631439089023fbc94699e2f4cc82a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:47:47 +0000 Subject: [PATCH 4/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.88 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 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.17 -> To Version 7.0.17 (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 c8b00d0aa..b5a2563ce 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 a47e01646..795ead903 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 diff --git a/eng/Versions.props b/eng/Versions.props index 7e7b7c8d4..cb0fcd1d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.74 - 7.0.117-servicing.24116.74 + 7.0.117-servicing.24116.88 + 7.0.117-servicing.24116.88 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)