Skip to content

Target .NET 6.0 with ef6 #2166

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
bricelam merged 2 commits into from
Nov 8, 2023
Merged

Target .NET 6.0 with ef6 #2166

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
daea1ed
Target .NET 6.0
ErikEJ Oct 27, 2023
4c88b3d
Fix paths
ErikEJ Oct 27, 2023
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
4 changes: 2 additions & 2 deletions src/EntityFramework.NuGet/EntityFramework.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<TargetFrameworks>net45;net40;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;net40;net6.0</TargetFrameworks>
<CheckEolTargetFramework>False</CheckEolTargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSource>false</IncludeSource>
Expand All @@ -28,7 +28,7 @@
<NuspecProperty Include="IntermediateOutputPath=$(IntermediateOutputPath)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<ProjectReference Include="..\Microsoft.Data.Entity.Build.Tasks\Microsoft.Data.Entity.Build.Tasks.csproj" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/EntityFramework.NuGet/EntityFramework.NuGet.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<file src="../../artifacts/bin/ef6/$Configuration$/net40/ef6.pdb" target="tools/net40/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/net45/ef6.exe" target="tools/net45/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/net45/ef6.pdb" target="tools/net45/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.dll" target="tools/netcoreapp3.0/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.pdb" target="tools/netcoreapp3.0/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.runtimeconfig.json" target="tools/netcoreapp3.0/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/net6.0/ef6.dll" target="tools/net6.0/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/net6.0/ef6.pdb" target="tools/net6.0/any/" />
<file src="../../artifacts/bin/ef6/$Configuration$/net6.0/ef6.runtimeconfig.json" target="tools/net6.0/any/" />
<file src="../../artifacts/bin/ef6/x86/$Configuration$/net40/ef6.exe" target="tools/net40/win-x86/" />
<file src="../../artifacts/bin/ef6/x86/$Configuration$/net40/ef6.pdb" target="tools/net40/win-x86/" />
<file src="../../artifacts/bin/ef6/x86/$Configuration$/net45/ef6.exe" target="tools/net45/win-x86/" />
Expand Down
0 ...build/netcoreapp3.0/EntityFramework.props → ....NuGet/build/net6.0/EntityFramework.props
View file
Open in desktop
File renamed without changes.
0 ...ild/netcoreapp3.0/EntityFramework.targets → ...uGet/build/net6.0/EntityFramework.targets
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...itive/netcoreapp3.0/EntityFramework.props → ...ldTransitive/net6.0/EntityFramework.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\build\netcoreapp3.0\EntityFramework.props" />
<Import Project="..\..\build\net6.0\EntityFramework.props" />
</Project>
2 changes: 1 addition & 1 deletion ...ive/netcoreapp3.0/EntityFramework.targets → ...Transitive/net6.0/EntityFramework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\build\netcoreapp3.0\EntityFramework.targets" />
<Import Project="..\..\build\net6.0\EntityFramework.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/EntityFramework.NuGet/tools/EntityFramework6.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ function EF6($project, $startupProject, $workingDir, $params)
$projectAssetsFile = GetCpsProperty $project 'ProjectAssetsFile'
$runtimeConfig = Join-Path $targetDir ($targetName + '.runtimeconfig.json')
$runtimeFrameworkVersion = GetCpsProperty $project 'RuntimeFrameworkVersion'
$efPath = Join-Path $PSScriptRoot 'netcoreapp3.0\any\ef6.dll'
$efPath = Join-Path $PSScriptRoot 'net6.0\any\ef6.dll'

$dotnetParams = 'exec', '--depsfile', $depsFile

Expand Down
4 changes: 2 additions & 2 deletions src/ef6/ef6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
<TargetFrameworks>net6.0;net40;net45</TargetFrameworks>
<RuntimeIdentifiers>win-arm64</RuntimeIdentifiers>
<CheckEolTargetFramework>False</CheckEolTargetFramework>
<RootNamespace>System.Data.Entity.Tools</RootNamespace>
<!--
This keeps ef6.exe targeting the default version of .NET Core for netcoreapp3.0,
This keeps ef6.exe targeting the default version of .NET Core for net6.0,
which maximizes the machines on which this tool will be compatible.
-->
<TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
Expand Down