From 0e871de888073e5c7e8ead66d79e396fe416f663 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Mar 2025 05:03:05 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/razor build 20250323.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25171.5 -> To Version 9.0.0-preview.25173.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed0307d33420..c721105e4865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://github.com/dotnet/razor 443b51a21b53441ececf4d7d12f764165d0623e8 - + https://github.com/dotnet/razor 443b51a21b53441ececf4d7d12f764165d0623e8 - + https://github.com/dotnet/razor 443b51a21b53441ececf4d7d12f764165d0623e8 - + https://github.com/dotnet/razor 443b51a21b53441ececf4d7d12f764165d0623e8 diff --git a/eng/Versions.props b/eng/Versions.props index e588e0acf08b..1f438c36334c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -230,9 +230,9 @@ - 9.0.0-preview.25171.5 - 9.0.0-preview.25171.5 - 9.0.0-preview.25171.5 + 9.0.0-preview.25173.4 + 9.0.0-preview.25173.4 + 9.0.0-preview.25173.4 From 7ee08d9237ebb8343e12144cda51b84c60ab2471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Mar 2025 05:02:09 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/razor build 20250324.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25173.4 -> To Version 9.0.0-preview.25174.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c721105e4865..74e37ced51c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://github.com/dotnet/razor - 443b51a21b53441ececf4d7d12f764165d0623e8 + 6926f63684c09f79efc0cb7ba4d86e835955a19d - + https://github.com/dotnet/razor - 443b51a21b53441ececf4d7d12f764165d0623e8 + 6926f63684c09f79efc0cb7ba4d86e835955a19d - + https://github.com/dotnet/razor - 443b51a21b53441ececf4d7d12f764165d0623e8 + 6926f63684c09f79efc0cb7ba4d86e835955a19d - + https://github.com/dotnet/razor - 443b51a21b53441ececf4d7d12f764165d0623e8 + 6926f63684c09f79efc0cb7ba4d86e835955a19d diff --git a/eng/Versions.props b/eng/Versions.props index 1f438c36334c..8c0e8c8f3feb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -230,9 +230,9 @@ - 9.0.0-preview.25173.4 - 9.0.0-preview.25173.4 - 9.0.0-preview.25173.4 + 9.0.0-preview.25174.2 + 9.0.0-preview.25174.2 + 9.0.0-preview.25174.2 From 67f12f09e4496941239b58c6eeaba07c9f07823b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Mar 2025 05:02:57 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/roslyn build 20250324.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25171.27 -> To Version 4.14.0-3.25174.10 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c721105e4865..8942083f4b52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 345742da75dc6c5fe485ef1236d3f034ebcdcb53 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 - + https://github.com/dotnet/roslyn - 1def752c5d33903795069ccddb78599ba6da39d3 + 932542a7772fee6d5a6640b241ef8eae98718180 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1f438c36334c..461861219110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,14 +203,14 @@ - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 - 4.14.0-3.25171.27 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 + 4.14.0-3.25174.10 From 2b56e8dbc03ab5e84b61e8667eb05c2b349d2d35 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 25 Mar 2025 14:52:53 -0700 Subject: [PATCH 4/4] Do not show VS workloads from an old version Fixes #47794 (#47809) Fixes #47794 I ported the changes over to main for actual testing, hence this being targeted at 9.0.3xx but mentioning a 10.0- feature band. Without the change: Workload version: 10.0.100-manifests.7ab2c471 Installed Workload Id Manifest Version Installation Source ----------------------------------------------------------------------------------------------- android 35.99.0-preview.1.140/10.0.100-preview.1 VS 17.14.35824.293 aspire 8.2.2/8.0.100 VS 17.14.35824.293 ios 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 maccatalyst 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 macos 15.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 maui-windows 10.0.0-preview.1.25122.6/10.0.100-preview.1 VS 17.14.35824.293 tvos 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 wasm-tools 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net6 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net7 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net8 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 Use `dotnet workload search` to find additional workloads to install. With the change: Installed Workload Id Manifest Version Installation Source -------------------------------------------------------------------- Use `dotnet workload search` to find additional workloads to install. (I hadn't installed any workloads at that point, so empty is correct.) I then installed wasm-tools and ran it again and got this result: Installed Workload Id Manifest Version Installation Source ----------------------------------------------------------------------------------------------- wasm-tools 10.0.0-preview.3.25167.9/10.0.100-preview.3 SDK 10.0.100 Use `dotnet workload search` to find additional workloads to install. --- src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs index 6c828ccf3337..f8a248d62023 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs @@ -79,7 +79,7 @@ public InstalledWorkloadsCollection AddInstalledVsWorkloads(IEnumerable