[release/10.0] Switch back to net8.0 for tools (#37207)

Fixes #37201

Author: AndriySvyryd

src/EFCore.Tasks/EFCore.Tasks.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MSBuild tasks for Entity Framework Core projects.</Description>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetToolCurrent);net472</TargetFrameworks>
     <AssemblyName>Microsoft.EntityFrameworkCore.Tasks</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
     <IncludeSymbols>false</IncludeSymbols>
@@ -75,7 +75,8 @@
       <NuspecProperty Include="AssemblyName=$(AssemblyName)" />
       <NuspecProperty Include="OutputPath=$(OutputPath)" />
       <NuspecProperty Include="ArtifactsBinDir=$(ArtifactsBinDir)" />
-      <NuspecProperty Include="DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework)" />
+      <NuspecProperty Include="NetToolCurrent=$(NetToolCurrent)" />
+      <NuspecProperty Include="NetToolMinimum=$(NetToolMinimum)" />
       <NuspecProperty Include="Configuration=$(Configuration)" />
     </ItemGroup>
   </Target>

src/EFCore.Tasks/EFCore.Tasks.nuspec

@@ -4,7 +4,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework="$DefaultNetCoreTargetFramework$">
+      <group targetFramework="$NetToolCurrent$">
         <dependency id="Microsoft.EntityFrameworkCore.Design" version="$Version$" />
       </group>
     </dependencies>
@@ -13,11 +13,11 @@
   <files>
     $CommonFileElements$
     <file src="PACKAGE.md" target="docs\" />
-    <file src="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.dll" target="tasks\$DefaultNetCoreTargetFramework$\" />
-    <file src="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.pdb" target="tasks\$DefaultNetCoreTargetFramework$\" />
-    <file src="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.deps.json" target="tasks\$DefaultNetCoreTargetFramework$\" />
+    <file src="$OutputPath$$NetToolCurrent$\$AssemblyName$.dll" target="tasks\$NetToolCurrent$\" />
+    <file src="$OutputPath$$NetToolCurrent$\$AssemblyName$.pdb" target="tasks\$NetToolCurrent$\" />
+    <file src="$OutputPath$$NetToolCurrent$\$AssemblyName$.deps.json" target="tasks\$NetToolCurrent$\" />
     <file src="$OutputPath$net472\*" target="tasks\net472\" />
-    <file src="$ArtifactsBinDir$ef\$Configuration$\$DefaultNetCoreTargetFramework$\*" target="tools\$DefaultNetCoreTargetFramework$\" />
+    <file src="$ArtifactsBinDir$ef\$Configuration$\$NetToolMinimum$\*" target="tools\$NetToolCurrent$\" />
     <file src="buildTransitive\*" target="buildTransitive\" />
   </files>
 </package>

src/EFCore.Tools/EFCore.Tools.csproj

@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFramework>$(NetToolMinimum)</TargetFramework>
     <PackageId>Microsoft.EntityFrameworkCore.Tools</PackageId>
     <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

src/EFCore.Tools/tools/EntityFrameworkCore.psm1

@@ -1253,7 +1253,7 @@ function EF($project, $startupProject, $params, $applicationArgs, [switch] $skip
         $projectAssetsFile = GetCpsProperty $startupProject 'ProjectAssetsFile'
         $runtimeConfig = Join-Path $targetDir ($startupTargetName + '.runtimeconfig.json')
         $runtimeFrameworkVersion = GetCpsProperty $startupProject 'RuntimeFrameworkVersion'
-        $efPath = Join-Path $PSScriptRoot 'net10.0\any\ef.dll'
+        $efPath = Join-Path $PSScriptRoot 'net8.0\any\ef.dll'
 
         $dotnetParams = 'exec', '--depsfile', $depsFile
 

src/dotnet-ef/RootCommand.cs

@@ -168,10 +168,10 @@ protected override int Execute(string[] _)
                 args.Add(startupProject.RuntimeFrameworkVersion);
             }
 
-#if !NET10_0
+#if !NET8_0
 #error Target framework needs to be updated here, as well as in Microsoft.EntityFrameworkCore.Tasks.props and EntityFrameworkCore.psm1
 #endif
-            args.Add(Path.Combine(toolsPath, "net10.0", "any", "ef.dll"));
+            args.Add(Path.Combine(toolsPath, "net8.0", "any", "ef.dll"));
         }
         else if (targetFramework.Identifier == ".NETStandard")
         {

src/dotnet-ef/dotnet-ef.csproj

@@ -13,7 +13,7 @@
       dotnet ef database drop
       dotnet ef database update
     </Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFramework>$(NetToolMinimum)</TargetFramework>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
     <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers>

src/dotnet-ef/dotnet-ef.nuspec

@@ -14,9 +14,9 @@
     <file src="PACKAGE.md" target="docs\" />
     <file src="$SettingsFile$" target="tools\$targetFramework$\any" />
     <file src="$Output$" target="tools\$targetFramework$\any" />
-    <file src="$OutputBinary$" target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
-    <file src="$OutputRuntimeConfig$" target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
-    <file src="$OutputSymbol$" target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
+    <file src="$OutputBinary$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
+    <file src="$OutputRuntimeConfig$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
+    <file src="$OutputSymbol$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
     <file src="$OutputExe$" target="tools\$targetFramework$\any\tools\net472\any" />
     <file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net472\any" />
     <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net472\win-x86" />

src/ef/ef.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks>$(NetToolMinimum);net472</TargetFrameworks>
     <Description>Entity Framework Core Command-line Tools</Description>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>