From 6ba8ce2677fc7e37df40729db762e030cba3bebd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:25:26 +0000 Subject: [PATCH 1/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.60 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++--- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 3 files changed, 61 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index db353d728..eacbe0a71 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,15 +13,20 @@ + + + + + - + - + @@ -44,11 +49,16 @@ - + - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b95db019..424d0ffb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://github.com/dotnet/roslyn @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild a4ecab324c0586fe69b6bdcc062264b244dd8cd0 - - https://github.com/nuget/nuget.client - d55931a69dcda3dcb87ba46a09fe268e0febc223 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf diff --git a/eng/Versions.props b/eng/Versions.props index b7e3b00e3..9b511b507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24068.3 - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24068.6 @@ -85,9 +85,9 @@ - 8.0.201 - 8.0.201-servicing.24115.26 - 8.0.201-servicing.24115.26 + 8.0.202 + 8.0.202-servicing.24116.60 + 8.0.202-servicing.24116.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.5 - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 + 8.0.3-servicing.24114.23 8.0.3 8.0.3 8.0.3 @@ -112,10 +112,10 @@ - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 @@ -127,7 +127,7 @@ - 6.9.0-rc.86 + 6.9.1-rc.3 From 2896ad666bfb95926e04872e5f43b7aa1e8b5217 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:14:58 +0000 Subject: [PATCH 2/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.71 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index eacbe0a71..2efd8a26b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,11 +13,7 @@ - - - - - + @@ -26,7 +22,7 @@ - + @@ -51,14 +47,10 @@ - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424d0ffb4..7041bf7fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + bd280bbb5c9699bb93097206f076ad2f330ea8e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + 46fb08cfa8160d0885b74c7f28a7b187ab86efed https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9b511b507..86c79b810 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24068.3 + 8.0.3-servicing.24116.3 - 8.0.2-servicing.24068.6 + 8.0.3-servicing.24116.6 @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24116.60 - 8.0.202-servicing.24116.60 + 8.0.202-servicing.24116.71 + 8.0.202-servicing.24116.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.3-servicing.24116.9 + 8.0.3-servicing.24116.9 + 8.0.3 + 8.0.3 From 01f8164f807fb438066bb60591d02b29e29f6f9e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:52:24 +0000 Subject: [PATCH 3/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.87 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.3 (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 2efd8a26b..9bf35989e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7041bf7fa..c7edb5ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 86c79b810..20a1879a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.3 8.0.3 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24116.71 - 8.0.202-servicing.24116.71 + 8.0.202-servicing.24116.87 + 8.0.202-servicing.24116.87 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)