Skip to content

Commit 5818402

Browse files
authored
Target DotNetDeltaApplier to net6.0 (#49543)
1 parent 401ace4 commit 5818402

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
55
<PropertyGroup>
66
<!--
7-
dotnet-watch may inject this assembly to .NET 6.0+ app, so we can't target a newer version.
8-
At the same time source build requires us to not target 6.0, so we fall back to netstandard.
7+
dotnet-watch may inject this assembly to .NET 6.0+ app.
98
10-
When updating these also update ProjectReferences in dotnet-watch.csproj.
11-
-->
12-
<TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
9+
When updating these also update ProjectReferences in dotnet-watch.csproj
10+
and HotReloadAppModel.TryGetStartupHookPath.
11+
-->
12+
<TargetFrameworks>net6.0;net10.0</TargetFrameworks>
1313
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1414

1515
<!-- NuGet -->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<PropertyGroup>
33
<!--
44
Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.
5-
At the same time source build requires us to not target 6.0, so we fall back to netstandard.
65
-->
7-
<TargetFramework>netstandard2.1</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
87
<GenerateDocumentationFile>false</GenerateDocumentationFile>
98
<DebugType>none</DebugType>
109
<GenerateDependencyFile>false</GenerateDependencyFile>

src/BuiltInTools/dotnet-watch/HotReload/AppModels/HotReloadAppModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public bool TryGetStartupHookPath([NotNullWhen(true)] out string? path)
2626
var hookTargetFramework = agentInjectionProject.GetTargetFramework() switch
2727
{
2828
// Note: Hot Reload is only supported on net6.0+
29-
"net6.0" or "net7.0" or "net8.0" or "net9.0" => "netstandard2.1",
29+
"net6.0" or "net7.0" or "net8.0" or "net9.0" => "net6.0",
3030
_ => "net10.0",
3131
};
3232

src/BuiltInTools/dotnet-watch/dotnet-watch.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<OutputItemType>Content</OutputItemType>
6868
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6969
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
70-
<SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
71-
<TargetPath>hotreload\netstandard2.1\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
70+
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
71+
<TargetPath>hotreload\net6.0\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
7272
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7373
</ProjectReference>
7474
</ItemGroup>

0 commit comments

Comments
 (0)