From 8ed51e2c1922eae6c54254d7197525bb812bd3c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Feb 2024 23:17:03 +0000 Subject: [PATCH 01/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..759fbe1dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 335b739c9..f9f1381c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 diff --git a/eng/Versions.props b/eng/Versions.props index fbfc34844..8a2f1854b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.313 - 7.0.313-servicing.24069.10 - 7.0.313-servicing.24069.10 + 7.0.314 + 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7f55356b3ba70107e079405017d4313a6f5460a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 06:52:51 +0000 Subject: [PATCH 02/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.50 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- 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 759fbe1dd..5dcb94172 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9f1381c6..8b2e6c813 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb diff --git a/eng/Versions.props b/eng/Versions.props index 8a2f1854b..734b8376e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.15 - 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.50 + 7.0.314-servicing.24106.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 25f8bbf23092ef115872f11099598860d31064c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:28:47 +0000 Subject: [PATCH 03/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 61 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dcb94172..65a0c72c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,22 +10,16 @@ - - - + - - - + - - - + - + @@ -52,16 +46,12 @@ - - - + - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2e6c813..9886560b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 734b8376e..4e6dca7e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.16 - 7.0.16 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.50 - 7.0.314-servicing.24106.50 + 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.21 + 7.0.17-servicing.24114.21 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 498860c3467dd98db937e2f141ab2608a3fc0201 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 04:31:50 +0000 Subject: [PATCH 04/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 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 65a0c72c2..2b3efcde7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9886560b2..a7e4ff451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 diff --git a/eng/Versions.props b/eng/Versions.props index 4e6dca7e8..a4de145f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.27 - 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3772ddc3aa828452a9503b01d95218f98aa61dbc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:38:43 +0000 Subject: [PATCH 05/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.73 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 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 2b3efcde7..13ed5dc24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7e4ff451..dec7d7a4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 diff --git a/eng/Versions.props b/eng/Versions.props index a4de145f0..774d72a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.62 - 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.73 + 7.0.314-servicing.24115.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b39998aead28fe77e4ddef17d194fe153eb3c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 20:12:22 +0000 Subject: [PATCH 06/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- 3 files changed, 62 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13ed5dc24..dbf1bdff6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,19 @@ - + - + - + - - - + @@ -46,17 +44,15 @@ - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d05fd7abf..bb07d940e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e55b66af3..2981ec960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.73 - 7.0.314-servicing.24115.73 + 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.17-servicing.24114.21 - 7.0.17-servicing.24114.21 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 7.0.17 7.0.17 7.0.17 @@ -96,10 +96,10 @@ - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 + 7.0.17 + 7.0.17 From 1a8e33984f500c5fd3c193d1ead5e6663ed2fd72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:40:49 +0000 Subject: [PATCH 07/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.52 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index dbf1bdff6..74b26ceb3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb07d940e..c9e046c4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 diff --git a/eng/Versions.props b/eng/Versions.props index 2981ec960..440507fea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.15 - 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8f7dba2626884fe02e61767c6401805a8f19ab8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:42:36 +0000 Subject: [PATCH 08/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.75 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74b26ceb3..5583964f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e046c4b..2301d1b57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 440507fea..579355226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.52 - 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.75 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From 3698cb9b014d3e5b53bec3bd2ffcfc29955f6d33 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:50:54 +0000 Subject: [PATCH 09/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.90 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5583964f5..b8a810353 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2301d1b57..fb72029e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c diff --git a/eng/Versions.props b/eng/Versions.props index 579355226..8e2578fbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.75 - 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.90 + 7.0.314-servicing.24116.90 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 977b3bce63a0a5537ea18982cf4432523c8491ab Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 10/17] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93814ecf5..c6dcff420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 6e0da5d6f222309d36bc3c32181e8b3e948e60c8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:37:40 -0700 Subject: [PATCH 11/17] Update to the 7.0.1xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c6dcff420..125075af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,12 +107,12 @@ - 6.0.6-rc.4 + 6.4.3-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.4.8 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..5fc33672a 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 1fbb0569de463849d7131206953e33fccdd46790 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 12/17] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3cd2b7e73..d82100764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From bd48163a324ebbd8cf1b2843e89cd63435a50522 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:49:25 -0700 Subject: [PATCH 13/17] Update to the 7.0.3xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d82100764..66d18ca2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,12 +111,12 @@ - 6.0.6-rc.4 + 6.6.2-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.6.10 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 83f3cc20f40d7c72e4e9c3c2cb01ba708c13ddd3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 16:13:30 -0700 Subject: [PATCH 14/17] source build needs the 7.0 version it looks like. Let's see if that works. --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5fc33672a..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 19ba28f7636c28f90dbfeb373c55b1eec744b3bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:22:34 +0000 Subject: [PATCH 15/17] Update dependencies from https://github.com/dotnet/source-build-externals build 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 35f34f12c..61545cf77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From a941a6af239f2df5e924812cce0f0e8fa964791f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 13 Mar 2024 14:49:39 -0500 Subject: [PATCH 16/17] Update 7.0 SDK diff baseline (#19038) --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 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 bd443698c..4d662a3c3 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,7 +14,23 @@ 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/ @@ -109,6 +125,35 @@ 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 @@ -124,21 +169,26 @@ 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/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/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/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 @@ -150,6 +200,10 @@ 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 @@ -205,11 +259,21 @@ 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 @@ -265,6 +329,13 @@ 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 @@ -289,6 +360,16 @@ 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/ @@ -306,18 +387,28 @@ 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 030c98d9e1af80c4fedc5d7969919993704bc34d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 05:58:34 +0000 Subject: [PATCH 17/17] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24160.1 -> To Version 7.0.0-beta.24163.12 --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/post-build/publish-using-darc.ps1 | 4 +-- .../templates/job/publish-build-assets.yml | 8 +++--- eng/common/templates/jobs/jobs.yml | 4 +-- .../templates/post-build/post-build.yml | 12 ++++----- global.json | 6 ++--- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5ae4cda8..0cd3a95c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8d7060124..176f1fb7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24160.1 + 7.0.0-beta.24163.12 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 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 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,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: @@ -127,7 +127,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 @@ -154,4 +154,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 67a2e2c74..289bb2396 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: [] @@ -47,7 +47,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') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 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 @@ -131,8 +131,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 @@ -227,9 +227,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 diff --git a/global.json b/global.json index 58e631be4..f6f1f44a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" } }