Merge pull request #132 from microsoft/master

Cut release fixing Bitbucket bug and 32-bit Windows support
git-ecosystem · Jun 9, 2020 · 1264f23 · 1264f23
2 parents b11949c + 86290d7
commit 1264f23
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/.azure-pipelines/templates/windows/pack.yml b/.azure-pipelines/templates/windows/pack.yml
@@ -7,7 +7,7 @@ steps:
 
   - script: |
       xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461"       "$(Build.StagingDirectory)\publish\"
-      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x64" "$(Build.StagingDirectory)\publish\payload\"
+      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x86" "$(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 artifacts
@@ -18,7 +18,7 @@ steps:
       rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload\'
       includeRootFolder: false
       archiveType: 'zip'
-      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-win-x64-$(GitBuildVersion).zip'
+      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-win-x86-$(GitBuildVersion).zip'
       replaceExistingArchive: true
 
   - task: ArchiveFiles@2
@@ -27,7 +27,7 @@ steps:
       rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload.sym\'
       includeRootFolder: false
       archiveType: 'zip'
-      archiveFile: '$(Build.StagingDirectory)\publish\symbols-win-x64.zip'
+      archiveFile: '$(Build.StagingDirectory)\publish\symbols-win-x86.zip'
       replaceExistingArchive: true
 
   - task: PublishPipelineArtifact@0

diff --git a/.github/workflows/release-homebrew.yaml b/.github/workflows/release-homebrew.yaml
@@ -14,13 +14,19 @@ jobs:
         github-token: ${{secrets.GITHUB_TOKEN}}
         result-encoding: string
         script: |
-          const { data } = await github.repos.getReleaseByTag({
+          const { data: releases } = await github.repos.listReleases({
             owner: context.repo.owner,
-            repo: context.repo.repo,
-            tag: process.env.GITHUB_REF
+            repo: context.repo.repo
           });
+          const release = releases.find(x => x.tag_name === process.env.GITHUB_REF);
+          if (!release) {
+            throw new Error(`unable to find release with tag '${process.env.GITHUB_REF}'`);
+          }
           const regex = /gcmcore-osx-(.*)\.pkg/;
-          const asset = data.assets.find(x => regex.test(x.name));
+          const asset = release.assets.find(x => regex.test(x.name));
+          if (!asset) {
+            throw new Error(`unable to find asset matching '${regex}'`);
+          }
           const matches = asset.name.match(regex);
           const version = matches[1];
           return version;

diff --git a/docs/development.md b/docs/development.md
@@ -37,7 +37,7 @@ msbuild /p:Configuration=WindowsDebug
 
 You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net461`.
 
-The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net461\win-x64`.
+The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net461\win-x86`.
 
 ### Linux
 

diff --git a/src/shared/Atlassian.Bitbucket/BitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/BitbucketRestApi.cs
@@ -80,7 +80,7 @@ public async Task<RestApiResult<UserInfo>> GetUserInformationAsync(string userNa
 
                     if (response.IsSuccessStatusCode)
                     {
-                        var obj = JsonConvert.DeserializeObject<UserInfo>(json);
+                        var obj = JsonConvert.DeserializeObject<UserInfo>(json, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
 
                         return new RestApiResult<UserInfo>(response.StatusCode, obj);
                     }

diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
@@ -4,8 +4,8 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net461;netcoreapp3.1</TargetFrameworks>
-    <RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>
-    <PlatformTarget>x64</PlatformTarget>
+    <RuntimeIdentifiers>win-x86;osx-x64</RuntimeIdentifiers>
+    <PlatformTarget Condition="'$(OSPlatform)'=='windows'">x86</PlatformTarget>
     <AssemblyName>git-credential-manager-core</AssemblyName>
     <RootNamespace>Microsoft.Git.CredentialManager</RootNamespace>
     <ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>

diff --git a/src/windows/Installer.Windows/Installer.Windows.csproj b/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-x64</PayloadPath>
+    <PayloadPath>$(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net461\win-x86</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-win-x64-$(BuildVersion).exe">
+      <FilesToSign Include="$(OutDir)gcmcore-win-x86-$(BuildVersion).exe">
         <Authenticode>Microsoft400</Authenticode>
         <InProject>false</InProject>
       </FilesToSign>

diff --git a/src/windows/Installer.Windows/Setup.iss b/src/windows/Installer.Windows/Setup.iss
@@ -47,13 +47,12 @@ AppCopyright={#GcmCopyright}
 AppReadmeFile={#GcmReadme}
 VersionInfoVersion={#GcmVersion}
 LicenseFile={#GcmRepoRoot}\LICENSE
-OutputBaseFilename=gcmcore-win-x64-{#GcmVersion}
+OutputBaseFilename=gcmcore-win-x86-{#GcmVersion}
 DefaultDirName={pf}\{#GcmName}
 Compression=lzma2
 SolidCompression=yes
 MinVersion=6.1.7600
 DisableDirPage=yes
-ArchitecturesInstallIn64BitMode=x64
 UninstallDisplayIcon={app}\git-credential-manager-core.exe
 SetupIconFile={#GcmAssets}\gcmicon.ico
 WizardImageFile={#GcmAssets}\gcmicon128.bmp

diff --git a/src/windows/Payload.Windows/Payload.Windows.csproj b/src/windows/Payload.Windows/Payload.Windows.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>