From ec7d3cf9805f22616516f9007f2517a32a32534c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 20:36:03 +0000 Subject: [PATCH 001/130] Merged PR 34847: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23525.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.8.0-3.23524.2... --- NuGet.config | 10 ++-- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 38 +++++++------- 3 files changed, 82 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbfd3a625..83eab89c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,17 +10,19 @@ - - + - + + + + @@ -42,8 +44,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db9..87d4ae51c 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://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - - https://github.com/dotnet/winforms - d77ef3b1a253a99d0be23cec35e84d2fb3317ac5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 44849e81b34d51fe9d6d2163bd4b1ab7a0ada387 - - https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 7d1347568b78bfc41c92855aecb9a301e08590fb https://github.com/dotnet/fsharp @@ -148,11 +148,11 @@ https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/roslyn - 12b11685a551e0a6a203dcecb584f610f4df1157 + f43cd10b737b6343956dee421cff8c50b602c788 diff --git a/eng/Versions.props b/eng/Versions.props index f08343dc9..b32b8b39d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23525.7 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23526.1 @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 0.2.0 @@ -86,24 +86,24 @@ 8.0.100 - 8.0.100-rtm.23524.25 - 8.0.100-rtm.23524.25 + 8.0.100-rtm.23526.9 + 8.0.100-rtm.23526.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.2 + 4.8.0-3.23524.11 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 - 8.0.0-rtm.23523.12 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 + 8.0.0-rtm.23524.7 8.0.0 8.0.0 8.0.0 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23526.4 + 8.0.0-rtm.23526.4 + 8.0.0 + 8.0.0 From 4b3305b14d56d8e39157dddc4554b6d7763e2f76 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 21:47:05 +0000 Subject: [PATCH 002/130] Merged PR 34852: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rtm.23524.15 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rtm.23524.15 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231026.11 - **Date Produced**: October 26, 2023 8:10:44 PM UTC - **Commit**: ad5c9dfff0ed7674a2196f138518daea5783f1f6 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.9 to 8.0.100-rtm.23526.11][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.9 to 8.0.100-rtm.23526.11][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.10... --- NuGet.config | 9 ++-- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++------ 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83eab89c6..2fd162a38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,15 +10,16 @@ + - + - + @@ -41,10 +42,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87d4ae51c..b856338be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 https://github.com/dotnet/test-templates @@ -147,8 +147,8 @@ - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b32b8b39d..203e88179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.9 - 8.0.100-rtm.23526.9 + 8.0.100-rtm.23526.11 + 8.0.100-rtm.23526.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23524.7 + 8.0.0-rtm.23525.7 - 8.0.0-rtm.23524.7 - 8.0.0-rtm.23524.7 + 8.0.0-rtm.23525.7 + 8.0.0-rtm.23525.7 8.0.0 8.0.0 8.0.0 From 686b49618547dc30b335b83f64c59305d77dcb51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 22:59:11 +0000 Subject: [PATCH 003/130] Merged PR 34856: [internal/release/8.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 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231026.13 - **Date Produced**: October 26, 2023 9:33:59 PM UTC - **Commit**: fc894af5e747aec82e6581c7bec01aea120c7115 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-dev-certs**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-user-jwts**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-user-secrets**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCad5c9dfff0&targetVersion=GCfc894af5e7&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC757f469b66&targetVersion=GC9b5f201a55&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d... --- 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 2fd162a38..d46fe9208 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b856338be..767b3fbc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 203e88179..4bac039a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.11 - 8.0.100-rtm.23526.11 + 8.0.100-rtm.23526.13 + 8.0.100-rtm.23526.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d885f6071018dcfff672e74c12aac781b67f108 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 27 Oct 2023 12:44:23 +0000 Subject: [PATCH 004/130] [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23526.4 to 8.0.0-rtm.23526.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23526.4 to 8.0.0-rtm.23526.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23526.1 to 8.0.0-rtm.23526.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 d46fe9208..2042de10f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767b3fbc1..6ac15ff81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 44849e81b34d51fe9d6d2163bd4b1ab7a0ada387 + 718c6eea1a6aaef771fd2ab88168ec0de6c26929 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7d1347568b78bfc41c92855aecb9a301e08590fb + 7dc2766592abf35c9ff0ae407fe1af20ab4be76b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bac039a2..9a768c646 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23526.3 - 8.0.0-rtm.23526.1 + 8.0.0-rtm.23526.7 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.13 - 8.0.100-rtm.23526.13 + 8.0.100-rtm.23526.16 + 8.0.100-rtm.23526.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.0-rtm.23526.4 - 8.0.0-rtm.23526.4 + 8.0.0-rtm.23526.6 + 8.0.0-rtm.23526.6 8.0.0 8.0.0 From d591a48bc0e13fdc5a5846440912ce9b6659133e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 28 Oct 2023 00:25:36 +0000 Subject: [PATCH 005/130] Merged PR 34884: [internal/release/8.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 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231027.8 - **Date Produced**: October 27, 2023 4:25:06 PM UTC - **Commit**: f0039867c17ac82a01895261802e50a6da068d57 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-dev-certs**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-user-jwts**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-user-secrets**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC45e463695e&targetVersion=GCf0039867c1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9b5f201a55&targetVersion=GC31739e30e9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2042de10f..e52b883f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + - + + - + + @@ -42,14 +45,16 @@ - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ac15ff81..471ff83c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9a768c646..5f91b4d36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.16 - 8.0.100-rtm.23526.16 + 8.0.100-rtm.23527.8 + 8.0.100-rtm.23527.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 57c71a1cfe4fe3bd238fce64213129316cc6e850 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 28 Oct 2023 02:40:58 +0000 Subject: [PATCH 006/130] Merged PR 34855: Updating the baseline manifest for Aspire @ @ @ @ Updating the baseline manifest for Aspire --- NuGet.config | 2 ++ eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index e52b883f9..499a5fb52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,6 +41,7 @@ + @@ -59,5 +60,6 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 5f91b4d36..013b09b06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,8 +237,8 @@ - 8.0.100-rc.1 - 8.0.0-alpha.23471.13 + 8.0.100 + 8.0.0-preview.1.23526.4 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 From 2d2483a495929285f614f6ebb429017612973a04 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 31 Oct 2023 22:05:32 +0000 Subject: [PATCH 007/130] Merged PR 34930: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.6 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23526.6 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23526.3 to 8.0.0-rtm.23531.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23531.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from... --- NuGet.config | 22 ++++++------ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 64 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 499a5fb52..091c44301 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,24 @@ + + - + - - + - + - - + @@ -46,17 +46,15 @@ - + - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 471ff83c5..5b6a96d2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 718c6eea1a6aaef771fd2ab88168ec0de6c26929 + 88d8522de318730859437bb17c116bb0ed015f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7dc2766592abf35c9ff0ae407fe1af20ab4be76b + a713d39da10c1a548c70e9024c180f0c1785f881 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f41e8abf8..27e9f5f5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23526.3 + 8.0.0-rtm.23531.1 - 8.0.0-rtm.23526.7 + 8.0.0-rtm.23531.2 @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23527.8 - 8.0.100-rtm.23527.8 + 8.0.100-rtm.23531.14 + 8.0.100-rtm.23531.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23530.12 - 8.0.0-rtm.23525.7 - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23530.12 + 8.0.0-rtm.23530.12 8.0.0 8.0.0 8.0.0 @@ -112,8 +112,8 @@ - 8.0.0-rtm.23526.6 - 8.0.0-rtm.23526.6 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 8.0.0 8.0.0 From 59d2c2576042691507fee53e3d5852e321e31ac7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 31 Oct 2023 23:36:35 +0000 Subject: [PATCH 008/130] Merged PR 34969: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.0-rtm.23523.2 to 8.0.0-rtm.23530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231031.25 - **Date Produced**: October 31, 2023 10:48:17 PM UTC - **Commit**: cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.0 to 8.0.0][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.0 to 8.0.0][2] - **Microsoft.NETCor... --- NuGet.config | 13 +++++-------- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 091c44301..b52179d7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -19,10 +16,10 @@ - + - + @@ -49,9 +46,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b6a96d2b..edaa4c219 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://github.com/dotnet/roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index 27e9f5f5e..8ee258095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23531.14 - 8.0.100-rtm.23531.14 + 8.0.100-rtm.23531.25 + 8.0.100-rtm.23531.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23530.12 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23530.12 - 8.0.0-rtm.23530.12 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 8.0.0 8.0.0 8.0.0 From 0f22c8fd4bb79262800187ce9a10aae0ea505b78 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 1 Nov 2023 12:45:07 +0000 Subject: [PATCH 009/130] Merged PR 34979: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23531.2 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231101.6 - **Date Produced**: November 1, 2023 11:48:28 AM UTC - **Commit**: e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.WindowsD... --- 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 b52179d7f..fb4bef099 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -43,15 +43,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edaa4c219..db87639b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 88d8522de318730859437bb17c116bb0ed015f5e + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a713d39da10c1a548c70e9024c180f0c1785f881 + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8ee258095..02162e19f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23531.2 + 8.0.0-rtm.23531.4 @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23531.25 - 8.0.100-rtm.23531.25 + 8.0.100-rtm.23551.6 + 8.0.100-rtm.23551.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 8.0.0 8.0.0 From 9d6e3d71808815da6f49c7681c35858214d59103 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 1 Nov 2023 14:24:19 +0000 Subject: [PATCH 010/130] Merged PR 34956: Adding Aspire repo into source-build Adding Aspire repo into source-build cc: @ @ @ --- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 2 +- src/SourceBuild/content/repo-projects/aspire.proj | 13 +++++++++++++ src/SourceBuild/content/repo-projects/dotnet.proj | 1 + .../assets/baselines/licenses/Licenses.aspire.json | 3 +++ src/VirtualMonoRepo/source-mappings.json | 7 +++++++ src/redist/targets/BundledManifests.targets | 2 +- 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/content/repo-projects/aspire.proj create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db87639b4..1406f019d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,6 +172,11 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 276cc28b03c11e2850546e604c707e664339fc15 + + https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index 02162e19f..e2c6743f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 8.0.100 - 8.0.0-preview.1.23526.4 + 8.0.0-preview.1.23531.6 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 diff --git a/src/SourceBuild/content/repo-projects/aspire.proj b/src/SourceBuild/content/repo-projects/aspire.proj new file mode 100644 index 000000000..7d41e5e5f --- /dev/null +++ b/src/SourceBuild/content/repo-projects/aspire.proj @@ -0,0 +1,13 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + + + + + + + \ No newline at end of file diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 23c5d842a..26ce0941f 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 831fae959..7e6c1ccd5 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -60,6 +60,13 @@ "src/Microsoft.DotNet.SignTool.Tests/*.vsix" ] }, + { + "name": "aspire", + "defaultRemote": "https://github.com/dotnet/aspire", + "exclude": [ + "src/Aspire.Dashboard/**/*" + ] + }, { "name": "aspnetcore", "defaultRemote": "https://github.com/dotnet/aspnetcore", diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index d6db716b9..73402bced 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -4,7 +4,6 @@ - @@ -17,6 +16,7 @@ + From 01e8a441b4fd015580f50a8690becfb8bc6a98d1 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 1 Nov 2023 13:17:51 -0700 Subject: [PATCH 011/130] Update Aspire manifest inserted into installer --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1406f019d..a1cebfeed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,9 +172,9 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire - 276cc28b03c11e2850546e604c707e664339fc15 + 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 diff --git a/eng/Versions.props b/eng/Versions.props index e2c6743f4..329ab4ece 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 8.0.100 - 8.0.0-preview.1.23531.6 + 8.0.0-preview.1.23551.7 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 From 2155c78d6236e33524fbfca4f2764a29626d0f80 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Nov 2023 21:53:05 +0000 Subject: [PATCH 012/130] Merged PR 35302: [internal/release/8.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.FSharp.Compiler**: from 12.8.0-beta.23523.6 to 12.8.0-beta.23563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 8.0.100-beta.23523.6 to 8.0.101-beta.23563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 17.8.0-release-23523-03 to 17.8.0-release-23553-01 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.8.0-3.23524.11 to 4.8.0-7.23566.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231117.10 - **Date Produced**: November 17, 2023 7:31:44 PM UTC - **Commit**: 896ac7319c1d96012fa40193a20d1aadc444c697 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.101][21] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.FSharp.Compiler**: [from 12.8.0-beta.23523.6 to 12.8.0-beta.23563.2][22] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 8.0.100-beta.23523.6 to 8.0.101-beta.23563.2][22] - **Microsoft.NET.Test.Sdk**: [from 17.8.0-release-23523-03 to 17.8.0-release-23553-01][23] - **Microsoft.Net.Compilers.Toolset**: [from 4.8.0-3.23524.11 to 4.8.0-7.23566.2][24] [21]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe9d13cbe7e&targetVersion=GC896ac7319c&_a=files [22]: https://github.com/dotnet/fsharp/compare/f41fe153f6...424e4b7cff [23]: https://github.com/microsoft/vstest/compare/ae25c3b96f...ae25c3b96f [24]: https://github.com/dotnet/roslyn/compare/f43cd10b73...7b75981cf3 [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb4bef099..54a5d4357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - + - @@ -43,15 +38,12 @@ - - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c1fff170..9734c347f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 https://github.com/dotnet/test-templates @@ -132,16 +132,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest ae25c3b96fe433c60af70e3991ace49fcbf7e970 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - f43cd10b737b6343956dee421cff8c50b602c788 + 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb diff --git a/eng/Versions.props b/eng/Versions.props index 49c0d5b04..bcfd8bdc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.100 - 8.0.100-rtm.23551.6 - 8.0.100-rtm.23551.6 + 8.0.101 + 8.0.101-servicing.23567.10 + 8.0.101-servicing.23567.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.11 + 4.8.0-7.23566.2 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.8.0-release-23553-01 8.0.0-alpha.1.22557.12 From 8aa023ba39689e98abec53397fc4c75128f200a3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 Nov 2023 16:51:21 +0000 Subject: [PATCH 013/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231118.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates 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 From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54a5d4357..28dd7e64f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,14 @@ + - + @@ -38,10 +39,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9734c347f..491723294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bcfd8bdc8..290334b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23567.10 - 8.0.101-servicing.23567.10 + 8.0.101-servicing.23568.1 + 8.0.101-servicing.23568.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cd4ffb4f255136aec7e4225180c17fd638b1ebe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 04:14:47 +0000 Subject: [PATCH 014/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231119.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates 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 From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 28dd7e64f..a31f74b17 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 491723294..eb98ef1b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 290334b57..95a63eb5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23568.1 - 8.0.101-servicing.23568.1 + 8.0.101-servicing.23569.5 + 8.0.101-servicing.23569.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8837938895805299a1465ff22d250abc1783353a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 13:45:26 +0000 Subject: [PATCH 015/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates 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 From Version 8.0.0 -> To Version 8.0.1 (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 a31f74b17..96942b246 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,14 @@ - + - + @@ -39,11 +39,11 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb98ef1b3..b19fb48bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 95a63eb5a..d82daf14c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23569.5 - 8.0.101-servicing.23569.5 + 8.0.101-servicing.23570.4 + 8.0.101-servicing.23570.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4278950db813e15258bea22c93bd74aff4564fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 18:35:25 +0000 Subject: [PATCH 016/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 96942b246..3c082c7b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,10 @@ - + + @@ -43,9 +44,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b19fb48bc..2e7141bfd 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 - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + a223f121b4c906a72b2b0711fe24e6b8e0e0cf18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + 8a13cff12b600771ba62ef9ec9cfa491d37fa383 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d82daf14c..8601d9739 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23567.3 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23570.2 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.4 - 8.0.101-servicing.23570.4 + 8.0.101-servicing.23570.10 + 8.0.101-servicing.23570.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23570.2 + 8.0.1-servicing.23570.2 + 8.0.1 + 8.0.1 From 06ddb6bd75a241a9ac6cf91e8721253d07c7d7a2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 03:28:47 +0000 Subject: [PATCH 017/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 3c082c7b4..0c00329dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e7141bfd..71361585a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8601d9739..2fa09df46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.10 - 8.0.101-servicing.23570.10 + 8.0.101-servicing.23570.47 + 8.0.101-servicing.23570.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9362eef08d73ba2f355c09fa4473316cd41c0f18 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 07:35:32 +0000 Subject: [PATCH 018/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.53 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 0c00329dc..25cc0e168 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71361585a..8a6fa524b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2fa09df46..98223ad46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.47 - 8.0.101-servicing.23570.47 + 8.0.101-servicing.23570.53 + 8.0.101-servicing.23570.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae38391508267e77f4c24f8eee9f82eaa4e3c5a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 14:38:20 +0000 Subject: [PATCH 019/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 7 ++++-- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25cc0e168..cd0c3e9c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -14,9 +15,10 @@ + - + @@ -43,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a6fa524b..1cac67efb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ ae25c3b96fe433c60af70e3991ace49fcbf7e970 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + d75f77cb8eb87322453288a22ce9b2d880bd1cb1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + d75f77cb8eb87322453288a22ce9b2d880bd1cb1 diff --git a/eng/Versions.props b/eng/Versions.props index 98223ad46..1037734a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.53 - 8.0.101-servicing.23570.53 + 8.0.101-servicing.23571.3 + 8.0.101-servicing.23571.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -102,12 +102,12 @@ - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23570.18 + 8.0.1-servicing.23570.18 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 @@ -249,7 +249,7 @@ 13.3.8968-net8-rc2 16.4.8968-net8-rc2 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From a9a2ed7803d91edbec7d6115258b65cab880dece Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 15:32:16 +0000 Subject: [PATCH 020/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 cd0c3e9c4..bfe05ac58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cac67efb..c6196825f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1037734a7..29d28c3c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.3 - 8.0.101-servicing.23571.3 + 8.0.101-servicing.23571.5 + 8.0.101-servicing.23571.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a2bfafa3be662f68487c9e9732bd5038ab9a192 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 16:37:28 +0000 Subject: [PATCH 021/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 bfe05ac58..4b5b45fbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6196825f..a83903216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 29d28c3c0..9d6711610 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.5 - 8.0.101-servicing.23571.5 + 8.0.101-servicing.23571.7 + 8.0.101-servicing.23571.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efa68fe107f1ddc841be508aed50bc996575aac4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 18:02:42 +0000 Subject: [PATCH 022/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 4b5b45fbf..69ea23a73 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a83903216..8b2832208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a223f121b4c906a72b2b0711fe24e6b8e0e0cf18 + 642f51b02a34281044c2a1e07862b2bf2b71c155 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8a13cff12b600771ba62ef9ec9cfa491d37fa383 + b871665f995218f1d89f071e87080bb481787364 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9d6711610..845c697df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23567.3 + 8.0.1-servicing.23571.1 - 8.0.1-servicing.23570.2 + 8.0.1-servicing.23571.2 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.7 - 8.0.101-servicing.23571.7 + 8.0.101-servicing.23571.8 + 8.0.101-servicing.23571.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23570.2 - 8.0.1-servicing.23570.2 + 8.0.1-servicing.23571.3 + 8.0.1-servicing.23571.3 8.0.1 8.0.1 From 2441b556600cd841022032a0f9abafe367ff0473 Mon Sep 17 00:00:00 2001 From: "Michael Simons (VISUAL STUDIO)" Date: Tue, 21 Nov 2023 20:48:14 +0000 Subject: [PATCH 023/130] Workaround arcade snupkg issue with building sourcelink in source build. --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 165f87523..cdd195114 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -113,6 +113,9 @@ + + + From b6cdff23ee93a12e68ee43ad300b191c528ce76b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 01:32:02 +0000 Subject: [PATCH 024/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 69ea23a73..5ed76703b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2832208..6ca04f845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 845c697df..17e86845b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.8 - 8.0.101-servicing.23571.8 + 8.0.101-servicing.23571.17 + 8.0.101-servicing.23571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2431c05824045be3485c47cc62368351e59b2864 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 13:16:10 +0000 Subject: [PATCH 025/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231122.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 8 ++++---- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ed76703b..6dc4ccdcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ca04f845..4273e2cc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://github.com/dotnet/roslyn @@ -170,16 +170,16 @@ https://github.com/dotnet/emsdk - d75f77cb8eb87322453288a22ce9b2d880bd1cb1 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 - + https://github.com/dotnet/emsdk - d75f77cb8eb87322453288a22ce9b2d880bd1cb1 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 diff --git a/eng/Versions.props b/eng/Versions.props index 17e86845b..9a029e797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.17 - 8.0.101-servicing.23571.17 + 8.0.101-servicing.23572.4 + 8.0.101-servicing.23572.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -102,8 +102,8 @@ - 8.0.1-servicing.23570.18 - 8.0.1-servicing.23570.18 + 8.0.1-servicing.23571.29 + 8.0.1-servicing.23571.29 8.0.1 8.0.1 8.0.1 From 8690b4168768b006c095522c64dec27cf579cec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 20:14:23 +0000 Subject: [PATCH 026/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231122.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6dc4ccdcf..9e20ad59c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4273e2cc4..c6c6cc87c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d https://github.com/dotnet/test-templates @@ -150,7 +150,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 21b90573de7d6e0c88acdd25dc116b6729fd65a7 - + https://github.com/dotnet/roslyn 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb diff --git a/eng/Versions.props b/eng/Versions.props index 9a029e797..621fc992d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,15 +86,15 @@ 8.0.101 - 8.0.101-servicing.23572.4 - 8.0.101-servicing.23572.4 + 8.0.101-servicing.23572.19 + 8.0.101-servicing.23572.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23566.2 + 4.8.0-7.23572.1 From 684d29ae26f5f29c697fb5dc1448b8f1cb4ec4b9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 25 Nov 2023 00:34:40 +0000 Subject: [PATCH 027/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 9e20ad59c..e486010ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6c6cc87c..54d6dfbd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 621fc992d..a3da5a719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23572.19 - 8.0.101-servicing.23572.19 + 8.0.101-servicing.23574.7 + 8.0.101-servicing.23574.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b129b6e2ed37a5b7c5eaade5ee05a69742492127 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 27 Nov 2023 13:50:58 +0000 Subject: [PATCH 028/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231127.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 e486010ef..da071ea15 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d6dfbd8..31e363e5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 642f51b02a34281044c2a1e07862b2bf2b71c155 + 330e1adc916cc03d60d340d04d666b829dcbb5d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b871665f995218f1d89f071e87080bb481787364 + d24bf24661d5cb21899baf3e473bec7d552f0100 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a3da5a719..ea45f16a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23571.1 + 8.0.1-servicing.23574.2 - 8.0.1-servicing.23571.2 + 8.0.1-servicing.23577.1 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23574.7 - 8.0.101-servicing.23574.7 + 8.0.101-servicing.23577.2 + 8.0.101-servicing.23577.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23571.3 - 8.0.1-servicing.23571.3 + 8.0.1-servicing.23577.2 + 8.0.1-servicing.23577.2 8.0.1 8.0.1 From 8963282686d67a14f42fd53271df003b5f2cb7a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:51:15 +0000 Subject: [PATCH 029/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 da071ea15..0f2043e51 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e363e5a..e08f356c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ea45f16a5..fef54d7d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23577.2 - 8.0.101-servicing.23577.2 + 8.0.101-servicing.23578.3 + 8.0.101-servicing.23578.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b69c3bc5b4574b62c6a21eeadb2342bece26639 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 28 Nov 2023 09:24:13 -0800 Subject: [PATCH 030/130] Update source build externals --- 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 e08f356c8..ebf4b2006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - - https://github.com/dotnet/source-build-externals - 776b128c95ef681d125adc3eb69f12d480418bb5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e From 2b898386936291e1c6a1a1b47df1e1726a933daa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 21:26:46 +0000 Subject: [PATCH 031/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f2043e51..b40ae4f9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebf4b2006..a3cc3e2d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 diff --git a/eng/Versions.props b/eng/Versions.props index fef54d7d1..b5bced75f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.3 - 8.0.101-servicing.23578.3 + 8.0.101-servicing.23578.22 + 8.0.101-servicing.23578.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23553-01 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 From 250154ba132fdd28289b18823d8ac6b6a0f39f33 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 22:25:06 +0000 Subject: [PATCH 032/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index b40ae4f9e..aba331a8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3cc3e2d3..a445c991d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b5bced75f..b0a942e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.22 - 8.0.101-servicing.23578.22 + 8.0.101-servicing.23578.23 + 8.0.101-servicing.23578.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23572.22 - 8.0.1-servicing.23571.29 - 8.0.1-servicing.23571.29 + 8.0.1-servicing.23572.22 + 8.0.1-servicing.23572.22 8.0.1 8.0.1 8.0.1 From bae74599d7033c05aaa1bb0958bd1b8ce628cdd2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 29 Nov 2023 00:06:24 +0000 Subject: [PATCH 033/130] Updated Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b0a942e98..3e50af6ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23516.4 + 8.0.0-beta.23564.4 From 38bbe013ade7b04eb12ac04f93ab4ca28c1c3648 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 02:40:35 +0000 Subject: [PATCH 034/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index aba331a8e..c02296e93 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9bb3f44e..7452b6aed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bd0fe47bf..3d52ed096 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.23 - 8.0.101-servicing.23578.23 + 8.0.101-servicing.23578.34 + 8.0.101-servicing.23578.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.1-servicing.23572.22 + 8.0.1-servicing.23578.5 - 8.0.1-servicing.23572.22 - 8.0.1-servicing.23572.22 + 8.0.1-servicing.23578.5 + 8.0.1-servicing.23578.5 8.0.1 8.0.1 8.0.1 From a16bb964e8f4a55958dca3e55794637d1b430599 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 03:45:24 +0000 Subject: [PATCH 035/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 c02296e93..d0f902c30 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7452b6aed..c2bc9ae89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3d52ed096..259ae803a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.34 - 8.0.101-servicing.23578.34 + 8.0.101-servicing.23578.41 + 8.0.101-servicing.23578.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cad53da73912f0f506f47dc87aeea51ec993aef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 10:27:51 +0000 Subject: [PATCH 036/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 d0f902c30..1ade02914 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2bc9ae89..297c0d452 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 259ae803a..fd9b79867 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.41 - 8.0.101-servicing.23578.41 + 8.0.101-servicing.23579.1 + 8.0.101-servicing.23579.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73698596c8dbaf63884a7069abcf017330564ac8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:03:11 +0000 Subject: [PATCH 037/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 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.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 1ade02914..5e7f2297d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 297c0d452..58a198760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 330e1adc916cc03d60d340d04d666b829dcbb5d7 + e61cfa7d404cf0d4cb24b5d6e69bb44978a9b45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d24bf24661d5cb21899baf3e473bec7d552f0100 + 32051d79682192306ba625d5ff0df24735953053 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fd9b79867..f3a84a074 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23574.2 + 8.0.1-servicing.23578.7 - 8.0.1-servicing.23577.1 + 8.0.1-servicing.23578.5 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23579.1 - 8.0.101-servicing.23579.1 + 8.0.101-servicing.23579.8 + 8.0.101-servicing.23579.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23577.2 - 8.0.1-servicing.23577.2 + 8.0.1-servicing.23579.1 + 8.0.1-servicing.23579.1 8.0.1 8.0.1 From e9a9fe67515838592a70f32fe46105bf7b70de3b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 18:01:13 +0000 Subject: [PATCH 038/130] Merged PR 35707: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.4 - **Date Produced**: November 30, 2023 3:04:42 PM UTC - **Commit**: c13aa6f5f37d295ebb20bc7620f32280409228df - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.1 to 8.0.1][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.Platforms**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e7f2297d..b81f0fb22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,23 @@ + + - + - + + @@ -42,14 +45,16 @@ + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58a198760..b20e89cda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f3a84a074..4f74955c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23579.8 - 8.0.101-servicing.23579.8 + 8.0.101-servicing.23580.4 + 8.0.101-servicing.23580.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.1 - 8.0.1-servicing.23578.5 - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 8.0.1 8.0.1 8.0.1 From b998a6b438eb350d6a399ddf3e2e766aae9de926 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 20:10:04 +0000 Subject: [PATCH 039/130] Merged PR 35715: [internal/release/8.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 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.7 - **Date Produced**: November 30, 2023 6:52:30 PM UTC - **Commit**: 00fb97552b441808101347d532bf225ac753d017 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.1 to 8.0.1][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.1 to 8.0.1][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-dev-certs**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-user-jwts**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-user-secrets**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc13aa6f5f3&targetVersion=GC00fb97552b&_a=files [2]: https://dev.azure.com/dnceng/internal/... --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b81f0fb22..b38280d82 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,7 @@ - - + @@ -20,7 +19,7 @@ - + @@ -45,13 +44,12 @@ - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b20e89cda..19254d016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4f74955c2..b226e16e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.4 - 8.0.101-servicing.23580.4 + 8.0.101-servicing.23580.7 + 8.0.101-servicing.23580.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d29df3aaf5c988e6f0cc6a53a83ea48cda3466a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 22:53:07 +0000 Subject: [PATCH 040/130] Merged PR 35718: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.15 - **Date Produced**: November 30, 2023 8:46:48 PM UTC - **Commit**: ba557d0de5a22ff497bc835c13112a0314419874 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.1 to 8.0.1][3] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.1 to 8.0.1][3] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-dev-certs**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-user-jwts**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-user-secrets**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC00fb97552b&targetVersion=GCba557d0de5&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb7bb790a4b&targetVersion=GC580b6a8488&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) [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 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET... --- 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 b38280d82..0db0f6ddd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19254d016..fc7f790e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b226e16e6..549990af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.7 - 8.0.101-servicing.23580.7 + 8.0.101-servicing.23580.15 + 8.0.101-servicing.23580.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6eceda187bfd6e063bc320a37e52aad7c77c3b5b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 03:50:55 +0000 Subject: [PATCH 041/130] Merged PR 35722: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.1-servicing.23579.1 to 8.0.1-servicing.23580.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.1-servicing.23579.1 to 8.0.1-servicing.23580.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23578.7 to 8.0.1-servicing.23580.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.19 - **Date Produced**: November 30, 2023 11:46:50 PM UTC - **Commit**: 62602b4763b5eec1deb8d8542e9717134ef56aec - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.15 to 8.0.101-servicing.23580.19][5] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.15 to 8.0.101-servicing.2358... --- NuGet.config | 14 +++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0db0f6ddd..e03fc8203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -19,11 +19,10 @@ - + - - + @@ -44,16 +43,15 @@ - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc7f790e6..983f88668 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e61cfa7d404cf0d4cb24b5d6e69bb44978a9b45a + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 32051d79682192306ba625d5ff0df24735953053 + ac40bed7a33baf164d3984ca90c2aedba996a7b2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 549990af6..3cc621de1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23578.7 + 8.0.1-servicing.23580.6 - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.5 @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.15 - 8.0.101-servicing.23580.15 + 8.0.101-servicing.23580.21 + 8.0.101-servicing.23580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23579.1 - 8.0.1-servicing.23579.1 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 8.0.1 8.0.1 From e67d66a029fdbee58170cce99ec9caee5b69763b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 11 Dec 2023 15:43:39 +0000 Subject: [PATCH 042/130] [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e03fc8203..adad3fa6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,25 @@ + + + - + + @@ -43,14 +47,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 983f88668..65eb038ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3cc621de1..8788362e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.21 - 8.0.101-servicing.23580.21 + 8.0.101-servicing.23607.3 + 8.0.101-servicing.23607.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8bb85379f184d5c4b49d5555dc18fa190f87463d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:06:00 +0000 Subject: [PATCH 043/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.418-servicing.23611.6 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe..d802adb8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,30 @@ + + + + + + + + + + @@ -42,15 +52,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91..c66ea58ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf diff --git a/eng/Versions.props b/eng/Versions.props index 2f4872aa6..11750c01a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.39 - 6.0.418-servicing.23605.39 + 6.0.418-servicing.23611.6 + 6.0.418-servicing.23611.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36653344131b4cf870ec2560b60510d1ee90b667 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:13:18 +0000 Subject: [PATCH 044/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index adad3fa6c..f2da76ce8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,28 @@ + + + - + + @@ -48,16 +52,19 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65eb038ed..343052fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8788362e8..4ff881841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23607.3 - 8.0.101-servicing.23607.3 + 8.0.101-servicing.23611.9 + 8.0.101-servicing.23611.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb1198154e30c20daea4357adcc8b0a3eb6f9c7f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Dec 2023 06:42:41 +0000 Subject: [PATCH 045/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231217.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.8.0-release-23578-02 -> To Version 17.8.0-release-23615-02 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f2da76ce8..632fa4e58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 343052fde..4dc8833e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - 3259862fadd5e784564e7d920a2d61a75f415a79 + aa59400b11e1aeee2e8af48928dbd48748a8bef9 diff --git a/eng/Versions.props b/eng/Versions.props index 4ff881841..2b0d28ac5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23611.9 - 8.0.101-servicing.23611.9 + 8.0.101-servicing.23617.7 + 8.0.101-servicing.23617.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23578-02 + 17.8.0-release-23615-02 8.0.0-alpha.1.22557.12 From 4fbf19326dbefe6c1ff09d121a3e0c39e20dfa0f Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Wed, 20 Dec 2023 13:49:01 +0000 Subject: [PATCH 046/130] Merged PR 36036: Merge public release/8.0.1xx into internal Manual merge from public due to conflicts discovered by https://dev.azure.com/dnceng/internal/_build/results?buildId=2335710&view=results Resolves: - https://github.com/dotnet/source-build/issues/3802 - https://github.com/dotnet/source-build/issues/3804 --- src/SourceBuild/content/prep.sh | 1 + .../content/repo-projects/Directory.Build.props | 3 --- .../assets/SdkFileDiffExclusions.txt | 1 - .../assets/baselines/MsftToSbSdkFiles.diff | 8 -------- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 472c348ae..a842566b2 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -156,6 +156,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) fi diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index cdd195114..29747eaa0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -111,9 +111,6 @@ - - - diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 434883537..4c2d7775b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ From b8afc58d3344fb54cbd673150f2f1e0a65887ad4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 18:20:09 +0000 Subject: [PATCH 047/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24053.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c66ea58ee..f3ca7d908 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 diff --git a/eng/Versions.props b/eng/Versions.props index 11750c01a..eb4ddd237 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23611.6 - 6.0.418-servicing.23611.6 + 6.0.419-servicing.24053.9 + 6.0.419-servicing.24053.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48bba8fffc8e4d4fbdbe99094458fc16fdb41dc0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 06:42:22 +0000 Subject: [PATCH 048/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.36 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24059.36 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d802adb8c..a286d7217 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -52,9 +49,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3ca7d908..1793e147b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a diff --git a/eng/Versions.props b/eng/Versions.props index eb4ddd237..569c70432 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24053.9 - 6.0.419-servicing.24053.9 + 6.0.419-servicing.24059.36 + 6.0.419-servicing.24059.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From abee5165c426305371352152fe74c4b976a8af4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:29 +0000 Subject: [PATCH 049/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.102 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 632fa4e58..3a72278bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc8833e7..8e6889225 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2b0d28ac5..b9ccc95b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.101 - 8.0.101-servicing.23617.7 - 8.0.101-servicing.23617.7 + 8.0.102 + 8.0.102-servicing.24052.15 + 8.0.102-servicing.24052.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 207f9ee61dbe6da4a76107614e10cd35a068b926 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:48 +0000 Subject: [PATCH 050/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 3a72278bc..896e19cb2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e6889225..6febbcc43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b9ccc95b9..055e0e230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.15 - 8.0.102-servicing.24052.15 + 8.0.102-servicing.24052.22 + 8.0.102-servicing.24052.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0308b1908d7bc994582b332b56c95d8cb9db06b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:04 +0000 Subject: [PATCH 051/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 896e19cb2..8c63555ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6febbcc43..92a83d983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 055e0e230..f9975fc62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.22 - 8.0.102-servicing.24052.22 + 8.0.102-servicing.24052.29 + 8.0.102-servicing.24052.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68e5684c924d8b57df247a9e0c4dd107cccedf3d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:20 +0000 Subject: [PATCH 052/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8c63555ef..8f402fdfd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92a83d983..35bef5a4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f9975fc62..0f0ce3df1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.29 - 8.0.102-servicing.24052.29 + 8.0.102-servicing.24053.2 + 8.0.102-servicing.24053.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2217b1761fa0c3bed4163fe5697984d24d94c62f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:35 +0000 Subject: [PATCH 053/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8f402fdfd..b3c64dfd6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35bef5a4e..35b52785c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0f0ce3df1..ec7b8ceef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.2 - 8.0.102-servicing.24053.2 + 8.0.102-servicing.24053.4 + 8.0.102-servicing.24053.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0dc125d9aa718b047c2ed692bb17181c78d1e0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:52 +0000 Subject: [PATCH 054/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 b3c64dfd6..0d1719189 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b52785c..b0da3878a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ec7b8ceef..fa74adaf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.4 - 8.0.102-servicing.24053.4 + 8.0.102-servicing.24053.10 + 8.0.102-servicing.24053.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d17f5ffab93d9bd9d7643dcf29cd31f26f5ca675 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:08 +0000 Subject: [PATCH 055/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 0d1719189..47062c382 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0da3878a..666a8d255 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fa74adaf7..dc47fa00a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.10 - 8.0.102-servicing.24053.10 + 8.0.102-servicing.24053.21 + 8.0.102-servicing.24053.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9d63771bfd03effbfdaec74ccbb66dcc4d3ca23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:24 +0000 Subject: [PATCH 056/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 47062c382..f942037e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 666a8d255..92eb91372 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dc47fa00a..34aae4fad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.21 - 8.0.102-servicing.24053.21 + 8.0.102-servicing.24054.3 + 8.0.102-servicing.24054.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 66d539aea19b31d9701b56bb2143a2f2b2f71f50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:41 +0000 Subject: [PATCH 057/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 f942037e7..01f4cd7e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92eb91372..057080d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 34aae4fad..456223eaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.3 - 8.0.102-servicing.24054.3 + 8.0.102-servicing.24054.10 + 8.0.102-servicing.24054.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2794f20befbc1c6c11946879ef671c3b95ba19f2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:57 +0000 Subject: [PATCH 058/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 01f4cd7e0..62531dc86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 057080d1f..7bc7ce916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 456223eaa..54e4c6a87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.10 - 8.0.102-servicing.24054.10 + 8.0.102-servicing.24054.14 + 8.0.102-servicing.24054.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afadbc3cccd259250e274a3c9cbeba53178b291b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:13 +0000 Subject: [PATCH 059/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240105.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 62531dc86..802c388d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bc7ce916..29c2dfe69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 54e4c6a87..63e2ca72b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.14 - 8.0.102-servicing.24054.14 + 8.0.102-servicing.24055.6 + 8.0.102-servicing.24055.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dca8a067c277ad192cb0f865804325a635d313b2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:29 +0000 Subject: [PATCH 060/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240107.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 802c388d8..904425e2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29c2dfe69..735bc8f0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 63e2ca72b..a89653f66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24055.6 - 8.0.102-servicing.24055.6 + 8.0.102-servicing.24057.7 + 8.0.102-servicing.24057.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e669e9d544b14a18947e78808028b8af27e2371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:49 +0000 Subject: [PATCH 061/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240108.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 904425e2a..92d689d85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 735bc8f0f..86a7e44ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a89653f66..710f0280b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24057.7 - 8.0.102-servicing.24057.7 + 8.0.102-servicing.24058.12 + 8.0.102-servicing.24058.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9180eebc61b39192993a2c37fcae43606d988214 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:05 +0000 Subject: [PATCH 062/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 92d689d85..df3abfa11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a7e44ce..1924407ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 710f0280b..537753d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24058.12 - 8.0.102-servicing.24058.12 + 8.0.102-servicing.24059.33 + 8.0.102-servicing.24059.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 025137ea96d63f5f295d5f6c8c790768c108b2ad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:23 +0000 Subject: [PATCH 063/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 df3abfa11..71ffa55ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1924407ba..09320f8ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 537753d6b..06d7c46f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24059.33 - 8.0.102-servicing.24059.33 + 8.0.102-servicing.24060.4 + 8.0.102-servicing.24060.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e12ee35f0fe49a9225133050d35fb09cc3861434 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:39 +0000 Subject: [PATCH 064/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 71ffa55ee..1f77a21a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09320f8ea..094a8e63c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 06d7c46f2..032e9da59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.4 - 8.0.102-servicing.24060.4 + 8.0.102-servicing.24060.23 + 8.0.102-servicing.24060.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ae5d7e51c3731bac7c8c3ee87f04295920501fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:55 +0000 Subject: [PATCH 065/130] Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.8.0-7.23572.1 -> To Version 4.8.0-7.23614.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f77a21a5..5967b3500 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 094a8e63c..697d93b41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb + 82a29fc43b3e0a9c53d6cc2be950e43765682170 - + https://github.com/dotnet/msbuild - 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 + b5265ef370a651f8c3458110b804e5cbf869eeb5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 032e9da59..9541be7ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -94,7 +94,7 @@ - 4.8.0-7.23572.1 + 4.8.0-7.23614.11 From d637fd7421b586d12d3745f93c9bb021db62260b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 03:17:33 +0000 Subject: [PATCH 066/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.59 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 5967b3500..8da61d39a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 697d93b41..b720704d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9541be7ca..07400ad0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.23 - 8.0.102-servicing.24060.23 + 8.0.102-servicing.24060.59 + 8.0.102-servicing.24060.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe0bfacae41a94ac0e02368501c42e284a2f81b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 06:58:07 +0000 Subject: [PATCH 067/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.68 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8da61d39a..184554a39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b720704d7..6eae310ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 07400ad0f..d6c37a5c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.59 - 8.0.102-servicing.24060.59 + 8.0.102-servicing.24060.68 + 8.0.102-servicing.24060.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5dda827c7ba124521c21fc54d8182d32d5d085c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 09:53:08 +0000 Subject: [PATCH 068/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 184554a39..6bc1254c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eae310ee..d666b87e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d6c37a5c2..e12d1ad2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.68 - 8.0.102-servicing.24060.68 + 8.0.102-servicing.24061.5 + 8.0.102-servicing.24061.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 091ea132a1641b97185da8bea3b3dab9c59f0543 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:13:26 +0000 Subject: [PATCH 069/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.1 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6bc1254c1..2dccf8439 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,12 +26,10 @@ - + - - - + @@ -61,12 +59,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d666b87e7..be9295fac 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 - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 0ede9037ff59dc76c37ec87659a641cfbccd6e30 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e12d1ad2a..9a1ba33a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24060.10 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24061.5 - 8.0.102-servicing.24061.5 + 8.0.102-servicing.24061.11 + 8.0.102-servicing.24061.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -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.24060.14 + 8.0.2-servicing.24060.14 + 8.0.2 + 8.0.2 From 6405b4c3bded73455ca03f6f103b274411f19895 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:20:27 +0000 Subject: [PATCH 070/130] Merged PR 36616: [internal/release/6.0.4xx] 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.WindowsDesktop.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23605.6 to 6.0.419-rtm.24067.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.26-servicing.23605.3 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.C... --- NuGet.config | 29 ++++--------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 3 files changed, 77 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index a286d7217..0e13fbfe7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ + - - - - - - + - - - + - - - + @@ -49,21 +41,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a9fb7cf5..2d13d9cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8c424ff5..3a742389e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24067.2 - 6.0.418 + 6.0.419 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.419-servicing.24059.36 - 6.0.419-servicing.24059.36 + 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.418 + 6.0.419 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 5dbe778528a3149d10e7b9e192eb8931a348682c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 20:35:23 +0000 Subject: [PATCH 071/130] Merged PR 36623: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.2-servicing.24060.10 to 8.0.2-servicing.24060.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - ... --- NuGet.config | 29 ++++-------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 42 ++++++++--------- 3 files changed, 81 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2dccf8439..6c3231a2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ - - - - + - - - + - - - + - + - + @@ -50,19 +43,15 @@ - - - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9295fac..e27dd2082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + 35307d0f7a7381a850bde13723241862ba824b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0ede9037ff59dc76c37ec87659a641cfbccd6e30 + 4c5c25180f2937b7c0691483dc892169fc13ddb3 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d diff --git a/eng/Versions.props b/eng/Versions.props index d21121587..9acc7c575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24060.4 - 8.0.2-servicing.24060.10 + 8.0.2-servicing.24060.15 @@ -72,13 +72,13 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24061.11 - 8.0.102-servicing.24061.11 + 8.0.102-servicing.24068.26 + 8.0.102-servicing.24068.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,22 +98,22 @@ - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.2-servicing.24060.14 - 8.0.2-servicing.24060.14 + 8.0.2-servicing.24061.2 + 8.0.2-servicing.24061.2 8.0.2 8.0.2 @@ -258,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From bb8ba04c3ad31b4c205f5702db4928777300d032 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 22:29:27 +0000 Subject: [PATCH 072/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.23614.11 -> To Version 4.8.0-7.24067.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c3231a2b..7884b5c75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e27dd2082..7d50b3269 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 82a29fc43b3e0a9c53d6cc2be950e43765682170 + 263571123fc3dc4a638e071234ac9fbf91913962 diff --git a/eng/Versions.props b/eng/Versions.props index d4d1d7828..19cf9c9a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,15 +86,15 @@ 8.0.102 - 8.0.102-servicing.24068.26 - 8.0.102-servicing.24068.26 + 8.0.102-servicing.24068.34 + 8.0.102-servicing.24068.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23614.11 + 4.8.0-7.24067.24 From aafd26d9342b610ed99f87862ab48c9b262c05de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:59:05 +0000 Subject: [PATCH 073/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.2 -> To Version 8.0.2 (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 7884b5c75..f937ff002 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d50b3269..a74e8b6b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35307d0f7a7381a850bde13723241862ba824b3f + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4c5c25180f2937b7c0691483dc892169fc13ddb3 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19cf9c9a3..794efa738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24060.4 + 8.0.2-servicing.24068.3 - 8.0.2-servicing.24060.15 + 8.0.2-servicing.24068.6 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.34 - 8.0.102-servicing.24068.34 + 8.0.102-servicing.24068.55 + 8.0.102-servicing.24068.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.2-servicing.24061.2 - 8.0.2-servicing.24061.2 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 8.0.2 8.0.2 From 458ed4e5643b479852d2dce322c2239026e9115a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 03:14:21 +0000 Subject: [PATCH 074/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.64 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.0-rc.122 -> To Version 6.8.1-rc.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index f937ff002..17887a0f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a74e8b6b3..ff453392b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild b5265ef370a651f8c3458110b804e5cbf869eeb5 - - https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 550277e0616e549446f03fda35d3e23dff75dc01 diff --git a/eng/Versions.props b/eng/Versions.props index 794efa738..97a2925ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.55 - 8.0.102-servicing.24068.55 + 8.0.102-servicing.24068.64 + 8.0.102-servicing.24068.64 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.8.1-rc.2 From 7cd79ed9517dcf2970054f6d7a9a78e3dedfc482 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 06:09:06 +0000 Subject: [PATCH 075/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24068.22 -> To Version 6.0.419-servicing.24068.70 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.3-rc.3 -> To Version 6.3.4-rc.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d13d9cb0..1cddf0418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 @@ -151,7 +151,7 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 5e444458a8c4a2dac9806fc1d387b7f157669540 diff --git a/eng/Versions.props b/eng/Versions.props index 3a742389e..f224d3144 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24068.22 - 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.70 + 6.0.419-servicing.24068.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b2020f7fd5b0eb9431c321592c285842a0a47c84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 11:05:56 +0000 Subject: [PATCH 076/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.0-rc.122 -> To Version 6.8.1-rc.2 (parent: Microsoft.NET.Sdk --- 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 17887a0f1..3b8efbf2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff453392b..3fc235046 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 97a2925ec..46278deb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.64 - 8.0.102-servicing.24068.64 + 8.0.102-servicing.24069.3 + 8.0.102-servicing.24069.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a064661260b27f7bf026125bbca453845ee72696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 20:21:50 +0000 Subject: [PATCH 077/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 3b8efbf2b..4518ca310 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fc235046..41b5fcf1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 46278deb9..1eaea4d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24069.3 - 8.0.102-servicing.24069.3 + 8.0.102-servicing.24069.16 + 8.0.102-servicing.24069.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8670626962c90bb2528f994c43382bc498d089fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:47:11 -0800 Subject: [PATCH 078/130] [release/8.0.1xx] Update dependencies from dotnet/arcade (#18197) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41b5fcf1a..a0154ce45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services From 2dae3fec70c788deec3f9ac96d42e335dda8522e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Jan 2024 17:44:38 +0000 Subject: [PATCH 079/130] Merged PR 36689: [internal/release/6.0.4xx] 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.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.419-rtm.24067.1 to 6.0.419-rtm.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e13fbfe7..da7974fae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,16 +42,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cddf0418..cf9f76f91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c92bca031b633bb527ac58a44e8f0127ab8984ac + 98b10b3aea4e37eed5ad4875cd251cc94c854c1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c259e4173d70ad05737b7d838235c015fa25258b + 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + a9f209f82fadb1f694ae6932f92c32918e407ded https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f224d3144..671ee90b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24067.5 + 6.0.27-servicing.24070.1 - 6.0.27-servicing.24067.2 + 6.0.27-servicing.24070.3 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 0.2.0 - 6.0.419-servicing.24068.70 - 6.0.419-servicing.24068.70 + 6.0.419-servicing.24070.9 + 6.0.419-servicing.24070.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.27-servicing.24066.28 - 6.0.27-servicing.24066.28 + 6.0.27-servicing.24069.12 + 6.0.27-servicing.24069.12 6.0.27 6.0.27 6.0.27 @@ -78,8 +78,8 @@ - 6.0.27-servicing.24067.4 - 6.0.27-servicing.24067.4 + 6.0.27-servicing.24070.4 + 6.0.27-servicing.24070.4 6.0.27 6.0.27 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.26 + 6.0.27 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 692942e649a8d69988eccbe7d676689978080a32 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Feb 2024 23:12:57 +0000 Subject: [PATCH 080/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 --- NuGet.config | 31 +++++++++++++++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4518ca310..5b8f6ab85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,36 @@ + + + + + + + + + + + - + + + + + @@ -43,14 +58,26 @@ + + + + + + + + - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0154ce45..035b3e597 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index deb537428..627b5657a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.102 - 8.0.102-servicing.24069.16 - 8.0.102-servicing.24069.16 + 8.0.103 + 8.0.103-servicing.24106.14 + 8.0.103-servicing.24106.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c14fb9bdb10ccabbdc6a2c4a9a46f6e33437b5c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 03:26:17 +0000 Subject: [PATCH 081/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5b8f6ab85..a011200c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035b3e597..c0457f063 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 424e4b7cffb7656efd63f7a905a2498e39011104 + fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 - + https://github.com/dotnet/fsharp - 424e4b7cffb7656efd63f7a905a2498e39011104 + fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 diff --git a/eng/Versions.props b/eng/Versions.props index 627b5657a..575b14a0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.14 - 8.0.103-servicing.24106.14 + 8.0.103-servicing.24106.32 + 8.0.103-servicing.24106.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 095c321b70be1977b97b7ef5d0538c133012b2b4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 07:51:49 +0000 Subject: [PATCH 082/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- 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 a011200c1..a5fe9fc09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0457f063..a6243703f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 575b14a0d..010b5af48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.32 - 8.0.103-servicing.24106.32 + 8.0.103-servicing.24106.57 + 8.0.103-servicing.24106.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49e0811f5be1f6bd93da6ca45f6e56f75fba9edb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 22:46:41 +0000 Subject: [PATCH 083/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240207.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- 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 a5fe9fc09..eb1471169 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6243703f..bf36db41e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 010b5af48..2df569f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.57 - 8.0.103-servicing.24106.57 + 8.0.103-servicing.24107.11 + 8.0.103-servicing.24107.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6d4e6bbaa7977ddf3c407906624b933cf2972a2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Feb 2024 03:55:55 +0000 Subject: [PATCH 084/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240207.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- 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 eb1471169..b4d126c8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf36db41e..22750f2d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2df569f5a..0825d251b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24107.11 - 8.0.103-servicing.24107.11 + 8.0.103-servicing.24107.16 + 8.0.103-servicing.24107.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b30ddf54fe2452915f30c18db00c8cf22cd1b6ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:14 -0800 Subject: [PATCH 085/130] [release/6.0.4xx] Update to latest WiX version (#18607) Co-authored-by: Jacques Eloff --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c93bf532..14bcc4e95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index d306f311e..47aac67a4 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 055887842a12dd2a6303af0acf615ef173473ca9 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 Feb 2024 09:43:24 -0800 Subject: [PATCH 086/130] Update to latest WiX version (#18606) --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98b098d16..6acb430d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 483730f3a..3300b2e28 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From d3036c5d9900ad034d17531a5fa61a4678894c5b Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 14 Feb 2024 02:11:47 +0100 Subject: [PATCH 087/130] .NET Source-Build 6.0.127 February 2024 Updates (#18652) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6acb430d0..42863af1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.126 + 6.0.127 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d503a61b9..a478949a8 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126" + "dotnet": "6.0.127" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 0ae32cff84ca9a3d051014a92c3f0e01e1cd7e2b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Feb 2024 03:22:07 +0000 Subject: [PATCH 088/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240213.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- 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 b4d126c8e..fa0c56570 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22750f2d4..f394097e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0825d251b..8d1933423 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24107.16 - 8.0.103-servicing.24107.16 + 8.0.103-servicing.24113.36 + 8.0.103-servicing.24113.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f9af86fa7fa5f579ba812650e94a82a55005286 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:14:47 +0000 Subject: [PATCH 089/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 31 ++++------------------- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 42 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa0c56570..01dea53a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,18 @@ - - - - + - - - - - - - - - - + - + @@ -58,20 +46,11 @@ - - - - - - - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f394097e7..2ba7cad47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 9a29abdd764a4de0f253ed368871877a47725247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 9a29abdd764a4de0f253ed368871877a47725247 diff --git a/eng/Versions.props b/eng/Versions.props index 8d1933423..1d4b434a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24113.36 - 8.0.103-servicing.24113.36 + 8.0.103-servicing.24115.25 + 8.0.103-servicing.24115.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.2-servicing.24067.11 + 8.0.3-servicing.24114.5 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.5 + 8.0.3 + 8.0.3 + 8.0.3 + 8.0.3 2.1.0 @@ -249,7 +249,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 683f2541f58634bd5912c0055ba1da0c663483dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 21:23:12 +0000 Subject: [PATCH 090/130] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 --- NuGet.config | 16 +++++++++++++-- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 10 +++++----- eng/common/templates/jobs/jobs.yml | 10 +++++----- .../templates/post-build/post-build.yml | 20 +++++++++---------- global.json | 4 ++-- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index da7974fae..b2706717a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf9f76f91..0a205dc59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d5db6dd5d..4bf47577d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24059.3 + 6.0.0-beta.24113.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4..5a3a32ea8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010..bd3d54b76 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc8..f70826518 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156b..5a0bb8d96 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 8bf2c6315..73265b36f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" } } From 7c652174c7610385e724c4adac1c4f7e12d55958 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:30:08 +0000 Subject: [PATCH 091/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.72 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (parent: Microsoft.NET.Sdk --- 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 01dea53a2..b52fae2e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ba7cad47..7c2cc140f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1d4b434a3..5c764c7fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.25 - 8.0.103-servicing.24115.25 + 8.0.103-servicing.24115.72 + 8.0.103-servicing.24115.72 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cc16e7d17b219fe19d7b0378174a318a4718ad3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 07:08:24 +0000 Subject: [PATCH 092/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.76 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (parent: Microsoft.NET.Sdk --- 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 b52fae2e9..0aa1cb2b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2cc140f..62d4590be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c764c7fc..9e68ea0c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.72 - 8.0.103-servicing.24115.72 + 8.0.103-servicing.24115.76 + 8.0.103-servicing.24115.76 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 628156cfe0588dcb1139c7cba389e7743a730714 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:44:05 +0000 Subject: [PATCH 093/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.3-servicing.24114.5 -> To Version 8.0.3-servicing.24114.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0aa1cb2b8..ca7355f29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -48,9 +48,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65f20f424..8c390a60c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 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 @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 16bf494ab..894f81a3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.76 - 8.0.103-servicing.24115.76 + 8.0.103-servicing.24116.17 + 8.0.103-servicing.24116.17 $(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 From c06ccfbf00526dc51793ac9801377698ee895723 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 21:33:09 +0000 Subject: [PATCH 094/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.3-servicing.24114.5 -> To Version 8.0.3-servicing.24114.23 (parent: Microsoft.NET.Sdk --- 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 ca7355f29..3ddd0c6b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c390a60c..af7e419f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 894f81a3e..fddc0cccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.17 - 8.0.103-servicing.24116.17 + 8.0.103-servicing.24116.29 + 8.0.103-servicing.24116.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1cb3cc5096490ba730e6509695d2d93e6b03912e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:30:50 +0000 Subject: [PATCH 095/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.2 -> To Version 8.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++-------- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ddd0c6b2..0853e356b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -18,14 +19,10 @@ - + - - - - - + @@ -46,18 +43,15 @@ + - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af7e419f7..ca56c5479 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 + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + 65e7d26b59594d892d8c1084440eecab4bfbbf6f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fddc0cccc..f48ad3ab2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 8.0.2-servicing.24068.6 + 8.0.3-servicing.24114.6 @@ -72,13 +72,13 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.3 + 8.0.3 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 0.2.0 @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.29 - 8.0.103-servicing.24116.29 + 8.0.103-servicing.24116.51 + 8.0.103-servicing.24116.51 $(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.3 + 8.0.3-servicing.24116.3 + 8.0.3 + 8.0.3 From d53fe45915b4379f175c06ed75ecb41134dd7322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:08:37 +0000 Subject: [PATCH 096/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.65 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.2 -> To Version 8.0.3 (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 0853e356b..ee7299b3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca56c5479..b7bed5280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + bd280bbb5c9699bb93097206f076ad2f330ea8e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 65e7d26b59594d892d8c1084440eecab4bfbbf6f + 46fb08cfa8160d0885b74c7f28a7b187ab86efed https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f48ad3ab2..b64620122 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.3-servicing.24114.6 + 8.0.3-servicing.24116.6 @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.51 - 8.0.103-servicing.24116.51 + 8.0.103-servicing.24116.65 + 8.0.103-servicing.24116.65 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.3-servicing.24116.3 - 8.0.3-servicing.24116.3 + 8.0.3-servicing.24116.9 + 8.0.3-servicing.24116.9 8.0.3 8.0.3 From c8409929ea78f48391c491719c7cf2c7d3b38c8b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:45:00 +0000 Subject: [PATCH 097/130] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.86 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.2 -> 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 ee7299b3b..cef841a23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7bed5280..000a25171 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b64620122..db2a50d14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.3 8.0.3 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 + 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.103 - 8.0.103-servicing.24116.65 - 8.0.103-servicing.24116.65 + 8.0.103-servicing.24116.86 + 8.0.103-servicing.24116.86 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c11f5ca0982ad4f759b35092dd2a15c2bf8d216 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:46:01 -0600 Subject: [PATCH 098/130] [release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18736) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3fddfa878..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,27 +9,15 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 351bf8ed3..4d6a6df81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From 750746885ecf84ab8d11bf625a5883d7289df39b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:21 -0600 Subject: [PATCH 099/130] [release/7.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18735) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3a1c275a..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 468f1e9d6..7cbb5ab6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From f33042e2676e1a4c0e469694351ce84592991e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:40 -0600 Subject: [PATCH 100/130] [release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#18734) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c1640f8..f3987a3c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From c5f74545cae64c7f55de19867f98bfd45e84daff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:58 -0600 Subject: [PATCH 101/130] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18733) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2706717a..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a205dc59..bc6caff49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/source-build-reference-packages - 6425c284100043ea5829deb255811d3487a91fb6 + 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 From 387338af6975edafc4998f914337c753058b0301 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:19:42 -0800 Subject: [PATCH 102/130] Update 7.0 SDK diff baseline (#18781) --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4d662a3c3..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,23 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll -+./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll -+./sdk/x.y.z/System.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From c1f7a59167588078960fa21e91ad5f148f327949 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 02:44:30 +0000 Subject: [PATCH 103/130] Update dependencies from https://github.com/dotnet/arcade build 20240229.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cbb5ab6d..73631342d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8c90692dd..97bf7052c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24129.3 diff --git a/global.json b/global.json index 5d42d1e74..562fedb86 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" } } From 4283e1fa5eff58f56b8899bc334ece0fcb372fd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 02:44:31 +0000 Subject: [PATCH 104/130] Update dependencies from https://github.com/dotnet/arcade build 20240229.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3987a3c4..447a02b4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..4adb975b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24129.3 diff --git a/global.json b/global.json index 5d42d1e74..562fedb86 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" } } From f08697a21d4fdf886f3104009e942d6894d7fb4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 17:14:02 +0000 Subject: [PATCH 105/130] Update dependencies from https://github.com/dotnet/arcade build 20240229.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 447a02b4e..afe963cbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4adb975b7..82d00e4a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.3 + 7.0.0-beta.24129.5 diff --git a/global.json b/global.json index 562fedb86..13804ed82 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" } } From 63953ff6b74b888c1e6000ce92be95f293edde0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 17:14:02 +0000 Subject: [PATCH 106/130] Update dependencies from https://github.com/dotnet/arcade build 20240229.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73631342d..7de69c4c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 97bf7052c..fc708eb9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.3 + 7.0.0-beta.24129.5 diff --git a/global.json b/global.json index 562fedb86..13804ed82 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" } } From 599edfd2e90520bf3890aee80fc2d0b4f0be3322 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:15 -0800 Subject: [PATCH 107/130] Update branding to 7.0.118 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1ed9ad1c..93814ecf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From f6ef7ba8a7501f4f55e601d60bb50c6888ee3433 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:19 -0800 Subject: [PATCH 108/130] Update branding to 7.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..244192310 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 53ba675d23b54d6c468b7667346849a033165c40 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:23 -0800 Subject: [PATCH 109/130] Update branding to 7.0.408 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c90692dd..fe64f9e5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From eb3b53bb68533e8f6313ff28664b265818981d31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:39:07 +0000 Subject: [PATCH 110/130] Update dependencies from https://github.com/dotnet/arcade build 20240305.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afe963cbf..e0f598088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9fdfae5e8..373df2b74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.5 + 7.0.0-beta.24155.3 diff --git a/global.json b/global.json index 13804ed82..3d1e691f2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" } } From 94ab7b0ee582848f7388d78f7898bc9afa1b77a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:39:07 +0000 Subject: [PATCH 111/130] Update dependencies from https://github.com/dotnet/arcade build 20240305.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7de69c4c4..02733e5f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3fd98b2dd..c42880865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.5 + 7.0.0-beta.24155.3 diff --git a/global.json b/global.json index 13804ed82..3d1e691f2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" } } From e0cdfd56dec447be2014db6835841e95f0f43fd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:12 +0000 Subject: [PATCH 112/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24065.1 -> To Version 8.0.0-alpha.1.24158.3 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.1-rc.2 -> To Version 6.8.1-rc.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 --------- eng/Version.Details.xml | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4518ca310..959b7d1df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - @@ -43,15 +38,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9da0e138d..728b2c591 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -160,7 +160,7 @@ b5265ef370a651f8c3458110b804e5cbf869eeb5 - https://github.com/nuget/nuget.client + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 550277e0616e549446f03fda35d3e23dff75dc01 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 83274d94c7e2ff21081b0d75ecbec2da2241f831 + 7a9b99e457a2b9792a3c17ccaf95d80038725108 From 4d50dca68fce99097266478c0c1c24b7cf489020 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:49 +0000 Subject: [PATCH 113/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 e0f598088..aea7d5d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From d48ec7c91d9e3740df6e796a60187fbb88e65c4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:52 +0000 Subject: [PATCH 114/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 02733e5f6..877d7b0e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From 36e3ca070808aab9a594798d1f26b41bdff07fe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:35:15 +0000 Subject: [PATCH 115/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 4d6a6df81..35f34f12c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From 0c257f30af09adac828ea189a1594341309469d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:32:58 +0000 Subject: [PATCH 116/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 From 44583e7face27afbec31cf74ea6aed3c075fc40e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 01:36:33 +0000 Subject: [PATCH 117/130] Update dependencies from https://github.com/dotnet/arcade build 20240310.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0f598088..b5487d42c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 373df2b74..3cd2b7e73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24155.3 + 7.0.0-beta.24160.1 diff --git a/global.json b/global.json index 3d1e691f2..58e631be4 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" } } From c17ef2ce9b17801dc14b49d4acca5317737d38eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 01:36:34 +0000 Subject: [PATCH 118/130] Update dependencies from https://github.com/dotnet/arcade build 20240310.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02733e5f6..1eb34c8ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c42880865..1c2cf4220 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24155.3 + 7.0.0-beta.24160.1 diff --git a/global.json b/global.json index 3d1e691f2..58e631be4 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" } } From 0d96200a8edac42323f6c461f9ae21973a38456e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:18:09 -0700 Subject: [PATCH 119/130] [release/7.0.1xx] Add -pr version of pipeline --- .vsts-pr.yml | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..b28494424 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,393 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 279ee7d5041ecc467272815ff8dbeae50930d1b8 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:19:06 -0700 Subject: [PATCH 120/130] [release/7.0.3xx] Add -pr version of pipeline --- .vsts-pr.yml | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..5e2cdc745 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,394 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 65623709969280ad5928b1c8df8a292b663dadcc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:20:32 -0700 Subject: [PATCH 121/130] [release/7.0.4xx] Add -pr version of pipeline --- .vsts-pr.yml | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..5e2cdc745 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,394 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From a86a2615ead1eaa7c2fa0f0051145b22072f7fad Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:21:35 -0700 Subject: [PATCH 122/130] [release/8.0.1xx] Add -pr version of pipeline --- .vsts-pr.yml | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..d14d1293e --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,361 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +- template: /eng/common/templates/variables/pool-providers.yml + +stages: +- stage: Build + jobs: + # This job is for build retry configuration. + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\buildConfiguration + artifact: buildConfiguration + displayName: Publish Build Config + + ## PR-only jobs + + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Fedora_36_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Debian_Stretch_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true + + ## Official/PGO instrumentation Builds + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Windows PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + - template: /eng/common/templates/jobs/source-build.yml + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 From e4bf76d2c73f1c998384817201712f8285eeb834 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 14:39:00 +0000 Subject: [PATCH 123/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240311.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24158.3 -> To Version 8.0.0-alpha.1.24161.1 --- 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 728b2c591..8b2225244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7a9b99e457a2b9792a3c17ccaf95d80038725108 + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From 1267eea058f9b9ef2d2913aa2abfe83731630557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 15:56:12 +0000 Subject: [PATCH 124/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.2 --- 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 4d4f1da15..d5ae4cda8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 82fb0dc47419f386a12500fc973a471b87c3ab29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 15:56:15 +0000 Subject: [PATCH 125/130] Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.2 --- 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 5bd747d0b..b133817c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 016e1e4c01ace7253095f672fd718e5d3cf8cea1 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:46:04 +0100 Subject: [PATCH 126/130] .NET Source-Build 7.0.117 March 2024 Updates (#19005) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93814ecf5..d6abe5a3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,8 +216,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.116 - 7.0.116 + 7.0.117 + 7.0.117 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 68bdc9ac8..7025b6303 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116" + "dotnet": "7.0.117" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 7766c8b36fb170c95449a625f063ccecd34b6142 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:29:47 +0000 Subject: [PATCH 127/130] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24162.3 --- 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 8b2225244..a5640bb4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + c08ec59adcf8b56cd1b4de2090c320496566b5c6 From 18450eadd5333021a0b164a089f8fafe5a925fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:29:33 +0000 Subject: [PATCH 128/130] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24162.3 -> To Version 8.0.0-alpha.1.24163.3 --- 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 a5640bb4f..e3447532f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c08ec59adcf8b56cd1b4de2090c320496566b5c6 + 79827eed138fd2575a8b24820b4f385ee4ffb6e6 From 74dff0ad2104bf50694dd7d28507845d9b53e905 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Mar 2024 07:37:20 -0500 Subject: [PATCH 129/130] Update Version.Details.xml --- 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 000a25171..bd2479dce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - - https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e + + https://github.com/dotnet/source-build-externals + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From f1480346bb2481e939f5cbaa3f185dff2ace4ad8 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:45:47 +0100 Subject: [PATCH 130/130] .NET Source-Build 8.0.103 March 2024 Updates (#19007) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 54b507d2d..dbd256551 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.102-servicing.24073.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.102-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.103-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index bda4e743d..54e2f96b7 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.102" + "dotnet": "8.0.103" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",