From 7d770bb0fd25be926d1e4d1c894b71598f66bc7e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 19:40:56 +0000 Subject: [PATCH 01/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.105 -> To Version 8.0.106 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.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.5-servicing.24216.15 -> To Version 8.0.6-servicing.24253.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 28 ++++++++++++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 63 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 20b03e413..15d35e0a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + - - + - + + + + + + + + + @@ -42,14 +49,21 @@ - - + - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecbc2a215..3269afc60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecfb8a05aeaa93057ae0003d406280239b2c4c7b + 0bec965b2b13f412d4a8ed5479097578e3197125 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecfb8a05aeaa93057ae0003d406280239b2c4c7b + 0bec965b2b13f412d4a8ed5479097578e3197125 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecfb8a05aeaa93057ae0003d406280239b2c4c7b + 0bec965b2b13f412d4a8ed5479097578e3197125 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecfb8a05aeaa93057ae0003d406280239b2c4c7b + 0bec965b2b13f412d4a8ed5479097578e3197125 https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://github.com/dotnet/roslyn - 263571123fc3dc4a638e071234ac9fbf91913962 + de75b3c77d41c21562fc2e9dbcc26b2268c80b26 @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 diff --git a/eng/Versions.props b/eng/Versions.props index 6d2941084..f04d6036a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,29 +78,29 @@ - 8.0.105 - 8.0.105-servicing.24224.15 - 8.0.105-servicing.24224.15 + 8.0.106 + 8.0.106-servicing.24266.9 + 8.0.106-servicing.24266.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24067.24 + 4.8.0-7.24225.6 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 - 8.0.5-servicing.24216.15 - 8.0.5-servicing.24216.15 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24253.6 + 8.0.6-servicing.24253.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 2.1.0 @@ -198,7 +198,7 @@ 14.0.8478 17.0.8478 - 8.0.5 + 8.0.6 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From a7aaa2c305d159f570990751b007d32db48e8948 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 20:38:14 +0000 Subject: [PATCH 02/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.106 -> To Version 8.0.106 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.5 -> To Version 8.0.6 (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 15d35e0a9..15ac5e0cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -18,7 +19,7 @@ - + @@ -49,11 +50,12 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3269afc60..880726ff0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + c8c2f1cdb6a793b462d5907d924f0df17cba48e4 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bec965b2b13f412d4a8ed5479097578e3197125 + 436b7497563193d5867184d1d0a9f117c3ac6df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bec965b2b13f412d4a8ed5479097578e3197125 + 436b7497563193d5867184d1d0a9f117c3ac6df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bec965b2b13f412d4a8ed5479097578e3197125 + 436b7497563193d5867184d1d0a9f117c3ac6df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bec965b2b13f412d4a8ed5479097578e3197125 + 436b7497563193d5867184d1d0a9f117c3ac6df1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f04d6036a..6b4c784d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.5 - 8.0.5 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 + 8.0.6 + 8.0.6 + 8.0.6-servicing.24264.7 + 8.0.6-servicing.24264.7 + 8.0.6-servicing.24264.7 + 8.0.6-servicing.24264.7 + 8.0.6-servicing.24264.7 0.2.0 @@ -79,8 +79,8 @@ 8.0.106 - 8.0.106-servicing.24266.9 - 8.0.106-servicing.24266.9 + 8.0.106-servicing.24266.16 + 8.0.106-servicing.24266.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f80f1e2034627755239dc03babec4161bd726378 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 22:18:27 +0000 Subject: [PATCH 03/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.106 -> To Version 8.0.106 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.6 -> To Version 8.0.6 (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 15ac5e0cb..a862de5d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -50,12 +50,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 880726ff0..d9968c47e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c8c2f1cdb6a793b462d5907d924f0df17cba48e4 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436b7497563193d5867184d1d0a9f117c3ac6df1 + d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436b7497563193d5867184d1d0a9f117c3ac6df1 + d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436b7497563193d5867184d1d0a9f117c3ac6df1 + d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436b7497563193d5867184d1d0a9f117c3ac6df1 + d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6b4c784d7..4da9285aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24264.7 - 8.0.6-servicing.24264.7 - 8.0.6-servicing.24264.7 - 8.0.6-servicing.24264.7 - 8.0.6-servicing.24264.7 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 0.2.0 @@ -79,8 +79,8 @@ 8.0.106 - 8.0.106-servicing.24266.16 - 8.0.106-servicing.24266.16 + 8.0.106-servicing.24266.26 + 8.0.106-servicing.24266.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e32c23689fd47364097ea324821dfd7d996dc7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 May 2024 18:29:46 +0000 Subject: [PATCH 04/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240517.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.106 -> To Version 8.0.106 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.6 -> To Version 8.0.6 (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 a862de5d6..8921c6dfc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9968c47e..fa192ce7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f + 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f + 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f + 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d214c3c43bbbe0d9184a2ed6d5bae59e0afbd13f + 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4da9285aa..3b327fabd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.106 - 8.0.106-servicing.24266.26 - 8.0.106-servicing.24266.26 + 8.0.106-servicing.24267.25 + 8.0.106-servicing.24267.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69ac1bf6d0f35937fd6e12609976775f61035a3a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 May 2024 23:16:43 +0000 Subject: [PATCH 05/47] Merged PR 39691: [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**: 20240517.45 - **Date Produced**: May 17, 2024 9:40:32 PM UTC - **Commit**: dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.106 to 8.0.107][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.NET.Sdk**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.5 to 8.0.6][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24266.4][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24266.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.5 to 8.0.6][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.5-servicing.24217.4 to 8.0.6-servicing.24266.2][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.5 to 8.0.6][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.5-servicing.24217.2 to 8.0.6-servicing.24266.5][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf&targetVersion=GCdc2cd02b8507bae3a94b784a8c852b9f1fa40bb0&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&targetVersion=GC745e5ba78bab21f191089ad0702d28b1f5c6550b&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6c37c986b6c8fc0669b38a03a03445a75b8227a6&targetVersion=GC4e8a67279888e260abf0cf5b027cc16ea7069799&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&targetVersion=GCc7a8451f8a664f44336c013032414c4a9ca4dc42&_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.WindowsDesktop.App.Ref**: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redi... --- NuGet.config | 24 ++++-------------------- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 33 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8921c6dfc..404c20284 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,18 +19,10 @@ - + - - - - - - - - - + @@ -55,18 +47,10 @@ - + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa192ce7f..48d7e907c 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 - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 745e5ba78bab21f191089ad0702d28b1f5c6550b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf + dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf + dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf + dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf + dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6c37c986b6c8fc0669b38a03a03445a75b8227a6 + 4e8a67279888e260abf0cf5b027cc16ea7069799 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 + c7a8451f8a664f44336c013032414c4a9ca4dc42 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index cbd7b1aca..71afa07f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.5-servicing.24217.4 + 8.0.6-servicing.24266.2 - 8.0.5-servicing.24217.2 + 8.0.6-servicing.24266.5 @@ -78,9 +78,9 @@ - 8.0.106 - 8.0.106-servicing.24267.25 - 8.0.106-servicing.24267.25 + 8.0.107 + 8.0.107-servicing.24267.45 + 8.0.107-servicing.24267.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.5-servicing.24217.5 - 8.0.5-servicing.24217.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24266.4 + 8.0.6-servicing.24266.4 + 8.0.6 + 8.0.6 From 0268810a89c15c70532efac98670f391133d4d6c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 04:53:36 +0000 Subject: [PATCH 06/47] Merged PR 39716: [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.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12 (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**: 20240517.58 - **Date Produced**: May 18, 2024 12:14:33 AM UTC - **Commit**: 1e103e04ed44e9a613df14a5929cac70e34e2aa6 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.107 to 8.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.107-servicing.24267.45 to 8.0.107-servicing.24267.58][1] - **Microsoft.NET.Sdk**: [from 8.0.107-servicing.24267.45 to 8.0.107-servicing.24267.58][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.107-servicing.24267.45 to 8.0.107-servicing.24267.58][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.6 to 8.0.6][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.6 to 8.0.6][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12][2] - **dotnet-dev-certs**: [from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12][2] - **dotnet-user-jwts**: [from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12][2] - **dotnet-user-secrets**: [from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdc2cd02b8507bae3a94b784a8c852b9f1fa40bb0&targetVersion=GC1e103e04ed44e9a613df1... --- 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 404c20284..e7ff55835 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 48d7e907c..3e5c4e7da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 44ef4a055095c059164c20560abefea36b6b333f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 + 1e103e04ed44e9a613df14a5929cac70e34e2aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 + 1e103e04ed44e9a613df14a5929cac70e34e2aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 + 1e103e04ed44e9a613df14a5929cac70e34e2aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 + 1e103e04ed44e9a613df14a5929cac70e34e2aa6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 71afa07f3..5ef0bead5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 + 8.0.6-servicing.24267.12 + 8.0.6-servicing.24267.12 + 8.0.6-servicing.24267.12 + 8.0.6-servicing.24267.12 + 8.0.6-servicing.24267.12 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24267.45 - 8.0.107-servicing.24267.45 + 8.0.107-servicing.24267.58 + 8.0.107-servicing.24267.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b6c261bfb4f1245cfb32c2a0706ee0a03aff7a4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 22:31:12 +0000 Subject: [PATCH 07/47] Merged PR 39730: [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.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.6-servicing.24266.4 to 8.0.6-servicing.24267.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.6-servicing.24266.4 to 8.0.6-servicing.24267.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.6-servicing.24267.12 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24267.12 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.6-servicing.24267.12 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.6-servicing.24267.12 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.6-servicing.24267.12 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.6-servicing.24266.5 to 8.0.7-servicing.24267.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.10... --- NuGet.config | 18 ++++---- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++-------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7ff55835..7f710ef7e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e5c4e7da..de0286dbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 44ef4a055095c059164c20560abefea36b6b333f + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e103e04ed44e9a613df14a5929cac70e34e2aa6 + 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e103e04ed44e9a613df14a5929cac70e34e2aa6 + 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e103e04ed44e9a613df14a5929cac70e34e2aa6 + 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1e103e04ed44e9a613df14a5929cac70e34e2aa6 + 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 4e8a67279888e260abf0cf5b027cc16ea7069799 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c7a8451f8a664f44336c013032414c4a9ca4dc42 + eea757d15dbc77041d9295e55dc45d18d7f7ed83 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://github.com/dotnet/roslyn @@ -175,16 +175,16 @@ https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 diff --git a/eng/Versions.props b/eng/Versions.props index 5ef0bead5..7ef3a4376 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 8.0.6-servicing.24266.5 + 8.0.7-servicing.24267.12 @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24267.12 - 8.0.6-servicing.24267.12 - 8.0.6-servicing.24267.12 - 8.0.6-servicing.24267.12 - 8.0.6-servicing.24267.12 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24267.58 - 8.0.107-servicing.24267.58 + 8.0.107-servicing.24267.79 + 8.0.107-servicing.24267.79 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,22 +91,22 @@ - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 - 8.0.6-servicing.24253.6 - 8.0.6-servicing.24253.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24267.24 + 8.0.7-servicing.24267.24 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 2.1.0 - 8.0.6-servicing.24266.4 - 8.0.6-servicing.24266.4 + 8.0.6-servicing.24267.14 + 8.0.6-servicing.24267.14 8.0.6 8.0.6 From f4af758c79bb0be2dc3659a9158fa3e7b43b60e1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 May 2024 23:14:59 +0000 Subject: [PATCH 08/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240518.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.6 -> To Version 8.0.6 (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 7f710ef7e..f6d992ee1 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 de0286dbc..719558e90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 + 4bea267253978a0d83670a569d83081d62fc8060 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 + 4bea267253978a0d83670a569d83081d62fc8060 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 + 4bea267253978a0d83670a569d83081d62fc8060 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c77b040afcdb0f90665e65c0bd930fad2aaf5e7 + 4bea267253978a0d83670a569d83081d62fc8060 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7ef3a4376..0546056ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24267.79 - 8.0.107-servicing.24267.79 + 8.0.107-servicing.24268.1 + 8.0.107-servicing.24268.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83515a4416ca91d12c90e74e4020605add44df7d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 20:29:35 +0000 Subject: [PATCH 09/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index f6d992ee1..6b1b6c18b 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 be2af18f9..704d16e07 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 - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e8a67279888e260abf0cf5b027cc16ea7069799 + 0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - eea757d15dbc77041d9295e55dc45d18d7f7ed83 + adccabf2ff002505d4dcc3019508647f0953f885 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c62bc36ac..d98706723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.6-servicing.24266.2 + 8.0.6-servicing.24267.11 - 8.0.7-servicing.24267.12 + 8.0.7-servicing.24268.1 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24268.1 - 8.0.107-servicing.24268.1 + 8.0.107-servicing.24270.16 + 8.0.107-servicing.24270.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.6-servicing.24267.14 - 8.0.6-servicing.24267.14 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24270.4 + 8.0.7-servicing.24270.4 + 8.0.7 + 8.0.7 From 189df4ec0fd81179346afb7d317c35670f070934 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 22:11:02 +0000 Subject: [PATCH 10/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.6 -> To Version 8.0.7 (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 6b1b6c18b..4d4881954 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 704d16e07..8b4116e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786 + 75693baf659b4a98a29d70c69a86de8752bf5c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - adccabf2ff002505d4dcc3019508647f0953f885 + 6c96e5e2b40908998ba65dac3171b90d6b3ca775 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d98706723..f2f9a5d09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.6-servicing.24267.11 + 8.0.7-servicing.24269.16 - 8.0.7-servicing.24268.1 + 8.0.7-servicing.24270.8 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.16 - 8.0.107-servicing.24270.16 + 8.0.107-servicing.24270.37 + 8.0.107-servicing.24270.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24270.4 - 8.0.7-servicing.24270.4 + 8.0.7-servicing.24270.15 + 8.0.7-servicing.24270.15 8.0.7 8.0.7 From 75a67706a1b68873a1210e6a3758ad3a463857e7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 00:02:07 +0000 Subject: [PATCH 11/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.49 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d4881954..cf6ea903d 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 db6079fb6..70e34e6fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f948ff8ad318aa94dbbe28db5b4205281c76b74a + dee53be974d15e5f1de05eec26fcde99b0f41fa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f948ff8ad318aa94dbbe28db5b4205281c76b74a + dee53be974d15e5f1de05eec26fcde99b0f41fa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f948ff8ad318aa94dbbe28db5b4205281c76b74a + dee53be974d15e5f1de05eec26fcde99b0f41fa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f948ff8ad318aa94dbbe28db5b4205281c76b74a + dee53be974d15e5f1de05eec26fcde99b0f41fa1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f2f9a5d09..da1ae083c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.6 - 8.0.6 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 + 8.0.7 + 8.0.7 + 8.0.7-servicing.24270.6 + 8.0.7-servicing.24270.6 + 8.0.7-servicing.24270.6 + 8.0.7-servicing.24270.6 + 8.0.7-servicing.24270.6 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.37 - 8.0.107-servicing.24270.37 + 8.0.107-servicing.24270.49 + 8.0.107-servicing.24270.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac33be06815c0d9d956da2116c70cc8c31973da2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 00:55:48 +0000 Subject: [PATCH 12/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.61 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.7-servicing.24267.24 -> To Version 8.0.7-servicing.24270.7 (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 cf6ea903d..677290147 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70e34e6fa..8dfb7c417 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dee53be974d15e5f1de05eec26fcde99b0f41fa1 + c0acaf9db0a808a36d47daad31094032a336f03a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dee53be974d15e5f1de05eec26fcde99b0f41fa1 + c0acaf9db0a808a36d47daad31094032a336f03a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dee53be974d15e5f1de05eec26fcde99b0f41fa1 + c0acaf9db0a808a36d47daad31094032a336f03a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dee53be974d15e5f1de05eec26fcde99b0f41fa1 + c0acaf9db0a808a36d47daad31094032a336f03a https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 6d230cdb65dee13db6779749580d02bcd413af70 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index da1ae083c..ce76e71ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.49 - 8.0.107-servicing.24270.49 + 8.0.107-servicing.24270.61 + 8.0.107-servicing.24270.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 - 8.0.7-servicing.24267.24 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.7 8.0.7 8.0.7 8.0.7 From ba48fcf63770da2d7f72f8627bb14cfe90c6d5fc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 02:44:26 +0000 Subject: [PATCH 13/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.73 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 --- 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 677290147..a2388a5dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dfb7c417..657c9da27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0acaf9db0a808a36d47daad31094032a336f03a + a3f5388a1ca0f06f49c963c59f2be1dda1afb045 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0acaf9db0a808a36d47daad31094032a336f03a + a3f5388a1ca0f06f49c963c59f2be1dda1afb045 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0acaf9db0a808a36d47daad31094032a336f03a + a3f5388a1ca0f06f49c963c59f2be1dda1afb045 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0acaf9db0a808a36d47daad31094032a336f03a + a3f5388a1ca0f06f49c963c59f2be1dda1afb045 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ce76e71ff..55544ba1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.61 - 8.0.107-servicing.24270.61 + 8.0.107-servicing.24270.73 + 8.0.107-servicing.24270.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4dde1f4987d16a3bb3d9dd5cef833a96f72d453 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 03:37:02 +0000 Subject: [PATCH 14/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.81 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.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.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.7-servicing.24270.7 -> To Version 8.0.7-servicing.24270.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2388a5dd..93b0633b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,19 @@ - + - + - + - + @@ -42,12 +42,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 657c9da27..a469c63d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3488477ea0594a9216ae34cfa0e75ddc9ca44f7 + 4e7e55981127025e372d0448231adba1519ed47f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f5388a1ca0f06f49c963c59f2be1dda1afb045 + d2ad9d55210967e9f01f64f0b2c6f163a93af8ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f5388a1ca0f06f49c963c59f2be1dda1afb045 + d2ad9d55210967e9f01f64f0b2c6f163a93af8ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f5388a1ca0f06f49c963c59f2be1dda1afb045 + d2ad9d55210967e9f01f64f0b2c6f163a93af8ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f5388a1ca0f06f49c963c59f2be1dda1afb045 + d2ad9d55210967e9f01f64f0b2c6f163a93af8ef https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6d230cdb65dee13db6779749580d02bcd413af70 + 63d80966a9f0d15e057d0d146702405b19c82533 https://github.com/dotnet/roslyn @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed diff --git a/eng/Versions.props b/eng/Versions.props index 55544ba1b..4a5f07044 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24270.6 - 8.0.7-servicing.24270.6 - 8.0.7-servicing.24270.6 - 8.0.7-servicing.24270.6 - 8.0.7-servicing.24270.6 + 8.0.7-servicing.24270.18 + 8.0.7-servicing.24270.18 + 8.0.7-servicing.24270.18 + 8.0.7-servicing.24270.18 + 8.0.7-servicing.24270.18 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.73 - 8.0.107-servicing.24270.73 + 8.0.107-servicing.24270.81 + 8.0.107-servicing.24270.81 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 - 8.0.7-servicing.24270.7 - 8.0.7-servicing.24270.7 + 8.0.7-servicing.24270.14 + 8.0.7-servicing.24270.14 8.0.7 8.0.7 8.0.7 @@ -198,7 +198,7 @@ 14.0.8478 17.0.8478 - 8.0.6 + 8.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 81467071b04ccb9255217b99740b5a9d09d854f2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 21 May 2024 10:57:03 -0500 Subject: [PATCH 15/47] Remove backported runtime SB patch --- ...ashinfo-use-off_t-instead-of-off64_t.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch diff --git a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch deleted file mode 100644 index 6569164b8..000000000 --- a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001 -From: Antoine Martin -Date: Tue, 12 Sep 2023 18:55:46 -0400 -Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t - -Backport: https://github.com/dotnet/runtime/pull/101272 - ---- - src/coreclr/debug/createdump/crashinfo.cpp | 2 +- - src/coreclr/debug/createdump/crashinfounix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp -index 996f3a81935d..d1d1b0ea0218 100644 ---- a/src/coreclr/debug/createdump/crashinfo.cpp -+++ b/src/coreclr/debug/createdump/crashinfo.cpp -@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) - } - - uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); -- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); -+ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); - if (seekResult != pagemapOffset) - { - int seekErrno = errno; -diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp -index 24b975e3d655..2f4ea079de3b 100644 ---- a/src/coreclr/debug/createdump/crashinfounix.cpp -+++ b/src/coreclr/debug/createdump/crashinfounix.cpp -@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r - // performance optimization. - m_canUseProcVmReadSyscall = false; - assert(m_fdMem != -1); -- *read = pread64(m_fdMem, buffer, size, (off64_t)address); -+ *read = pread(m_fdMem, buffer, size, (off_t)address); - } - - if (*read == (size_t)-1) From aec8291a9488314fa365198ca979dd09d695a621 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 17:11:44 +0000 Subject: [PATCH 16/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.7 -> To Version 8.0.7 (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 93b0633b7..ddb24cfea 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 a469c63d2..dac9483ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7e55981127025e372d0448231adba1519ed47f + 714a9761f995103a6cdf21a7c41041740293bae9 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2ad9d55210967e9f01f64f0b2c6f163a93af8ef + 7f7d47f4d183e859567b6747a5bb76224f276ce8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2ad9d55210967e9f01f64f0b2c6f163a93af8ef + 7f7d47f4d183e859567b6747a5bb76224f276ce8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2ad9d55210967e9f01f64f0b2c6f163a93af8ef + 7f7d47f4d183e859567b6747a5bb76224f276ce8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2ad9d55210967e9f01f64f0b2c6f163a93af8ef + 7f7d47f4d183e859567b6747a5bb76224f276ce8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4a5f07044..80d4625b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24270.18 - 8.0.7-servicing.24270.18 - 8.0.7-servicing.24270.18 - 8.0.7-servicing.24270.18 - 8.0.7-servicing.24270.18 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.81 - 8.0.107-servicing.24270.81 + 8.0.107-servicing.24271.7 + 8.0.107-servicing.24271.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6503d4fec88d6a51bbf5b7db42ab5c3e4021e434 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 21 May 2024 19:12:17 +0000 Subject: [PATCH 17/47] Merged PR 39887: [ internal/release/8.0.1xx] always subtract one from template versions. Updated Versions.props - always subtract one from template versions. --- eng/Versions.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 80d4625b9..c0aaf04e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,6 +141,9 @@ Preview releases already use -1 versionining so don't subtract one for that version. In public builds, we always use the 2 month old version. --> + + true + true true true From b97b233cb918892e4243ef85a442747178979100 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 19:15:37 +0000 Subject: [PATCH 18/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.7 -> To Version 8.0.7 (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 ddb24cfea..24dfaaafe 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 dac9483ae..f37c514a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f7d47f4d183e859567b6747a5bb76224f276ce8 + b0f0880d84ea135a9211f7ae5fce54ce21babef5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f7d47f4d183e859567b6747a5bb76224f276ce8 + b0f0880d84ea135a9211f7ae5fce54ce21babef5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f7d47f4d183e859567b6747a5bb76224f276ce8 + b0f0880d84ea135a9211f7ae5fce54ce21babef5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f7d47f4d183e859567b6747a5bb76224f276ce8 + b0f0880d84ea135a9211f7ae5fce54ce21babef5 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75693baf659b4a98a29d70c69a86de8752bf5c03 + b41338c372f491d19532b30fd3c6b609f963aa92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6c96e5e2b40908998ba65dac3171b90d6b3ca775 + 7db8d5b8559d931e0b5555b7d3eec6c083dd6e59 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c0aaf04e3..8351bdccb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.7-servicing.24269.16 + 8.0.7-servicing.24270.8 - 8.0.7-servicing.24270.8 + 8.0.7-servicing.24271.5 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24271.7 - 8.0.107-servicing.24271.7 + 8.0.107-servicing.24271.19 + 8.0.107-servicing.24271.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24270.15 - 8.0.7-servicing.24270.15 + 8.0.7-servicing.24271.4 + 8.0.7-servicing.24271.4 8.0.7 8.0.7 From 671b34aa3c1090c2f8051deab7ffb5afb74686dd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 May 2024 02:38:05 +0000 Subject: [PATCH 19/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 --- 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 24dfaaafe..ea1ef9e0e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f37c514a8..86e0985d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0f0880d84ea135a9211f7ae5fce54ce21babef5 + cc59bec17cb30de67acb059951bfb88a52860bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0f0880d84ea135a9211f7ae5fce54ce21babef5 + cc59bec17cb30de67acb059951bfb88a52860bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0f0880d84ea135a9211f7ae5fce54ce21babef5 + cc59bec17cb30de67acb059951bfb88a52860bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0f0880d84ea135a9211f7ae5fce54ce21babef5 + cc59bec17cb30de67acb059951bfb88a52860bf6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8351bdccb..9225930d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24271.19 - 8.0.107-servicing.24271.19 + 8.0.107-servicing.24271.34 + 8.0.107-servicing.24271.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97d9a80e4e09b040e8e2708c17729d066ae05b9e Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 31 May 2024 18:31:36 +0000 Subject: [PATCH 20/47] Merged PR 40044: Update SDK Diff Exclusions Related to https://github.com/dotnet/release/issues/954 This PR updates the SDK diff to account for additional internal differences following the latest servicing release. --- .../assets/SdkFileDiffExclusions.txt | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) 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 6cf694f75..3dee5919a 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 @@ -63,25 +63,11 @@ msft,./sdk/x.y.z/**/System.Windows.Extensions.dll msft,./sdk/x.y.z/**/System.Security.Permissions.dll msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll -# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3285 -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/* -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Drawing.Common.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll - -# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/3509 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/* -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll +# Exclude format and watch tools due to too much noise +msft,./sdk/x.y.z/DotnetTools/dotnet-format/** +msft,./sdk/x.y.z/DotnetTools/dotnet-watch/** +sb,./sdk/x.y.z/DotnetTools/dotnet-format/** +sb,./sdk/x.y.z/DotnetTools/dotnet-watch/** # netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290 msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll @@ -96,4 +82,4 @@ msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll # runtime components in roslyn layout - https://github.com/dotnet/source-build/issues/3286 # Expected - build is filtering components present in target platform. msft,./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll -msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll \ No newline at end of file From 70cfd60f8cb5997af290aac9165590f99f971e4e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 12 Jun 2024 02:59:23 +0000 Subject: [PATCH 21/47] Merged PR 40090: Revert '[ internal/release/8.0.1xx] always subtract one from template versions.' Updated Versions.props - always subtract one from template versions. Reverts !39887 --- eng/Versions.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f15717110..08a44438b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,9 +145,6 @@ Preview releases already use -1 versionining so don't subtract one for that version. In public builds, we always use the 2 month old version. --> - - true - true true true From ff61ab4014bd7f49e43a0e0a89f2f92539f744cc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 23:36:02 +0000 Subject: [PATCH 22/47] Merged PR 40285: [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.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.7-servicing.24270.2 to 8.0.7-servicing.24310.3 (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**: 20240611.20 - **Date Produced**: June 12, 2024 3:37:49 AM UTC - **Commit**: c29cf8560cbce9c5431cf700d2273466cae16172 - **Branch**: refs/heads/internal/release/8.0... --- NuGet.config | 28 ++++++++++++----- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea1ef9e0e..0d45248fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + - + - + - + + + + + + + + @@ -42,14 +49,21 @@ - + - + - + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86e0985d5..8387bc5ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc59bec17cb30de67acb059951bfb88a52860bf6 + 2795318dbcc993573b9bd1df7c02a411132ea77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc59bec17cb30de67acb059951bfb88a52860bf6 + 2795318dbcc993573b9bd1df7c02a411132ea77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc59bec17cb30de67acb059951bfb88a52860bf6 + 2795318dbcc993573b9bd1df7c02a411132ea77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc59bec17cb30de67acb059951bfb88a52860bf6 + 2795318dbcc993573b9bd1df7c02a411132ea77c https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://github.com/dotnet/roslyn @@ -175,16 +175,16 @@ https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 diff --git a/eng/Versions.props b/eng/Versions.props index 08a44438b..e4a2208b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24271.34 - 8.0.107-servicing.24271.34 + 8.0.107-servicing.24312.12 + 8.0.107-servicing.24312.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 - 8.0.7-servicing.24270.14 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 + 8.0.7-servicing.24311.13 8.0.7 8.0.7 8.0.7 From 7e46b338ccae22e30c9a1996417d52402681f83e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 16:15:46 +0000 Subject: [PATCH 23/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,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.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 28 +++++-------------- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++------ 3 files changed, 47 insertions(+), 61 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d45248fd..3164c151c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,20 +16,13 @@ - + - + - - - - - - - - + @@ -52,19 +45,12 @@ - + - + - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8387bc5ea..c75bac68e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2795318dbcc993573b9bd1df7c02a411132ea77c + 6218c7e0e18bf4df408d041549f5944a42c9c0f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2795318dbcc993573b9bd1df7c02a411132ea77c + 6218c7e0e18bf4df408d041549f5944a42c9c0f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2795318dbcc993573b9bd1df7c02a411132ea77c + 6218c7e0e18bf4df408d041549f5944a42c9c0f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2795318dbcc993573b9bd1df7c02a411132ea77c + 6218c7e0e18bf4df408d041549f5944a42c9c0f0 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b41338c372f491d19532b30fd3c6b609f963aa92 + 706e61ff5705f6b87ecdde0d7338006eba3467c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7db8d5b8559d931e0b5555b7d3eec6c083dd6e59 + b10cd0c3e35e17582d9f2b8079daf7c115e0bf53 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://github.com/dotnet/roslyn @@ -175,16 +175,16 @@ https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee diff --git a/eng/Versions.props b/eng/Versions.props index e4a2208b8..bcf74d87b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.7-servicing.24270.8 + 8.0.7-servicing.24311.4 - 8.0.7-servicing.24271.5 + 8.0.7-servicing.24312.2 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24312.12 - 8.0.107-servicing.24312.12 + 8.0.107-servicing.24313.10 + 8.0.107-servicing.24313.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 - 8.0.7-servicing.24311.13 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 + 8.0.7-servicing.24312.14 8.0.7 8.0.7 8.0.7 @@ -105,8 +105,8 @@ - 8.0.7-servicing.24271.4 - 8.0.7-servicing.24271.4 + 8.0.7-servicing.24312.4 + 8.0.7-servicing.24312.4 8.0.7 8.0.7 From b6ef9f43567c01e6a5f906680ff5401852fc74bd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 21:48:31 +0000 Subject: [PATCH 24/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.7 -> To Version 8.0.7 (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 3164c151c..75a249687 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 c75bac68e..5dc75103e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6218c7e0e18bf4df408d041549f5944a42c9c0f0 + a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6218c7e0e18bf4df408d041549f5944a42c9c0f0 + a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6218c7e0e18bf4df408d041549f5944a42c9c0f0 + a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6218c7e0e18bf4df408d041549f5944a42c9c0f0 + a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bcf74d87b..608f73e9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24313.10 - 8.0.107-servicing.24313.10 + 8.0.107-servicing.24313.23 + 8.0.107-servicing.24313.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d954c65a4b2d3a6c4cf8903aa9107799b20c4649 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 02:42:36 +0000 Subject: [PATCH 25/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.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.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.7-servicing.24312.14 -> To Version 8.0.7-servicing.24313.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 75a249687..e92449419 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dc75103e..b65387741 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c + 9cf93cc304faf0ed74b9d91a75308ec81cc63446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c + 9cf93cc304faf0ed74b9d91a75308ec81cc63446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c + 9cf93cc304faf0ed74b9d91a75308ec81cc63446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a3f0944be4abba7ccd88fcf8cea3a92d09f8d58c + 9cf93cc304faf0ed74b9d91a75308ec81cc63446 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://github.com/dotnet/roslyn @@ -175,16 +175,16 @@ https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d diff --git a/eng/Versions.props b/eng/Versions.props index 608f73e9e..7b4a74cef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24313.23 - 8.0.107-servicing.24313.23 + 8.0.107-servicing.24313.42 + 8.0.107-servicing.24313.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 - 8.0.7-servicing.24312.14 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 + 8.0.7-servicing.24313.11 8.0.7 8.0.7 8.0.7 From 9c712ff1a6f9fc882cf5ef3e7803139b04b4a932 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 19:43:31 +0000 Subject: [PATCH 26/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index e92449419..159fbabdd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -42,15 +42,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b65387741..47d993ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cf93cc304faf0ed74b9d91a75308ec81cc63446 + 6d462db720af04f4a61bae39048bfc751c915d89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cf93cc304faf0ed74b9d91a75308ec81cc63446 + 6d462db720af04f4a61bae39048bfc751c915d89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cf93cc304faf0ed74b9d91a75308ec81cc63446 + 6d462db720af04f4a61bae39048bfc751c915d89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cf93cc304faf0ed74b9d91a75308ec81cc63446 + 6d462db720af04f4a61bae39048bfc751c915d89 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 706e61ff5705f6b87ecdde0d7338006eba3467c5 + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b10cd0c3e35e17582d9f2b8079daf7c115e0bf53 + 43bb8cc831c2658e1117415019264bfe6f644f94 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7b4a74cef..c6b4d59a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.7-servicing.24311.4 + 8.0.7-servicing.24313.8 - 8.0.7-servicing.24312.2 + 8.0.7-servicing.24313.7 @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24313.42 - 8.0.107-servicing.24313.42 + 8.0.107-servicing.24314.9 + 8.0.107-servicing.24314.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24312.4 - 8.0.7-servicing.24312.4 + 8.0.7-servicing.24314.3 + 8.0.7-servicing.24314.3 8.0.7 8.0.7 From 30b8a34b36d69ebed0f98d9ecaad223cceed3c4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 21:52:39 +0000 Subject: [PATCH 27/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 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.7 -> To Version 8.0.7 (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 159fbabdd..0df2c9697 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 47d993ed2..8a747cad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d462db720af04f4a61bae39048bfc751c915d89 + e482e71a594dfc60045b3b02ace7c0592753ac71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d462db720af04f4a61bae39048bfc751c915d89 + e482e71a594dfc60045b3b02ace7c0592753ac71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d462db720af04f4a61bae39048bfc751c915d89 + e482e71a594dfc60045b3b02ace7c0592753ac71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d462db720af04f4a61bae39048bfc751c915d89 + e482e71a594dfc60045b3b02ace7c0592753ac71 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c6b4d59a1..f1aa00b68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 0.2.0 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24314.9 - 8.0.107-servicing.24314.9 + 8.0.107-servicing.24314.16 + 8.0.107-servicing.24314.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6517189e61812a6aad19dd78c3c706ecdfc97ceb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jun 2024 18:00:15 +0000 Subject: [PATCH 28/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240617.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 --- 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 0df2c9697..6f83e4126 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a747cad1..106e5209f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e482e71a594dfc60045b3b02ace7c0592753ac71 + 289435f5c45053c7599cf237fefc8391d1eb7f0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e482e71a594dfc60045b3b02ace7c0592753ac71 + 289435f5c45053c7599cf237fefc8391d1eb7f0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e482e71a594dfc60045b3b02ace7c0592753ac71 + 289435f5c45053c7599cf237fefc8391d1eb7f0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e482e71a594dfc60045b3b02ace7c0592753ac71 + 289435f5c45053c7599cf237fefc8391d1eb7f0b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f1aa00b68..f2b31e879 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24314.16 - 8.0.107-servicing.24314.16 + 8.0.107-servicing.24317.5 + 8.0.107-servicing.24317.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 815b6ea554d2256afef054970115fbd7e7dba2a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 23:18:35 +0000 Subject: [PATCH 29/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24315.2 -> To Version 6.0.425-servicing.24366.19 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++--------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index c4a66fb15..949dfdfb4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,21 +14,13 @@ - - - - - + - - - - - + @@ -70,11 +62,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16cdfee24..20479ab2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef2ca68feb305bd9ebc3934b8488526caee3d118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 5d9665fb3c50eede6d337225cb863f5db7dc3a27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 5d9665fb3c50eede6d337225cb863f5db7dc3a27 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 8601068126449af799f8e07ca358dbbd4b3fcab4 + 849e1a63a8319f9578b9e5f02da592d24d4aa2df https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index cf3f9d329..1103b2895 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.424-servicing.24315.2 - 6.0.424-servicing.24315.2 + 6.0.425-servicing.24366.19 + 6.0.425-servicing.24366.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.32-servicing.24314.7 - 6.0.32-servicing.24314.7 - 6.0.32 - 6.0.32 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.10 + 6.0.33-servicing.24366.10 + 6.0.33 + 6.0.33 + 6.0.33 + 6.0.33 2.1.0 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.32 + 6.0.33 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 58a4c5fc4c99f33629b8d43fdf5608e07a2e2d48 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 23:54:34 +0000 Subject: [PATCH 30/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.108 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.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.7-servicing.24313.11 -> To Version 8.0.8-servicing.24366.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++----------------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 47 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3cf1a0bbd..9d3282f1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -24,18 +20,10 @@ - - - - - + - - - - - + @@ -69,17 +57,9 @@ - - - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab4d93016..f14694847 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 289435f5c45053c7599cf237fefc8391d1eb7f0b + 78685e249cfb02ff5bb173837eb18296e42f399b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 289435f5c45053c7599cf237fefc8391d1eb7f0b + 78685e249cfb02ff5bb173837eb18296e42f399b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 289435f5c45053c7599cf237fefc8391d1eb7f0b + 78685e249cfb02ff5bb173837eb18296e42f399b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 289435f5c45053c7599cf237fefc8391d1eb7f0b + 78685e249cfb02ff5bb173837eb18296e42f399b https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://github.com/dotnet/roslyn - de75b3c77d41c21562fc2e9dbcc26b2268c80b26 + 2975b0a592ac27549e1b9d0e786243f9cb569316 @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 diff --git a/eng/Versions.props b/eng/Versions.props index 987c180c2..64d50f9a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,29 +78,29 @@ - 8.0.107 - 8.0.107-servicing.24317.5 - 8.0.107-servicing.24317.5 + 8.0.108 + 8.0.108-servicing.24366.27 + 8.0.108-servicing.24366.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24225.6 + 4.8.0-7.24362.3 - 8.0.7-servicing.24313.11 + 8.0.8-servicing.24366.12 - 8.0.7-servicing.24313.11 - 8.0.7-servicing.24313.11 - 8.0.7 - 8.0.7 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.12 + 8.0.8-servicing.24366.12 + 8.0.8 + 8.0.8 + 8.0.8 + 8.0.8 2.1.0 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.7 + 8.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 57cc5823b74c77ebe16adf6c4d828c9fec9ed79d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 06:46:05 +0000 Subject: [PATCH 31/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.36 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.425-servicing.24366.19 -> To Version 6.0.425-servicing.24366.36 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++------------------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 949dfdfb4..4bdc6fc93 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,18 +23,10 @@ - - - - - + - - - - - + @@ -65,18 +57,10 @@ - - - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20479ab2b..4ded52285 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d9665fb3c50eede6d337225cb863f5db7dc3a27 + 3fa53f119ac9fca930e63f0979933210f1d22edd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d9665fb3c50eede6d337225cb863f5db7dc3a27 + 3fa53f119ac9fca930e63f0979933210f1d22edd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 670045968593e524941ef480423796ceb50c5e2f + 6a984c48f3489b60f25deb72ede6e5051bb130d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 798cc6d4922db482f84fb72a8244f0da898bc5d6 + b660c1e83039451abe9d9190a7aabe87c03fd7ae https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1103b2895..336ee3ced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.32-servicing.24314.5 + 6.0.33-servicing.24366.4 - 6.0.32-servicing.24314.4 + 6.0.33-servicing.24366.5 - 6.0.424 + 6.0.425 @@ -55,8 +55,8 @@ - 6.0.425-servicing.24366.19 - 6.0.425-servicing.24366.19 + 6.0.425-servicing.24366.36 + 6.0.425-servicing.24366.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.32-servicing.24314.6 - 6.0.32-servicing.24314.6 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.6 + 6.0.33-servicing.24366.6 + 6.0.33 + 6.0.33 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.424 + 6.0.425 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 4f395e3aca2e5359c8baf5320ea37617a7a4d17c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 17:13:32 +0000 Subject: [PATCH 32/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.108 -> To Version 8.0.108 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.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d3282f1b..2b33ebc7b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,14 +23,10 @@ - + - - - - - + @@ -59,14 +55,10 @@ - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0343eedc6..7a9755f5a 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 - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78685e249cfb02ff5bb173837eb18296e42f399b + a94faf917070b9b475319f4e6c8625fb2313f7aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78685e249cfb02ff5bb173837eb18296e42f399b + a94faf917070b9b475319f4e6c8625fb2313f7aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78685e249cfb02ff5bb173837eb18296e42f399b + a94faf917070b9b475319f4e6c8625fb2313f7aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78685e249cfb02ff5bb173837eb18296e42f399b + a94faf917070b9b475319f4e6c8625fb2313f7aa https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 + bd164556d31c13b09986f597f49a83bf836c165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43bb8cc831c2658e1117415019264bfe6f644f94 + 883fc207bb50622d4458ff09ae6a62548783826a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b9b8bdf51..9049b1fef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.7-servicing.24313.8 + 8.0.8-servicing.24366.6 - 8.0.7-servicing.24313.7 + 8.0.8-servicing.24366.7 @@ -79,8 +79,8 @@ 8.0.108 - 8.0.108-servicing.24366.27 - 8.0.108-servicing.24366.27 + 8.0.108-servicing.24367.12 + 8.0.108-servicing.24367.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.7-servicing.24314.3 - 8.0.7-servicing.24314.3 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.8 + 8.0.8-servicing.24366.8 + 8.0.8 + 8.0.8 From d0d4f0ece5c4d74ac71a183769c06cc2a0fcb65d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 18:19:22 +0000 Subject: [PATCH 33/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.108 -> To Version 8.0.108 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.7 -> To Version 8.0.8 (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 2b33ebc7b..498d04da4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a9755f5a..2fdf20b7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a94faf917070b9b475319f4e6c8625fb2313f7aa + d5cd19d7e39ec04e07a98bc663f82552b780f633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a94faf917070b9b475319f4e6c8625fb2313f7aa + d5cd19d7e39ec04e07a98bc663f82552b780f633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a94faf917070b9b475319f4e6c8625fb2313f7aa + d5cd19d7e39ec04e07a98bc663f82552b780f633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a94faf917070b9b475319f4e6c8625fb2313f7aa + d5cd19d7e39ec04e07a98bc663f82552b780f633 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9049b1fef..6984f1bf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.108 - 8.0.108-servicing.24367.12 - 8.0.108-servicing.24367.12 + 8.0.108-servicing.24367.16 + 8.0.108-servicing.24367.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6e362fc218ee64bed4c2e293af5ea929546d2d2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 18 Jul 2024 19:46:30 +0000 Subject: [PATCH 34/47] Merged PR 41210: Enable internal runtimes when building tarball - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Enable internal runtimes when building tarball ---- #### AI description (iteration 1) #### PR Classification New feature to enable internal runtimes during the tarball creation process. #### PR Summary This pull request adds a step to enable internal runtimes when building the tarball. - `src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml`: Added a template step to enable internal runtimes. --- .../eng/common/templates/job/source-build-create-tarball.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8b5b456b6..2e4867a58 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -42,6 +42,7 @@ jobs: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - script: | set -x df -h From f9cdab08cee5d0bb05041643048a135651ad57fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jul 2024 19:50:31 +0000 Subject: [PATCH 35/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240718.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.425-servicing.24366.36 -> To Version 6.0.425-servicing.24368.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4bdc6fc93..87e4597f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -47,11 +43,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa1b93308..0622de035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fa53f119ac9fca930e63f0979933210f1d22edd + acb38060470b240e6d89c62e2d9a9635535fc76f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fa53f119ac9fca930e63f0979933210f1d22edd + acb38060470b240e6d89c62e2d9a9635535fc76f diff --git a/eng/Versions.props b/eng/Versions.props index 09677419d..7b01a8100 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 6.0.32 - 6.0.32 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 + 6.0.33 + 6.0.33 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 0.2.0 - 6.0.425-servicing.24366.36 - 6.0.425-servicing.24366.36 + 6.0.425-servicing.24368.9 + 6.0.425-servicing.24368.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7920e35d10ecc3a1caac653862da201c0d2a519 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:51:21 +0000 Subject: [PATCH 36/47] [release/6.0.1xx] Update dependencies from dotnet/arcade (#20026) Co-authored-by: dotnet-maestro[bot] --- 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 35719daa9..360f2b480 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 0e6fe8dac..3e2044ee6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24360.7 + 6.0.0-beta.24367.5 diff --git a/global.json b/global.json index 18b0acd2a..49287840d 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.24360.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24367.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24367.5" } } From 8d504cd1a8b453388b6f9a12fe6c7c0bcdf5bd8e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Jul 2024 02:26:53 +0000 Subject: [PATCH 37/47] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240719.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.108 -> To Version 8.0.108 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.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 498d04da4..5c4bddfcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,11 +10,7 @@ - - - - - + @@ -23,7 +19,7 @@ - + @@ -46,16 +42,12 @@ - - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fdf20b7a..41c3f9fb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5cd19d7e39ec04e07a98bc663f82552b780f633 + 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5cd19d7e39ec04e07a98bc663f82552b780f633 + 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5cd19d7e39ec04e07a98bc663f82552b780f633 + 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5cd19d7e39ec04e07a98bc663f82552b780f633 + 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6984f1bf4..360a3794f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.7 - 8.0.7 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 + 8.0.8 + 8.0.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 0.2.0 @@ -79,8 +79,8 @@ 8.0.108 - 8.0.108-servicing.24367.16 - 8.0.108-servicing.24367.16 + 8.0.108-servicing.24369.10 + 8.0.108-servicing.24369.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcce060d9fe00a232a3befd332464b0282484da1 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 29 Jul 2024 20:05:49 +0000 Subject: [PATCH 38/47] Merged PR 41388: [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.AspNetCore.App.Ref**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240729.11 - **Date Produced**: July 29, 2024 7:35:20 PM UTC - **Commit**: 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.425-servicing.24368.9 to 6.0.425-servicing.24379.11][1] - **Microsoft.NET.Sdk**: [from 6.0.425-servicing.24368.9 to 6.0.425-servicing.24379.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.33 to 6.0.33][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.33][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-dev-certs**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-user-secrets**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCacb38060470b240e6d89c62e2d9a9635535fc76f&targetVersion=GC7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCd917e14cc49f16d7190195501fd43fa4835d274f&targetVersion=GCf0f9de5692adf1c0576de062f93c6ab7b176433f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 19 +++++++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87e4597f2..9d7ecd6e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,13 @@ - + + + + @@ -20,9 +23,15 @@ + + + + + + @@ -43,15 +52,21 @@ - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0622de035..f3296ed9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acb38060470b240e6d89c62e2d9a9635535fc76f + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acb38060470b240e6d89c62e2d9a9635535fc76f + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad diff --git a/eng/Versions.props b/eng/Versions.props index 7b01a8100..92057f28d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.33 6.0.33 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 0.2.0 - 6.0.425-servicing.24368.9 - 6.0.425-servicing.24368.9 + 6.0.425-servicing.24379.11 + 6.0.425-servicing.24379.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f31285ead4d1680fbce13dcefa924ffaee2d0cd Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Aug 2024 11:23:26 -0700 Subject: [PATCH 39/47] Update branding to 6.0.134 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3e2044ee6..612736663 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 33 + 34 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d358f097e086edc87cc1fb2119886e2594ec08f0 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Fri, 9 Aug 2024 16:42:57 -0700 Subject: [PATCH 40/47] Update Windows SDK projection --- eng/ManualVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208..2a808a31e 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 From 9920517fbf327996b4e90150943c4213975afc5f Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Fri, 9 Aug 2024 17:02:28 -0700 Subject: [PATCH 41/47] Update Windows SDK projection --- eng/ManualVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208..2a808a31e 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 From 457dea4ead3f27c479d9e7afdf44908ecd260f49 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:14:15 -0500 Subject: [PATCH 42/47] .NET Source-Build 6.0.133 August 2024 Updates (#20062) --- 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 612736663..e149c266a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,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.132 + 6.0.133 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 9160faaab..ad6fb5ae6 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.132" + "dotnet": "6.0.133" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 5b501622528c3adad63add6155cbe7cba2096def Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 12:55:57 +0000 Subject: [PATCH 43/47] Update dependencies from https://github.com/dotnet/arcade build 20240813.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2 --- NuGet.config | 65 +++++++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 2 +- global.json | 6 ++-- 4 files changed, 75 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfd69ccbe..60c9c5f54 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,31 @@ + + + + + + + + + + + + + + + + + + + @@ -24,6 +43,24 @@ + + + + + + + + + + + + + + + + + + @@ -43,15 +80,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be077c189..dfecdd6d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4c38bfe2c..9afdd7717 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24412.1 + 8.0.0-beta.24413.2 diff --git a/global.json b/global.json index 15e104ecc..92a1fa5ea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.107", + "dotnet": "8.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24412.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" } } From bf0f2a546a642c871ae0e951cd039e09525e7291 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 12:56:16 +0000 Subject: [PATCH 44/47] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240814.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24372.3 -> To Version 8.0.0-alpha.1.24414.3 --- NuGet.config | 65 +++++++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 4 +-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfd69ccbe..60c9c5f54 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,31 @@ + + + + + + + + + + + + + + + + + + + @@ -24,6 +43,24 @@ + + + + + + + + + + + + + + + + + + @@ -43,15 +80,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be077c189..5be0dc580 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 - 30ed464acd37779c64e9dc652d4460543ebf9966 + 8262ce49763c67d87d6233652e5460f310e8b106 From 183722720c95a8ed6378720e255ad1678a854f63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:14:36 +0000 Subject: [PATCH 45/47] [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#20088) [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- 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 03fcafaa7..e681a974c 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 - 8262ce49763c67d87d6233652e5460f310e8b106 + fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86 From ac638c48a7e7f9546087643e63c7ff0ff8caa7c6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:28 -0700 Subject: [PATCH 46/47] Update branding to 8.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9afdd7717..5b5f3d446 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a2ed68f7ce45831796b14250cb97047f3ad5bb5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 23:17:41 +0000 Subject: [PATCH 47/47] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20092) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/telemetry-start.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e681a974c..0e0e1af8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5b5f3d446..eee79dcbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24413.2 + 8.0.0-beta.24426.2 diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 32c01ef0b..6abbcb33a 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -8,7 +8,7 @@ parameters: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 + - task: AzureKeyVault@2 inputs: azureSubscription: 'HelixProd_KeyVault' KeyVaultName: HelixProdKV diff --git a/global.json b/global.json index 92a1fa5ea..404026ec6 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24426.2" } }