From fb8b6e265ba89958f8cf26a97aadc8c3a2b53f96 Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Wed, 22 Jun 2022 01:41:14 -0700
Subject: [PATCH 1/2] [release/3.1] Tools: Enable .NET Framework projects
 targeting win-arm64 (#28254)

---
 src/EFCore.Tools/EFCore.Tools.nuspec            | 4 +++-
 src/EFCore.Tools/tools/EntityFrameworkCore.psm1 | 4 ++++
 src/dotnet-ef/RootCommand.cs                    | 9 ++++++---
 src/dotnet-ef/dotnet-ef.csproj                  | 4 +++-
 src/dotnet-ef/dotnet-ef.nuspec                  | 2 ++
 src/ef/ef.csproj                                | 3 ++-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec
index f18c10abf7f..2b4c69d1cb2 100644
--- a/src/EFCore.Tools/EFCore.Tools.nuspec
+++ b/src/EFCore.Tools/EFCore.Tools.nuspec
@@ -19,8 +19,10 @@
     <file src="../../artifacts/bin/ef/$configuration$/net461/ef.pdb" target="tools/net461/any/" />
     <file src="../../artifacts/bin/ef/x86/$configuration$/net461/ef.exe" target="tools/net461/win-x86/" />
     <file src="../../artifacts/bin/ef/x86/$configuration$/net461/ef.pdb" target="tools/net461/win-x86/" />
+    <file src="../../artifacts/bin/ef/ARM64/$configuration$/net461/ef.exe" target="tools/net461/win-arm64/" />
+    <file src="../../artifacts/bin/ef/ARM64/$configuration$/net461/ef.pdb" target="tools/net461/win-arm64/" />
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.dll" target="tools/netcoreapp2.0/any/" />
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.pdb" target="tools/netcoreapp2.0/any/" />
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.runtimeconfig.json" target="tools/netcoreapp2.0/any/" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1
index 80bb7058637..e2bfb63248d 100644
--- a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1
+++ b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1
@@ -847,6 +847,10 @@ function EF($project, $startupProject, $params, [switch] $skipBuild)
         {
             $exePath = Join-Path $PSScriptRoot 'net461\win-x86\ef.exe'
         }
+        elseif ($platformTarget -eq 'ARM64')
+        {
+            $exePath = Join-Path $PSScriptRoot 'net461\win-arm64\ef.exe'
+        }
         elseif ($platformTarget -in 'AnyCPU', 'x64')
         {
             $exePath = Join-Path $PSScriptRoot 'net461\any\ef.exe'
diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs
index 61959d89319..21d82d694c0 100644
--- a/src/dotnet-ef/RootCommand.cs
+++ b/src/dotnet-ef/RootCommand.cs
@@ -108,9 +108,12 @@ protected override int Execute()
                 executable = Path.Combine(
                     toolsPath,
                     "net461",
-                    startupProject.PlatformTarget == "x86"
-                        ? "win-x86"
-                        : "any",
+                    startupProject.PlatformTarget switch
+                    {
+                        "x86" => "win-x86",
+                        "ARM64" => "win-arm64",
+                        _ => "any"
+                    },
                     "ef.exe");
             }
             else if (targetFramework.Identifier == ".NETCoreApp")
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
index 36fb394ad56..6b7ef68ba1e 100644
--- a/src/dotnet-ef/dotnet-ef.csproj
+++ b/src/dotnet-ef/dotnet-ef.csproj
@@ -15,7 +15,7 @@ dotnet ef database update
     <TargetFramework>$(DefaultNetCoreTargetFramework)</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>
@@ -96,6 +96,8 @@ dotnet ef database update
       <NuspecProperty Include="OutputExeSymbol=..\..\artifacts\bin\ef\$(Configuration)\net461\ef.pdb" />
       <NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.exe" />
       <NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.pdb" />
+      <NuspecProperty Include="OutputARM64Exe=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net461\ef.exe" />
+      <NuspecProperty Include="OutputARM64ExeSymbol=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net461\ef.pdb" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
index 5eea51128b0..2ceff381f6f 100644
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ b/src/dotnet-ef/dotnet-ef.nuspec
@@ -18,5 +18,7 @@
     <file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net461\any" />
     <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
     <file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
+    <file src="$OutputARM64Exe$" target="tools\$targetFramework$\any\tools\net461\win-arm64" />
+    <file src="$OutputARM64ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-arm64" />
   </files>
 </package>
diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj
index 26ebe4e7438..8ad9e3ae3b0 100644
--- a/src/ef/ef.csproj
+++ b/src/ef/ef.csproj
@@ -47,8 +47,9 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="BuildX86" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' ">
+  <Target Name="BuildOtherPlatforms" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' == 'AnyCPU' ">
     <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="TargetFramework=$(TargetFramework);Platform=x86;Configuration=$(Configuration)" Targets="Build" />
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="TargetFramework=$(TargetFramework);Platform=ARM64;Configuration=$(Configuration)" Targets="Build" />
   </Target>
 
 </Project>

From 56710afdb6dc8f7cabb9bccb6d75d11de491a837 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 5 Jul 2022 15:33:45 -0700
Subject: [PATCH 2/2] Update branding to 3.1.28 (#28369)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index bf990450cd5..82e5483d0e9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Version settings">
-    <VersionPrefix>3.1.27</VersionPrefix>
+    <VersionPrefix>3.1.28</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>