Skip to content

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

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
merged 2 commits into from
Nov 25, 2025
+17 −16
Merged

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

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
34f7cbe
Switch back to net8.0 for tools
cincuranet Nov 18, 2025
82086d2
Update src/dotnet-ef/dotnet-ef.nuspec
AndriySvyryd Nov 19, 2025
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
5 changes: 3 additions & 2 deletions src/EFCore.Tasks/EFCore.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/EFCore.Tasks/EFCore.Tasks.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework="$DefaultNetCoreTargetFramework$">
<group targetFramework="$NetToolCurrent$">
<dependency id="Microsoft.EntityFrameworkCore.Design" version="$Version$" />
</group>
</dependencies>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion src/EFCore.Tools/EFCore.Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Tools/tools/EntityFrameworkCore.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/dotnet-ef/RootCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
{
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-ef/dotnet-ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/dotnet-ef/dotnet-ef.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/ef/ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down