Skip to content

Conversation

@dsplaisted
Copy link
Member

Fixed version of #51720, where I merged incorrectly.

dotnet-maestro bot and others added 30 commits October 23, 2025 02:04
…251021.2

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25520.2 -> To Version 2.1.0-preview.25521.2
MSTest From Version 4.1.0-preview.25520.2 -> To Version 4.1.0-preview.25521.2
…251023.1

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25521.2 -> To Version 2.1.0-preview.25523.1
MSTest From Version 4.1.0-preview.25521.2 -> To Version 4.1.0-preview.25523.1
… merge/release/10.0.1xx-to-release/10.0.2xx
… merge/release/10.0.1xx-to-release/10.0.2xx
…251104.7

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25554.7
MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25554.7
Updated Dependencies:
Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25502.107 -> 10.0.0-preview.25556.109)
Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25502-107 -> 18.1.0-preview-25556-109)
Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-rc.307 -> 7.0.0-preview.2.5709)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25502.107 -> 5.3.0-1.25556.109)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25522.2 -> 10.0.0-beta.25556.109)
Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25502.107 -> 15.0.200-servicing.25556.109)
Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.2.25502.107 -> 10.0.100-rc.2.25556.109)

Added Dependencies:
Microsoft.CodeAnalysis.ExternalAccess.HotReload (Version 5.3.0-1.25556.109)
…251107.4

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25557.4
MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25557.4
dotnet-maestro bot and others added 11 commits November 12, 2025 02:02
…251111.13

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25561.13
MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25561.13
…51443)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com>
…251111.14

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25561.13 -> To Version 2.1.0-preview.25561.14
MSTest From Version 4.1.0-preview.25561.13 -> To Version 4.1.0-preview.25561.14
# Conflicts:
#	eng/Version.Details.props
#	eng/Version.Details.xml
#	global.json
#	src/RazorSdk/Tool/GenerateCommand.cs
Copilot AI review requested due to automatic review settings November 14, 2025 00:17
@dsplaisted dsplaisted requested review from a team and tmat as code owners November 14, 2025 00:17
@github-actions github-actions bot added the Area-AspNetCore RazorSDK, BlazorWebAssemblySDK, dotnet-watch label Nov 14, 2025
Copilot finished reviewing on behalf of dsplaisted November 14, 2025 00:19
@dotnet-policy-service
Copy link
Contributor

Thanks for your PR, @@dsplaisted.
To learn about the PR process and branching schedule of this repo, please take a look at the SDK PR Guide.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges the release/10.0.2xx branch into main, representing a significant refactoring of the dotnet-watch functionality. The changes extract shared watch/hot-reload functionality into reusable library projects, add support for Aspire-based watching, and update various dependencies.

Key changes:

  • Extraction of watch functionality into new Microsoft.DotNet.HotReload.Watch library project
  • Addition of Microsoft.DotNet.HotReload.Watch.Aspire tool package for Aspire CLI support
  • Creation of shared test utilities project (Microsoft.DotNet.HotReload.Test.Utilities)
  • Update to use Microsoft.CodeAnalysis.ExternalAccess.HotReload API (replacing the Watch-specific API)
  • Package updates including Microsoft.Build.Locator (1.8.1 → 1.10.2) and MSBuild minimum version
  • Removal of VS SDK dependencies

Reviewed Changes

Copilot reviewed 75 out of 120 changed files in this pull request and generated no comments.

Show a summary per file
File Description
test/dotnet-watch.Tests/dotnet-watch.Tests.csproj Updated project references and fixed comment typo
test/dotnet-watch.Tests/TestUtilities/WatchableApp.cs Updated AwaitableProcess API usage
test/dotnet-watch.Tests/TestUtilities/TestOptions.cs Moved GetWatchTestOutputPath to shared utilities
test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs Removed build property parsing tests (moved to BuildUtilitiesTests)
test/dotnet-watch.Tests/Build/BuildUtilitiesTests.cs New test file for BuildUtilities.ParseBuildProperties
test/TestAssets/TestProjects/*/Program.cs Added pragma warnings for obsolete API usage
test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj Updated AssertEx.cs reference to shared utilities
test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs Updated method reference from AppHostCompilerFileName to DotNetExecCompilerFileName
test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj Updated references to shared test utilities
test/Microsoft.DotNet.HotReload.Client.Tests/Microsoft.DotNet.HotReload.Client.Tests.csproj Updated AssertEx.cs reference
test/Microsoft.DotNet.HotReload.Test.Utilities/* New shared test utilities project
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/* New test project for Aspire watch functionality
test/Common/Program.cs Namespace reorganization
src/RazorSdk/Tool/GenerateCommand.cs Added missing System.Threading using
src/Cli/dotnet/Commands/xlf/*.xlf Updated localization files with needs-review-translation state
src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs Added warning 8002 to nowarn list
src/Cli/dotnet/Commands/CliCommandStrings.resx Updated ProjectConvertAskForOutputDirectory message
src/BuiltInTools/dotnet-watch/* Refactored to use new Watch library
src/BuiltInTools/Watch/* New library project with extracted watch functionality
src/BuiltInTools/Watch.Aspire/* New Aspire-specific watch tool
src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj Added DisableTransitiveFrameworkReferenceDownloads property
sdk.slnx, dotnet-watch.slnf Added new projects to solution files
eng/Versions.props Updated MSBuild and MSBuild.Locator versions, removed VS SDK
eng/Signing.props Removed StreamJsonRpc.dll signing entry
eng/Publishing.props Added workload MSI internal publishing configuration
NuGet.config Removed vssdk package sources
Directory.Packages.props Added HotReload external access package, removed VS SDK packages

@dsplaisted
Copy link
Member Author

@DonnaChen888 After talking with other members of my team it sounds like I may have given you some incorrect instructions around how to handle merges between branches and what files to ignore. So take what I said with a grain of salt, and you may not want to change how you were doing things.

I think I may have figured out how to do the branch merge this PR now , we'll see how it goes.

@dsplaisted
Copy link
Member Author

@jjonescz @dotnet/run-file Can someone fix the Microsoft.DotNet.Cli.Run.Tests.RunFileTests.CscArguments test? It looks like it's failing because there's an additional NoWarn for warning 8002.

@dotnet/roslyn @jaredpar Can someonne fix the Microsoft.NET.Build.Tests.RoslynBuildTaskTests.FullMSBuild_SdkStyle_ToolsetPackage test? It looks like it's failing because csc.dll and vbc.dll changed to csc.exe and vbc.exe.

Thanks!

@jjonescz
Copy link
Member

Can someone fix the Microsoft.DotNet.Cli.Run.Tests.RunFileTests.CscArguments test? It looks like it's failing because there's an additional NoWarn for warning 8002.

It's actually failing because the NoWarn is missing here; which seems unexpected (the most "up to date" state is that it should be present, that's why it was added in the 10.0.2xx branch in #51612 (comment)).

The reason is that roslyn version in 10.0.2xx is newer than in this flow, that seems wrong. Is this a bad merge?

Can someonne fix the Microsoft.NET.Build.Tests.RoslynBuildTaskTests.FullMSBuild_SdkStyle_ToolsetPackage test? It looks like it's failing because csc.dll and vbc.dll changed to csc.exe and vbc.exe.

I think this is failing for the same reason - the roslyn version in this branch is outdated.

<MicrosoftBuildPackageVersion>18.1.0-preview-25567-101</MicrosoftBuildPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>18.1.0-preview-25567-101</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildTasksGitPackageVersion>11.0.0-beta.25567.101</MicrosoftBuildTasksGitPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisPackageVersion>
Copy link
Member

@jjonescz jjonescz Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this version come from? Even though it's newer than the version in 10.0.2xx (which is 5.3.0-1.25562.107), this one seems to actually contain an older Roslyn version (and hence the tests are still failing). I think that's possible if multiple VMR branches build different versions of Roslyn or something like that. But if we choose only versions from VMR subscription PRs, I think that shouldn't be a problem. But I suspect you chose this version manually?

Suggested change
<MicrosoftCodeAnalysisPackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisPackageVersion>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jjonescz Thanks for looking. I ran darc update-dependencies --channel ".NET 11.0.1xx SDK" --source-repo dotnet/dotnet, which I thought would update to the correct versions from the VMR. Is there something else I should have done? Or have some Roslyn changes not merged to main in the VMR?

Copy link
Member

@jjonescz jjonescz Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right, I guess you did it correctly, but it's true that Roslyn didn't flow to VMR main yet. Although I think that's also blocked by the fact that changes from SDK 10.0.2xx didn't flow to VMR main yet (see dotnet/dotnet#3147 (comment)). So we are kinda in a deadlock here.

But I guess I can revert the test updates so the Roslyn tests will be passing for the old Roslyn version and then update them again for the new version when that's unblocked...

@dsplaisted
Copy link
Member Author

@dotnet/aspnet-blazor-eng @ericstj @rainersigwald A bunch of Blazor tests are failing with MissingMethodExceptions like this in full Framework builds:

"C:\h\w\AA5D0941\t\dotnetSdkTests\ih23pbdq.sng\Publish_Hoste---F07A04C5\classlibrarywithsatelliteassemblies\classlibrarywithsatelliteassemblies.csproj" (default target) (3:6) ->
(LoadStaticWebAssetsBuildManifest target) ->
obj\Debug\net10.0\staticwebassets.build.json : error : MissingMethodException: Method not found: '!!0 System.Text.Json.JsonSerializer.Deserialize(System.ReadOnlySpan1<Byte>, System.Text.Json.Serialization.Metadata.JsonTypeInfo1<!!0>)'. [C:\h\w\AA5D0941\t\dotnetSdkTests\ih23pbdq.sng\Publish_Hoste---F07A04C5\classlibrarywithsatelliteassemblies\classlibrarywithsatelliteassemblies.csproj]
obj\Debug\net10.0\staticwebassets.build.json : error :    at Microsoft.AspNetCore.StaticWebAssets.Tasks.StaticWebAssetsManifest.FromJsonBytes(Byte[] jsonBytes) [C:\h\w\AA5D0941\t\dotnetSdkTests\ih23pbdq.sng\Publish_Hoste---F07A04C5\classlibrarywithsatelliteassemblies\classlibrarywithsatelliteassemblies.csproj]
obj\Debug\net10.0\staticwebassets.build.json : error :    at Microsoft.AspNetCore.StaticWebAssets.Tasks.ReadStaticWebAssetsManifestFile.Execute() in /_/src/StaticWebAssetsSdk/Tasks/ReadStaticWebAssetsManifestFile.cs:line 52 [C:\h\w\AA5D0941\t\dotnetSdkTests\ih23pbdq.sng\Publish_Hoste---F07A04C5\classlibrarywithsatelliteassemblies\classlibrarywithsatelliteassemblies.csproj]
obj\Debug\net10.0\staticwebassets.build.json : error :  [C:\h\w\AA5D0941\t\dotnetSdkTests\ih23pbdq.sng\Publish_Hoste---F07A04C5\classlibrarywithsatelliteassemblies\classlibrarywithsatelliteassemblies.csproj]

The failure doesn't seem to repro locally for me, perhaps I have a newer version of VS with a newer version of System.Text.Json. Did this change recently?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-AspNetCore RazorSDK, BlazorWebAssemblySDK, dotnet-watch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants