Return to building 64-bit in NetCore and NetFx on Windows

Now that we've moved the Microsoft authentication helper in-process we
no longer have a need to force all entry executables to be the same
bit-width.

The GitHub authentication helper is still .NET Framework (as we're
targeting .NET Core 2.x still) and using 32-bit WinForms. However that
helper does not make use of the LibGit2 native bits (by virtue of
not instantiating the `CommandContext` type).

Author: mjcheetham

.azure-pipelines/templates/windows/pack.yml

@@ -1,7 +1,7 @@
 steps:
   - script: |
       xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461"       "$(Build.StagingDirectory)\publish\"
-      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x86" "$(Build.StagingDirectory)\publish\payload\"
+      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x64" "$(Build.StagingDirectory)\publish\payload\"
       mkdir "$(Build.StagingDirectory)\publish\payload.sym\"
       move  "$(Build.StagingDirectory)\publish\payload\*.pdb"                 "$(Build.StagingDirectory)\publish\payload.sym\"
     displayName: Prepare final build artifact

src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <TargetFramework Condition="'$(OSPlatform)'=='windows'">net461</TargetFramework>
-    <RuntimeIdentifiers>win-x86;osx-x64</RuntimeIdentifiers>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net461;netcoreapp2.1</TargetFrameworks>
+    <RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>
     <AssemblyName>git-credential-manager-core</AssemblyName>
     <RootNamespace>Microsoft.Git.CredentialManager</RootNamespace>
     <ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>
@@ -13,12 +13,6 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 
-  <!-- On Windows we target 32-bit because the WinForms authentication helpers are 32-bit
-       and also need to use the native libgit2 library (we use the 32-bit version on Windows) -->
-  <PropertyGroup Condition="'$(OSPlatform)'=='windows'">
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\GitHub\GitHub.csproj" />
     <ProjectReference Include="..\Microsoft.AzureRepos\Microsoft.AzureRepos.csproj" />

src/windows/Installer.Windows/Installer.Windows.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <PayloadPath>$(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net461\win-x86</PayloadPath>
+    <PayloadPath>$(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net461\win-x64</PayloadPath>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
@@ -29,7 +29,7 @@
        before we attempt to sign any files or validate they exist. -->
   <Target Name="CreateFilesToSignItems" DependsOnTargets="GetBuildVersion" BeforeTargets="PrepareForRun">
     <ItemGroup>
-      <FilesToSign Include="$(OutDir)gcmcore-windows-x86-$(BuildVersion).exe">
+      <FilesToSign Include="$(OutDir)gcmcore-win-x64-$(BuildVersion).exe">
         <Authenticode>Microsoft400</Authenticode>
         <InProject>false</InProject>
       </FilesToSign>

src/windows/Installer.Windows/Setup.iss

@@ -47,7 +47,7 @@ AppCopyright={#GcmCopyright}
 AppReadmeFile={#GcmReadme}
 VersionInfoVersion={#GcmVersion}
 LicenseFile={#GcmRepoRoot}\LICENSE
-OutputBaseFilename=gcmcore-windows-x86-{#GcmVersion}
+OutputBaseFilename=gcmcore-win-x64-{#GcmVersion}
 DefaultDirName={pf}\{#GcmName}
 Compression=lzma2
 SolidCompression=yes

src/windows/Payload.Windows/Payload.Windows.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>