Skip to content

Fix pinned dotnet-watch TFMs #52517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmat merged 2 commits into from
Jan 21, 2026
Merged

Fix pinned dotnet-watch TFMs #52517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c41dd20
Fixed pinned dotnet-watch TFMs
tmat Jan 16, 2026
066e4e4
Merge branch 'main' into HRTFM
tmat Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Watch\TargetFrameworks.props"/>

<PropertyGroup>
<!--
This assembly may be loaded .NET 6.0+ web server.
When updating the TFM also update minimal supported version in dotnet-watch.csproj and WebApplicationAppModel.cs.
When adding new TFM also update versions in dotnet-watch.csproj and WebApplicationAppModel.cs.
-->
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>$(MiddlewareTargetFrameworkV6)</TargetFramework>
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>

<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
Expand Down
9 changes: 5 additions & 4 deletions src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Watch\TargetFrameworks.props"/>

<PropertyGroup>
<!--
dotnet-watch may inject this assembly to .NET 6.0+ app.

When updating these also update ProjectReferences in dotnet-watch.csproj
When adding new TFM also update ProjectReferences in dotnet-watch.csproj
and HotReloadAppModel.TryGetStartupHookPath.
-->
<TargetFrameworks>net6.0;$(NetCurrent)</TargetFrameworks>
<TargetFrameworks>$(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10)</TargetFrameworks>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
</PropertyGroup>

<!-- Reference 6.0.0 targeting packs in Source Build -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == '$(AgentTargetFrameworkV6)'">
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
</ItemGroup>

Expand Down
7 changes: 4 additions & 3 deletions src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Watch\TargetFrameworks.props"/>

<PropertyGroup>
<!--
This code may be injected into a .NET 6.0+ app.

When updating these also update ProjectReferences in dotnet-watch.csproj
When adding new TFM also update ProjectReferences in dotnet-watch.csproj
and HotReloadAppModel.TryGetStartupHookPath.
-->
<TargetFrameworks>net6.0;$(NetCurrent)</TargetFrameworks>
<TargetFrameworks>$(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10)</TargetFrameworks>
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>

<GenerateDocumentationFile>false</GenerateDocumentationFile>
Expand All @@ -27,7 +28,7 @@
</PropertyGroup>

<!-- Reference 6.0.0 targeting packs in Source Build -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == '$(AgentTargetFrameworkV6)'">
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Watch\TargetFrameworks.props"/>

<PropertyGroup>
<!--
Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.
-->
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>$(AgentTargetFrameworkV6)</TargetFramework>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<DebugType>none</DebugType>
<GenerateDependencyFile>false</GenerateDependencyFile>
Expand Down
2 changes: 1 addition & 1 deletion src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected static string GetInjectedAssemblyPath(string targetFramework, string a

public static string GetStartupHookPath(ProjectGraphNode project)
{
var hookTargetFramework = project.GetTargetFrameworkVersion() is { Major: >= 11 } ? "net11.0" : "net6.0";
var hookTargetFramework = project.GetTargetFrameworkVersion() is { Major: >= 10 } ? "net10.0" : "net6.0";
return GetInjectedAssemblyPath(hookTargetFramework, "Microsoft.Extensions.DotNetDeltaApplier");
}

Expand Down
12 changes: 7 additions & 5 deletions src/BuiltInTools/Watch/RuntimeDependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)TargetFrameworks.props" />

<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj">
<OutputItemType>None</OutputItemType>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
<TargetPath>hotreload\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll</TargetPath>
<TargetPath>hotreload\$(MiddlewareTargetFrameworkV6)\Microsoft.AspNetCore.Watch.BrowserRefresh.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

<!--
Expand All @@ -19,8 +21,8 @@
<OutputItemType>None</OutputItemType>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetTargetFramework>TargetFramework=$(NetCurrent)</SetTargetFramework>
<TargetPath>hotreload\$(NetCurrent)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
<SetTargetFramework>TargetFramework=$(AgentTargetFrameworkV10)</SetTargetFramework>
<TargetPath>hotreload\$(AgentTargetFrameworkV10)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Pack>false</Pack>
</ProjectReference>
Expand All @@ -29,8 +31,8 @@
<OutputItemType>None</OutputItemType>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
<TargetPath>hotreload\net6.0\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
<SetTargetFramework>TargetFramework=$(AgentTargetFrameworkV6)</SetTargetFramework>
<TargetPath>hotreload\$(AgentTargetFrameworkV6)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Pack>false</Pack>
</ProjectReference>
Expand Down
15 changes: 15 additions & 0 deletions src/BuiltInTools/Watch/TargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>
<!--
!!! Intentionally fixed versions. Do not update to the latest. !!!
-->
<PropertyGroup>
<!-- Used for assemblies injected to apps targeting .NET 6.0 - .NET 9.0. -->
<AgentTargetFrameworkV6>net6.0</AgentTargetFrameworkV6>

<!-- Used for assemblies injected to apps targeting .NET 10.0+ -->
<AgentTargetFrameworkV10>net10.0</AgentTargetFrameworkV10>

<!-- Used for assemblies injected to web apps targeting .NET 6.0+ -->
<MiddlewareTargetFrameworkV6>net6.0</MiddlewareTargetFrameworkV6>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Watch\TargetFrameworks.props"/>

<PropertyGroup>
<!--
This source code may be loaded by a .NET 6.0+ web server.
When updating the TFM also update minimal supported version in dotnet-watch.csproj and WebApplicationAppModel.cs.
-->
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>$(MiddlewareTargetFrameworkV6)</TargetFrameworks>
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>

<GenerateDocumentationFile>false</GenerateDocumentationFile>
Expand Down
24 changes: 0 additions & 24 deletions test/TestAssets/TestProjects/WatchApp60/Program.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions test/TestAssets/TestProjects/WatchApp60/WatchApp60.csproj
View file
Open in desktop

This file was deleted.