Merge in 'release/6.0' changes

Author: dotnet-bot

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>
+</package>

src/EFCore.Tools/tools/EntityFrameworkCore.psm1

@@ -1222,6 +1222,10 @@ function EF($project, $startupProject, $params, $applicationArgs, [switch] $skip
         {
             $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'

src/dotnet-ef/RootCommand.cs

@@ -111,9 +111,12 @@ protected override int Execute(string[] _)
                 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")

src/dotnet-ef/dotnet-ef.csproj

@@ -91,6 +91,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>

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>

src/ef/ef.csproj

@@ -64,8 +64,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>