Merge pull request #534 from microsoft/main

mjcheetham · web-flow · commit 36284cf30373 · 2021-11-16T11:40:14.000Z
New release (attempt 2)
diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml
@@ -3,7 +3,7 @@ trigger:
 
 variables:
   configuration: Release
-  signPool: VSEng-MicroBuildVS2019
+  signPool: MSEngSS-MicroBuild2019-1ES
   winImage: vs2017-win2016
   osxImage: macos-latest
 
diff --git a/.azure-pipelines/templates/osx/pack.signed/step2-signpayload.yml b/.azure-pipelines/templates/osx/pack.signed/step2-signpayload.yml
@@ -1,5 +1,10 @@
 steps:
-  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
+  - task: NuGetAuthenticate@0
+    displayName: Authenticate to MicroBuild NuGet feed
+    inputs:
+      nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
+
+  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
     displayName: Install signing plugin
     inputs:
       signType: '$(SignType)'
diff --git a/.azure-pipelines/templates/osx/pack.signed/step4-signpack.yml b/.azure-pipelines/templates/osx/pack.signed/step4-signpack.yml
@@ -1,5 +1,10 @@
 steps:
-  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
+  - task: NuGetAuthenticate@0
+    displayName: Authenticate to MicroBuild NuGet feed
+    inputs:
+      nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
+
+  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
     displayName: Install signing plugin
     inputs:
       signType: '$(SignType)'
diff --git a/.azure-pipelines/templates/windows/compile.signed.yml b/.azure-pipelines/templates/windows/compile.signed.yml
@@ -1,5 +1,10 @@
 steps:
-  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
+  - task: NuGetAuthenticate@0
+    displayName: Authenticate to MicroBuild NuGet feed
+    inputs:
+      nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
+
+  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
     displayName: Install signing plugin
     condition: and(succeeded(), eq(variables['SignType'], 'real'))
     inputs:
diff --git a/README.md b/README.md
@@ -96,6 +96,10 @@ Download the latest [.deb package](https://github.com/microsoft/Git-Credential-M
 sudo dpkg -i <path-to-package>
 git-credential-manager-core configure
 ```
+__Note:__ Although packages were previously offered on certain
+[Microsoft Ubuntu package feeds](https://packages.microsoft.com/repos/),
+GCM no longer publishes to these repositories. Please install the
+Debian package using the above instructions instead.
 
 #### Other distributions
 
diff --git a/src/osx/SignFiles.Mac/SignFiles.Mac.csproj b/src/osx/SignFiles.Mac/SignFiles.Mac.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MicroBuild.Core" Version="0.2.0">
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
       <!-- Development dependency only -->
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/shared/Core.UI/HelperApplication.cs b/src/shared/Core.UI/HelperApplication.cs
@@ -49,7 +49,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)
                 WriteException(ex);
             }
 
-            invocationContext.ResultCode = -1;
+            invocationContext.ExitCode = -1;
         }
 
         private bool WriteException(Exception ex)
diff --git a/src/shared/Core/Application.cs b/src/shared/Core/Application.cs
@@ -128,7 +128,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)
                 WriteException(ex);
             }
 
-            invocationContext.ResultCode = -1;
+            invocationContext.ExitCode = -1;
         }
 
         private bool WriteException(Exception ex)
diff --git a/src/shared/Core/BrowserUtils.cs b/src/shared/Core/BrowserUtils.cs
@@ -39,7 +39,11 @@ public static void OpenDefaultBrowser(IEnvironment environment, Uri uri)
                 //
                 // We try and use the same 'shell execute' utilities as the Framework does,
                 // searching for them in the same order until we find one.
-                foreach (string shellExec in new[] {"xdg-open", "gnome-open", "kfmclient"})
+                //
+                // One additional 'shell execute' utility we also attempt to use is `wslview`
+                // that is commonly found on WSL (Windows Subsystem for Linux) distributions that
+                // opens the browser on the Windows host.
+                foreach (string shellExec in new[] {"xdg-open", "gnome-open", "kfmclient", "wslview"})
                 {
                     if (environment.TryLocateExecutable(shellExec, out string shellExecPath))
                     {
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.37.0" />
     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.19.2" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/windows/Installer.Windows/Installer.Windows.csproj b/src/windows/Installer.Windows/Installer.Windows.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Tools.InnoSetup" Version="6.0.5" />
-    <PackageReference Include="MicroBuild.Core" Version="0.2.0">
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/src/windows/Payload.Windows/Payload.Windows.csproj b/src/windows/Payload.Windows/Payload.Windows.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MicroBuild.Core" Version="0.2.0">
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)`
`49`	`49`	`WriteException(ex);`
`50`	`50`	`}`
`51`	`51`
`52`		`- invocationContext.ResultCode = -1;`
	`52`	`+ invocationContext.ExitCode = -1;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private bool WriteException(Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)`
`128`	`128`	`WriteException(ex);`
`129`	`129`	`}`
`130`	`130`
`131`		`- invocationContext.ResultCode = -1;`
	`131`	`+ invocationContext.ExitCode = -1;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private bool WriteException(Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@ public static void OpenDefaultBrowser(IEnvironment environment, Uri uri)`
`39`	`39`	`//`
`40`	`40`	`// We try and use the same 'shell execute' utilities as the Framework does,`
`41`	`41`	`// searching for them in the same order until we find one.`
`42`		`- foreach (string shellExec in new[] {"xdg-open", "gnome-open", "kfmclient"})`
	`42`	`+ //`
	`43`	+ // One additional 'shell execute' utility we also attempt to use is `wslview`
	`44`	`+ // that is commonly found on WSL (Windows Subsystem for Linux) distributions that`
	`45`	`+ // opens the browser on the Windows host.`
	`46`	`+ foreach (string shellExec in new[] {"xdg-open", "gnome-open", "kfmclient", "wslview"})`
`43`	`47`	`{`
`44`	`48`	`if (environment.TryLocateExecutable(shellExec, out string shellExecPath))`
`45`	`49`	`{`