From 23895c71a2ca5353658c8d64c0a9f8dcf07a9ffe Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Tue, 12 Apr 2022 10:12:36 -0700
Subject: [PATCH] Tools: Target .NET 6 to improve compatibility with osx-arm64

Also adds a shim we can sign for win-arm64 and rolls ef.dll forward across major runtime versions.

Fixes #27787, fixes #27827
---
 src/dotnet-ef/dotnet-ef.csproj | 4 ++--
 src/ef/ef.csproj               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
index ac87e418969..f1b8b05328b 100644
--- a/src/dotnet-ef/dotnet-ef.csproj
+++ b/src/dotnet-ef/dotnet-ef.csproj
@@ -12,10 +12,10 @@ dotnet ef dbcontext scaffold
 dotnet ef database drop
 dotnet ef database update
     </Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
-    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers>
     <!-- Because this project uses a custom nuspec, this is necessary to ensure the generated shims are in the publish directory. -->
     <PackagedShimOutputRootDirectory>$(OutDir)</PackagedShimOutputRootDirectory>
     <RootNamespace>Microsoft.EntityFrameworkCore.Tools</RootNamespace>
diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj
index 77a7d8d87fe..a75e3579617 100644
--- a/src/ef/ef.csproj
+++ b/src/ef/ef.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>Microsoft.EntityFrameworkCore.Tools</RootNamespace>
     <CheckEolTargetFramework>False</CheckEolTargetFramework>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset</CodeAnalysisRuleSet>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>