Skip to content

Commit c41dd20

Browse files
tmattmat
committed
Fixed pinned dotnet-watch TFMs
1 parent 256a6cd commit c41dd20

File tree

10 files changed

+40
-49
lines changed

10 files changed

+40
-49
lines changed

‎src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Watch\TargetFrameworks.props"/>
3+
24
<PropertyGroup>
35
<!--
46
This assembly may be loaded .NET 6.0+ web server.
5-
When updating the TFM also update minimal supported version in dotnet-watch.csproj and WebApplicationAppModel.cs.
7+
When adding new TFM also update versions in dotnet-watch.csproj and WebApplicationAppModel.cs.
68
-->
7-
<TargetFramework>net6.0</TargetFramework>
9+
<TargetFramework>$(MiddlewareTargetFrameworkV6)</TargetFramework>
810
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
911

1012
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

‎src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Watch\TargetFrameworks.props"/>
3+
24
<PropertyGroup>
35
<!--
46
dotnet-watch may inject this assembly to .NET 6.0+ app.
5-
6-
When updating these also update ProjectReferences in dotnet-watch.csproj
7+
When adding new TFM also update ProjectReferences in dotnet-watch.csproj
78
and HotReloadAppModel.TryGetStartupHookPath.
89
-->
9-
<TargetFrameworks>net6.0;$(NetCurrent)</TargetFrameworks>
10+
<TargetFrameworks>$(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10)</TargetFrameworks>
1011
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1112

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

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

‎src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Watch\TargetFrameworks.props"/>
23

34
<PropertyGroup>
45
<!--
56
This code may be injected into a .NET 6.0+ app.
67
7-
When updating these also update ProjectReferences in dotnet-watch.csproj
8+
When adding new TFM also update ProjectReferences in dotnet-watch.csproj
89
and HotReloadAppModel.TryGetStartupHookPath.
910
-->
10-
<TargetFrameworks>net6.0;$(NetCurrent)</TargetFrameworks>
11+
<TargetFrameworks>$(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10)</TargetFrameworks>
1112
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
1213

1314
<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -27,7 +28,7 @@
2728
</PropertyGroup>
2829

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

‎src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Watch\TargetFrameworks.props"/>
23

34
<PropertyGroup>
45
<!--
56
Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.
67
-->
7-
<TargetFramework>net6.0</TargetFramework>
8+
<TargetFramework>$(AgentTargetFrameworkV6)</TargetFramework>
89
<GenerateDocumentationFile>false</GenerateDocumentationFile>
910
<DebugType>none</DebugType>
1011
<GenerateDependencyFile>false</GenerateDependencyFile>

‎src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected static string GetInjectedAssemblyPath(string targetFramework, string a
1616

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

‎src/BuiltInTools/Watch/RuntimeDependencies.props‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)TargetFrameworks.props" />
3+
24
<ItemGroup>
35
<ProjectReference Include="$(MSBuildThisFileDirectory)..\BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj">
46
<OutputItemType>None</OutputItemType>
57
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
68
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
79
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
8-
<TargetPath>hotreload\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll</TargetPath>
10+
<TargetPath>hotreload\$(MiddlewareTargetFrameworkV6)\Microsoft.AspNetCore.Watch.BrowserRefresh.dll</TargetPath>
911
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1012

1113
<!--
@@ -19,8 +21,8 @@
1921
<OutputItemType>None</OutputItemType>
2022
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2123
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
22-
<SetTargetFramework>TargetFramework=$(NetCurrent)</SetTargetFramework>
23-
<TargetPath>hotreload\$(NetCurrent)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
24+
<SetTargetFramework>TargetFramework=$(AgentTargetFrameworkV10)</SetTargetFramework>
25+
<TargetPath>hotreload\$(AgentTargetFrameworkV10)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
2426
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2527
<Pack>false</Pack>
2628
</ProjectReference>
@@ -29,8 +31,8 @@
2931
<OutputItemType>None</OutputItemType>
3032
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3133
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
32-
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
33-
<TargetPath>hotreload\net6.0\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
34+
<SetTargetFramework>TargetFramework=$(AgentTargetFrameworkV6)</SetTargetFramework>
35+
<TargetPath>hotreload\$(AgentTargetFrameworkV6)\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
3436
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3537
<Pack>false</Pack>
3638
</ProjectReference>

‎src/BuiltInTools/Watch/TargetFrameworks.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<!--
3+
!!! Intentionally fixed versions. Do not update to the latest. !!!
4+
-->
5+
<PropertyGroup>
6+
<!-- Used for assemblies injected to apps targeting .NET 6.0 - .NET 9.0. -->
7+
<AgentTargetFrameworkV6>net6.0</AgentTargetFrameworkV6>
8+
9+
<!-- Used for assemblies injected to apps targeting .NET 10.0+ -->
10+
<AgentTargetFrameworkV10>net10.0</AgentTargetFrameworkV10>
11+
12+
<!-- Used for assemblies injected to web apps targeting .NET 6.0+ -->
13+
<MiddlewareTargetFrameworkV6>net6.0</MiddlewareTargetFrameworkV6>
14+
</PropertyGroup>
15+
</Project>

‎src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Watch\TargetFrameworks.props"/>
23

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

1112
<GenerateDocumentationFile>false</GenerateDocumentationFile>

‎test/TestAssets/TestProjects/WatchApp60/Program.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎test/TestAssets/TestProjects/WatchApp60/WatchApp60.csproj‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)