Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release (attempt 2) #534

Merged
merged 11 commits into from
Nov 16, 2021
2 changes: 1 addition & 1 deletion .azure-pipelines/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ trigger:

variables:
configuration: Release
signPool: VSEng-MicroBuildVS2019
signPool: MSEngSS-MicroBuild2019-1ES
winImage: vs2017-win2016
osxImage: macos-latest

Expand Down
Original file line number Diff line number Diff line change
@@ -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)'
Expand Down
Original file line number Diff line number Diff line change
@@ -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)'
Expand Down
7 changes: 6 additions & 1 deletion .azure-pipelines/templates/windows/compile.signed.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/osx/SignFiles.Mac/SignFiles.Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Core.UI/HelperApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)
WriteException(ex);
}

invocationContext.ResultCode = -1;
invocationContext.ExitCode = -1;
}

private bool WriteException(Exception ex)
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Core/Application.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private void OnException(Exception ex, InvocationContext invocationContext)
WriteException(ex);
}

invocationContext.ResultCode = -1;
invocationContext.ExitCode = -1;
}

private bool WriteException(Exception ex)
Expand Down
6 changes: 5 additions & 1 deletion src/shared/Core/BrowserUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/windows/Installer.Windows/Installer.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/windows/Payload.Windows/Payload.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down