diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj index 4aeac077f070..042b02c5f7c7 100644 --- a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj +++ b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj @@ -1,10 +1,12 @@ + + - net6.0 + $(MiddlewareTargetFrameworkV6) true MicrosoftAspNetCore diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj index 1d7658b6415e..8d20e8bef666 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj @@ -1,19 +1,20 @@  + + - net6.0;$(NetCurrent) + $(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10) MicrosoftAspNetCore true - + diff --git a/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj b/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj index 0944fd4171ba..33a8c8cf8d90 100644 --- a/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj +++ b/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj @@ -1,13 +1,14 @@  + - net6.0;$(NetCurrent) + $(AgentTargetFrameworkV6);$(AgentTargetFrameworkV10) true false @@ -27,7 +28,7 @@ - + diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj index d44f61dd98ca..39c923c17161 100644 --- a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj +++ b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj @@ -1,10 +1,11 @@  + - net6.0 + $(AgentTargetFrameworkV6) false none false diff --git a/src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs b/src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs index 01d004c69268..7a205a8d1fce 100644 --- a/src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs +++ b/src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs @@ -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"); } diff --git a/src/BuiltInTools/Watch/RuntimeDependencies.props b/src/BuiltInTools/Watch/RuntimeDependencies.props index 31f404503f25..45b8138bed6a 100644 --- a/src/BuiltInTools/Watch/RuntimeDependencies.props +++ b/src/BuiltInTools/Watch/RuntimeDependencies.props @@ -1,11 +1,13 @@ + + None true false TargetFramework;TargetFrameworks - hotreload\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll + hotreload\$(MiddlewareTargetFrameworkV6)\Microsoft.AspNetCore.Watch.BrowserRefresh.dll PreserveNewest + + + net6.0 + + + net10.0 + + + net6.0 + + diff --git a/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj b/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj index 5bdde90926bf..f0c45e354c83 100644 --- a/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj +++ b/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj @@ -1,11 +1,12 @@  + - net6.0 + $(MiddlewareTargetFrameworkV6) true false diff --git a/test/TestAssets/TestProjects/WatchApp60/Program.cs b/test/TestAssets/TestProjects/WatchApp60/Program.cs deleted file mode 100644 index 5e164b48f9d7..000000000000 --- a/test/TestAssets/TestProjects/WatchApp60/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using System.Threading; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Started"); - // Process ID is insufficient because PID's may be reused. - Console.WriteLine($"Process identifier = {Process.GetCurrentProcess().Id}, {Guid.NewGuid()}"); - if (args.Length > 0 && args[0] == "--no-exit") - { - Thread.Sleep(Timeout.Infinite); - } - Console.WriteLine("Exiting"); - } - } -} diff --git a/test/TestAssets/TestProjects/WatchApp60/WatchApp60.csproj b/test/TestAssets/TestProjects/WatchApp60/WatchApp60.csproj deleted file mode 100644 index f9ba9848ae6d..000000000000 --- a/test/TestAssets/TestProjects/WatchApp60/WatchApp60.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - net6.0 - exe - - -