diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 6e4d77a6802..e1a280c9a52 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -2,7 +2,7 @@ MSBuild tasks for Entity Framework Core projects. - $(DefaultNetCoreTargetFramework);net472 + $(NetToolCurrent);net472 Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore false @@ -75,7 +75,8 @@ - + + diff --git a/src/EFCore.Tasks/EFCore.Tasks.nuspec b/src/EFCore.Tasks/EFCore.Tasks.nuspec index 9bc52c09450..aad830e70a4 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.nuspec +++ b/src/EFCore.Tasks/EFCore.Tasks.nuspec @@ -4,7 +4,7 @@ $CommonMetadataElements$ - + @@ -13,11 +13,11 @@ $CommonFileElements$ - - - + + + - + \ No newline at end of file diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index b0101fdbb97..d8822a722e2 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -3,7 +3,7 @@ - $(DefaultNetCoreTargetFramework) + $(NetToolMinimum) Microsoft.EntityFrameworkCore.Tools $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec true diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 index ce63472efc5..34d8aefc617 100644 --- a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 +++ b/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 diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs index c9cf06f8c98..792139f9598 100644 --- a/src/dotnet-ef/RootCommand.cs +++ b/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") { diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 41659c087b8..d1ce32459c3 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -13,7 +13,7 @@ dotnet ef database drop dotnet ef database update - $(DefaultNetCoreTargetFramework) + $(NetToolMinimum) Exe true win-x64;win-x86;win-arm64 diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec index 4e908612135..40cfb6c7f26 100644 --- a/src/dotnet-ef/dotnet-ef.nuspec +++ b/src/dotnet-ef/dotnet-ef.nuspec @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj index eeb9b64e468..091303bd216 100644 --- a/src/ef/ef.csproj +++ b/src/ef/ef.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework);net472 + $(NetToolMinimum);net472 Entity Framework Core Command-line Tools Exe false