From 5664d9571fbc4bfb1e9d3355dbb06331055a1469 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 20:02:18 +0000 Subject: [PATCH 01/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300 -> To Version 8.0.301 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,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 -> To Version 8.0.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++++----- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++-------- 3 files changed, 68 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index a37718f02c01..5754f75e2446 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,12 @@ - - + - + @@ -21,11 +20,11 @@ - + - - + + @@ -44,16 +43,15 @@ - - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3c7ff27016..ecb44d9c63c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + 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 - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + dd749058c91585e9b5dae62b0f8df892429ee28f - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + dd749058c91585e9b5dae62b0f8df892429ee28f @@ -146,13 +146,13 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - - https://github.com/dotnet/roslyn - 3af0081a6e811b78d37c62e479914f7f4cfb0d1a + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 9e93997517cb36aa0ac4444d69e022e288429252 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 diff --git a/eng/Versions.props b/eng/Versions.props index cb7928402b77..b0fd3a47b461 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,37 +78,37 @@ - 8.0.300 - 8.0.300-rtm.24224.16 - 8.0.300-rtm.24224.16 + 8.0.301 + 8.0.301-servicing.24266.11 + 8.0.301-servicing.24266.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24216.12 + 4.10.0-3.24265.5 - 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 - 8.0.5-servicing.24217.5 - 8.0.5-servicing.24217.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24251.7 + 8.0.6-servicing.24251.7 + 8.0.6 + 8.0.6 @@ -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 191891327897cfbe13496b3109b88c7c50015c3e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 22:21:25 +0000 Subject: [PATCH 02/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.301 -> To Version 8.0.301 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 | 10 ++++++---- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5754f75e2446..33450849d909 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -23,8 +24,8 @@ - - + + @@ -43,12 +44,13 @@ + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecb44d9c63c9..2a324c3956ae 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 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b0fd3a47b461..b5d7eb0e7b22 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.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.301 - 8.0.301-servicing.24266.11 - 8.0.301-servicing.24266.11 + 8.0.301-servicing.24266.25 + 8.0.301-servicing.24266.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fb61915e2378551464f93565f042babf1e3c8c56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 May 2024 23:16:43 +0000 Subject: [PATCH 03/22] Merged PR 39689: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240517.44 - **Date Produced**: May 17, 2024 9:37:28 PM UTC - **Commit**: 00abb199c46e43f178358b72c52171b4fc33fdde - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.301 to 8.0.302][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.NET.Sdk**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.6 to 8.0.6][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.6-servicing.24251.7 to 8.0.6-servicing.24266.4][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.6-servicing.24251.7 to 8.0.6-servicing.24266.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.6 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.6 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=GC47a828be93cb7873d97f9e9e6b6b0b5752060c06&targetVersion=GC00abb199c46e43f178358b72c52171b4fc33fdde&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCb83ccbcf1fd06f65ec23cca17b4fdd809b784394&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:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) [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.Redi... --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33450849d909..408024534d95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -49,11 +49,11 @@ - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac28dcc05280..f2b1be7c0e8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 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 - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + 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 fdb0f44ef275..3f959f85b885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,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.301 - 8.0.301-servicing.24266.25 - 8.0.301-servicing.24266.25 + 8.0.302 + 8.0.302-servicing.24267.44 + 8.0.302-servicing.24267.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.6-servicing.24251.7 - 8.0.6-servicing.24251.7 + 8.0.6-servicing.24266.4 + 8.0.6-servicing.24266.4 8.0.6 8.0.6 From 7960c8beac843763f4eeb9e9b0783b9fdbffe83d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 04:53:37 +0000 Subject: [PATCH 04/22] Merged PR 39717: [internal/release/8.0.3xx] 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.24266.3 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.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.6-servicing.24266.3 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.100**: ... --- NuGet.config | 22 +++++----- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++-------- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 408024534d95..269c93216a4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + - + @@ -21,11 +21,11 @@ - + - - + + @@ -44,16 +44,16 @@ - + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2b1be7c0e8c..d29ad858e6b8 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 - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c 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 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 - + https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 diff --git a/eng/Versions.props b/eng/Versions.props index 3f959f85b885..9752fbfb6b01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,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.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.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.302 - 8.0.302-servicing.24267.44 - 8.0.302-servicing.24267.44 + 8.0.302-servicing.24267.73 + 8.0.302-servicing.24267.73 $(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 e805a2522097da59c92022e4a6bb49f4c07cac78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 May 2024 23:19:45 +0000 Subject: [PATCH 05/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240518.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 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 | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 269c93216a4d..208178b83d47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -44,13 +44,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d29ad858e6b8..3c7d44496fd4 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 - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9752fbfb6b01..aaffc329c291 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.302 - 8.0.302-servicing.24267.73 - 8.0.302-servicing.24267.73 + 8.0.302-servicing.24268.2 + 8.0.302-servicing.24268.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8e02cd671ce1569efdd08fb6979c1753562542d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 18:54:40 +0000 Subject: [PATCH 06/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,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.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 40 ++++++++-------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208178b83d47..0e65b6cd815a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + - + @@ -21,11 +21,11 @@ - + - - + + @@ -44,16 +44,16 @@ - + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 631884a61549..af3066d72779 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e8a67279888e260abf0cf5b027cc16ea7069799 + 75693baf659b4a98a29d70c69a86de8752bf5c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - eea757d15dbc77041d9295e55dc45d18d7f7ed83 + 6c96e5e2b40908998ba65dac3171b90d6b3ca775 https://github.com/dotnet/fsharp @@ -148,11 +148,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 9e93997517cb36aa0ac4444d69e022e288429252 + d963055bb8326039f6083ee1f08648b10db1b887 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed diff --git a/eng/Versions.props b/eng/Versions.props index fe26ed8e8a3b..84d9e523ff6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.6-servicing.24266.2 + 8.0.7-servicing.24269.16 - 8.0.7-servicing.24267.12 + 8.0.7-servicing.24270.8 @@ -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.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,24 +79,24 @@ 8.0.302 - 8.0.302-servicing.24268.2 - 8.0.302-servicing.24268.2 + 8.0.302-servicing.24271.15 + 8.0.302-servicing.24271.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24265.5 + 4.10.0-3.24269.2 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.14 - 8.0.7-servicing.24267.24 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.14 + 8.0.7-servicing.24270.14 8.0.7 8.0.7 8.0.7 @@ -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.15 + 8.0.7-servicing.24270.15 + 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 595f34665bbad14edc32850d12216a3726b07078 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 21 May 2024 19:12:21 +0000 Subject: [PATCH 07/22] Merged PR 39888: [ internal/release/8.0.3xx] 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 84d9e523ff6f..7ac819d27342 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 00573c2d013e0361e74d162505285c64f012b9e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 19:49:04 +0000 Subject: [PATCH 08/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 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 | 12 ++++++------ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e65b6cd815a..180a12c0749c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -49,11 +49,11 @@ - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af3066d72779..3e77b5c3dffd 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 - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + 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 7ac819d27342..511754cacba0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,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.302 - 8.0.302-servicing.24271.15 - 8.0.302-servicing.24271.15 + 8.0.302-servicing.24271.21 + 8.0.302-servicing.24271.21 $(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 c2717c816fd0d4a0247f7a5f7345d8915427aad5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 23:24:52 +0000 Subject: [PATCH 09/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24269.2 -> To Version 4.10.0-3.24271.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 180a12c0749c..30954eefe557 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,8 @@ - - + + @@ -49,8 +49,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e77b5c3dffd..4a1bcd58e331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - d963055bb8326039f6083ee1f08648b10db1b887 + 698bc7ffa21da8de7704787bc973471cbc8937bb diff --git a/eng/Versions.props b/eng/Versions.props index 511754cacba0..147da6a1e784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.302 - 8.0.302-servicing.24271.21 - 8.0.302-servicing.24271.21 + 8.0.302-servicing.24271.30 + 8.0.302-servicing.24271.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24269.2 + 4.10.0-3.24271.3 From a3ad6ce2b24613bd34cfc8565e512111a9cd97af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 May 2024 00:57:40 +0000 Subject: [PATCH 10/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24269.2 -> To Version 4.10.0-3.24271.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30954eefe557..17ad8dca77ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,8 @@ - - + + @@ -49,8 +49,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1bcd58e331..e3275ef1207f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 147da6a1e784..7f60c21ebca8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24271.30 - 8.0.302-servicing.24271.30 + 8.0.302-servicing.24271.32 + 8.0.302-servicing.24271.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6205e55a3f9f8433ff3db1790d352611d82e5099 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 24 May 2024 22:51:54 +0000 Subject: [PATCH 11/22] Merged PR 39965: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240524.16 - **Date Produced**: May 24, 2024 10:25:08 PM UTC - **Commit**: 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.302 to 8.0.302][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] - **Microsoft.NET.Sdk**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb0151bd70a1495bbf6875dcb45d00b4234ae3486&targetVersion=GC0a9e1fea7508a0e2595b27a2d3facad9f44f59ac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) --- NuGet.config | 37 ++++++++++++++++++++++++++++++++----- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17ad8dca77ce..cc305febd51b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,39 @@ + + + + + + + + + + + + - + + + + - - + + @@ -44,15 +59,27 @@ + + + + + + + + - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3275ef1207f..e2f869c32087 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7f60c21ebca8..508ea9c0208b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24271.32 - 8.0.302-servicing.24271.32 + 8.0.302-servicing.24274.16 + 8.0.302-servicing.24274.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 08eff8177d020e76e93338bbb5b07b81a1320862 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 12 Jun 2024 02:59:22 +0000 Subject: [PATCH 12/22] Merged PR 40091: Revert '[ internal/release/8.0.3xx] always subtract one from template versions.' Updated Versions.props - always subtract one from template versions. Reverts !39888 --- eng/Versions.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dbcfea7ec4ad..a1b710645435 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,9 +141,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 c4de72858f4017ef84293b0532017d0e54df8f76 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 23:36:04 +0000 Subject: [PATCH 13/22] Merged PR 40332: [internal/release/8.0.3xx] 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.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24306.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24306.5 (parent: Microsoft.NET.Sdk) - **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.WindowsDesktop.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (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.... --- NuGet.config | 50 ++++++-------------------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc305febd51b..a0801e78871d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,40 +7,24 @@ - - - - - + - - - - - + - - - - - + - - - - - + - - + + @@ -59,28 +43,16 @@ - - - - - + - - - - - + - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 257e82a65b84..3e7955e01972 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 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + 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 - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 - + https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 diff --git a/eng/Versions.props b/eng/Versions.props index a1b710645435..0806cfdb9057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,20 +67,20 @@ 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 - 8.0.302 - 8.0.302-servicing.24274.16 - 8.0.302-servicing.24274.16 + 8.0.303 + 8.0.303-servicing.24312.14 + 8.0.303-servicing.24312.14 $(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 @@ -105,8 +105,8 @@ - 8.0.7-servicing.24271.4 - 8.0.7-servicing.24271.4 + 8.0.7-servicing.24306.5 + 8.0.7-servicing.24306.5 8.0.7 8.0.7 From 4e6fa5f10b3e44832e3bc40f17f9e1dd052c9ef8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 16:21:39 +0000 Subject: [PATCH 14/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 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 | 18 ++++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++------ 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0801e78871d..b5d7e921e056 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,21 @@ - + - + - + - - + + @@ -46,13 +46,13 @@ - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e7955e01972..da799a6cdef3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 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 - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + 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://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee - + https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee diff --git a/eng/Versions.props b/eng/Versions.props index c455a98eb099..005fad2d64de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,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.303 - 8.0.303-servicing.24312.14 - 8.0.303-servicing.24312.14 + 8.0.303-servicing.24313.11 + 8.0.303-servicing.24313.11 $(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.24306.5 - 8.0.7-servicing.24306.5 + 8.0.7-servicing.24312.4 + 8.0.7-servicing.24312.4 8.0.7 8.0.7 From 218917dda3bc2e29a07d08341c440d691be4c564 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 21:50:22 +0000 Subject: [PATCH 15/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 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 | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5d7e921e056..694048ce8b84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -43,13 +43,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da799a6cdef3..42328e301b32 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 - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 005fad2d64de..2819f3f9778c 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.303 - 8.0.303-servicing.24313.11 - 8.0.303-servicing.24313.11 + 8.0.303-servicing.24313.24 + 8.0.303-servicing.24313.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 017eda697ea41660b232f737605f8db9cd6aeb86 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 02:44:19 +0000 Subject: [PATCH 16/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 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 | 18 +++++------ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 694048ce8b84..3b96e0e12c86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,10 @@ - + - + @@ -20,11 +20,11 @@ - + - - + + @@ -43,13 +43,13 @@ - + - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42328e301b32..f2fe998a1963 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,55 +52,55 @@ 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 - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d - + https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d diff --git a/eng/Versions.props b/eng/Versions.props index 2819f3f9778c..f29f82e55655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24313.24 - 8.0.303-servicing.24313.24 + 8.0.303-servicing.24313.43 + 8.0.303-servicing.24313.43 $(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 fceba14b2d7edb0934494f04715934efc522d0d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 18:43:35 +0000 Subject: [PATCH 17/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 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 | 16 ++++++------ eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b96e0e12c86..990b04795e5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + @@ -23,8 +23,8 @@ - - + + @@ -43,16 +43,16 @@ - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74a5e55c991d..ef3985acfbf4 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 - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + 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 8378a5dc9894..cb6c4227718e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,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.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.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 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24313.43 - 8.0.303-servicing.24313.43 + 8.0.303-servicing.24314.7 + 8.0.303-servicing.24314.7 $(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 9db0dc5e198b2388040c91063727ef483365e1f0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 14 Jun 2024 20:03:23 +0000 Subject: [PATCH 18/22] Merged PR 40465: Exclude System.Threading.Tasks.Dataflow.8.0.0 reporting Applies the same change as https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/40325 --- eng/SourceBuildPrebuiltBaseline.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0b2b78fe8a50..bf27fdb5ff90 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -17,5 +17,7 @@ + + From f6e91b4cdde3b13c20924d65489f5048380ae8ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 21:51:36 +0000 Subject: [PATCH 19/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 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 | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 990b04795e5f..69255731b501 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -43,13 +43,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef3985acfbf4..82af95ca2271 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 - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cb6c4227718e..d2f316c30a1f 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.303 - 8.0.303-servicing.24314.7 - 8.0.303-servicing.24314.7 + 8.0.303-servicing.24314.15 + 8.0.303-servicing.24314.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2cb1516518102054be6f583a0a21b16480ed53e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 23:26:06 +0000 Subject: [PATCH 20/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24228.1 -> To Version 12.8.301-beta.24271.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69255731b501..7fa3a8688ce7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82af95ca2271..099dcef0e418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b https://github.com/dotnet/test-templates @@ -132,27 +132,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 43bb8cc831c2658e1117415019264bfe6f644f94 - + https://github.com/dotnet/fsharp - dd749058c91585e9b5dae62b0f8df892429ee28f + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/dotnet/fsharp - dd749058c91585e9b5dae62b0f8df892429ee28f + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 83d73f783bf54c336d1eab04a53d554f8a6c0b19 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 698bc7ffa21da8de7704787bc973471cbc8937bb + + https://github.com/dotnet/roslyn + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 diff --git a/eng/Versions.props b/eng/Versions.props index d2f316c30a1f..054f15018119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.303 - 8.0.303-servicing.24314.15 - 8.0.303-servicing.24314.15 + 8.0.303-servicing.24314.22 + 8.0.303-servicing.24314.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24271.3 + 4.10.0-3.24312.19 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24203-04 + 17.10.0-release-24272-11 8.0.0-alpha.1.22557.12 From fdaac0e5c353be06834d4963c4eca6b071bfddd8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jun 2024 17:56:22 +0000 Subject: [PATCH 21/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240617.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24314.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7fa3a8688ce7..fe0022aab809 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 099dcef0e418..bbe4b359d437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea diff --git a/eng/Versions.props b/eng/Versions.props index 054f15018119..8b55f55505cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.303 - 8.0.303-servicing.24314.22 - 8.0.303-servicing.24314.22 + 8.0.303-servicing.24317.6 + 8.0.303-servicing.24317.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24312.19 + 4.10.0-3.24314.14 From df7720b2757ffb3cd86ebdff82924c751e575536 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 9 Jul 2024 22:53:15 -0700 Subject: [PATCH 22/22] Revert nuget.config --- NuGet.config | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9a356e15eb3..13469989c405 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,10 @@ - - - @@ -21,11 +18,8 @@ - - - @@ -44,16 +38,11 @@ - - - - -