Skip to content

Commit 4b0808b

Browse files
mjcheethammjcheetham
authored
Release 2.5.1 (#1648)
**Changes:** - Update MSAL and Avalonia to latest versions (#1640). - Changes to release workflow to publish NuGet signing certificate (#1594, #1644, #1647). - Updates to Managed Identity and Service Principal docs.
2 parents d349307 + a390637 commit 4b0808b

File tree

4 files changed

+49
-61
lines changed

4 files changed

+49
-61
lines changed

‎.github/workflows/release.yml‎

Lines changed: 34 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ jobs:
177177
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
178178

179179
- name: Sign payload files with Azure Code Signing
180-
uses: azure/azure-code-[email protected].1
180+
uses: azure/trusted-[email protected].20
181181
with:
182182
endpoint: https://wus2.codesigning.azure.net/
183-
code-signing-account-name: git-fundamentals-signing
183+
trusted-signing-account-name: git-fundamentals-signing
184184
certificate-profile-name: git-fundamentals-windows-signing
185185
files-folder: ${{ github.workspace }}\payload
186186
files-folder-filter: exe,dll
@@ -204,10 +204,10 @@ jobs:
204204
-Destination $env:GITHUB_WORKSPACE\installers
205205
206206
- name: Sign installers with Azure Code Signing
207-
uses: azure/azure-code-[email protected].1
207+
uses: azure/trusted-[email protected].20
208208
with:
209209
endpoint: https://wus2.codesigning.azure.net/
210-
code-signing-account-name: git-fundamentals-signing
210+
trusted-signing-account-name: git-fundamentals-signing
211211
certificate-profile-name: git-fundamentals-windows-signing
212212
files-folder: ${{ github.workspace }}\installers
213213
files-folder-filter: exe
@@ -349,31 +349,16 @@ jobs:
349349
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
350350
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
351351

352-
- name: Download/extract Sign CLI tool
353-
env:
354-
AST: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
355-
ASC: ${{ secrets.AZURE_STORAGE_CONTAINER }}
356-
SCT: ${{ secrets.SIGN_CLI_TOOL }}
352+
- name: Install sign CLI tool
357353
run: |
358-
az storage blob download --file sign-cli.zip --auth-mode login `
359-
--account-name $env:AST --container-name $env:ASC --name $env:SCT
360-
Expand-Archive -Path sign-cli.zip -DestinationPath .\sign-cli
354+
dotnet tool install -g --version 0.9.1-beta.24325.5
361355
362356
- name: Sign payload
363-
env:
364-
ACST: ${{ secrets.AZURE_TENANT_ID }}
365-
ACSI: ${{ secrets.AZURE_CLIENT_ID }}
366-
ACSS: ${{ secrets.AZURE_CLIENT_SECRET }}
367357
run: |
368-
./sign-cli/sign.exe code azcodesign payload/* `
369-
-acsu https://wus2.codesigning.azure.net/ `
370-
-acsa git-fundamentals-signing `
371-
-acscp git-fundamentals-windows-signing `
372-
-d "Git Fundamentals Windows Signing Certificate" `
373-
-u "https://github.com/git-ecosystem/git-credential-manager" `
374-
-acst $env:ACST `
375-
-acsi $env:ACSI `
376-
-acss $env:ACSS
358+
sign.exe code trusted-signing payload/* `
359+
-tse https://wus2.codesigning.azure.net/ `
360+
-tsa git-fundamentals-signing `
361+
-tscp git-fundamentals-windows-signing
377362
378363
- name: Lay out signed payload, images, and symbols
379364
shell: bash
@@ -440,37 +425,37 @@ jobs:
440425
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
441426
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
442427

443-
- name: Download/extract Sign CLI tool
444-
env:
445-
AST: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
446-
ASC: ${{ secrets.AZURE_STORAGE_CONTAINER }}
447-
SCT: ${{ secrets.SIGN_CLI_TOOL }}
428+
- name: Install sign CLI tool
448429
run: |
449-
az storage blob download --file sign-cli.zip --auth-mode login `
450-
--account-name $env:AST --container-name $env:ASC --name $env:SCT
451-
Expand-Archive -Path sign-cli.zip -DestinationPath .\sign-cli
430+
dotnet tool install -g --version 0.9.1-beta.24325.5
452431
453432
- name: Sign package
454-
env:
455-
ACST: ${{ secrets.AZURE_TENANT_ID }}
456-
ACSI: ${{ secrets.AZURE_CLIENT_ID }}
457-
ACSS: ${{ secrets.AZURE_CLIENT_SECRET }}
458433
run: |
459-
./sign-cli/sign.exe code azcodesign nupkg/* `
460-
-acsu https://wus2.codesigning.azure.net/ `
461-
-acsa git-fundamentals-signing `
462-
-acscp git-fundamentals-windows-signing `
463-
-d "Git Fundamentals Windows Signing Certificate" `
464-
-u "https://github.com/git-ecosystem/git-credential-manager" `
465-
-acst $env:ACST `
466-
-acsi $env:ACSI `
467-
-acss $env:ACSS
468-
469-
- name: Publish signed package
434+
sign.exe code trusted-signing nupkg/* `
435+
-tse https://wus2.codesigning.azure.net/ `
436+
-tsa git-fundamentals-signing `
437+
-tscp git-fundamentals-windows-signing
438+
439+
mv nupkg/* .
440+
441+
# Remove this once NuGet supports the subscriber identity validation EKU:
442+
# https://github.com/NuGet/NuGetGallery/issues/10027
443+
- name: Extract signing certificate from package
444+
shell: pwsh
445+
run: |
446+
dotnet tool install --global Knapcode.CertificateExtractor
447+
$nupkg = gci *.nupkg
448+
nuget-cert-extractor --file $nupkg --output certs --code-signing --author --leaf
449+
$cert = gci certs\*.cer
450+
mv $cert .\nuget-signing.cer
451+
452+
- name: Publish signed package and certificate
470453
uses: actions/upload-artifact@v4
471454
with:
472455
name: dotnet-tool-sign
473-
path: nupkg/*.nupkg
456+
path: |
457+
*.nupkg
458+
*.cer
474459
475460
# ================================
476461
# Validate

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.0.0
1+
2.5.1.0

‎docs/azrepos-misp.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,15 @@ Value|Description
4949
-|-
5050
`system`|System-Assigned Managed Identity
5151
`[guid]`|User-Assigned Managed Identity with the specified client ID
52-
`id://[guid]`|User-Assigned Managed Identity with the specified client ID
53-
`resource://[guid]`|User-Assigned Managed Identity for the associated resource
52+
`id://[guid]` **|User-Assigned Managed Identity with the specified client ID
53+
`resource://[guid]` **|User-Assigned Managed Identity for the associated resource
5454

5555
You can obtain the `[guid]` from the Azure Portal or by using the Azure CLI
5656
to inspect the Managed Identity or resource.
5757

58+
** Note there is an open issue that prevents successfull authentication when
59+
using these formats: https://github.com/git-ecosystem/git-credential-manager/issues/1570
60+
5861
## Service Principals
5962

6063
Azure Service Principals are used to authenticate and authorize applications and

‎src/shared/Core/Core.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1414
<Reference Include="System.Net.Http" />
1515
<Reference Include="System.Web" />
16-
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.60.3" />
17-
<PackageReference Include="Avalonia.Win32" Version="11.0.10" />
16+
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.61.3" />
17+
<PackageReference Include="Avalonia.Win32" Version="11.0.11" />
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
21-
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
21+
<PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
26-
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.60.3" />
25+
<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
26+
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
2727
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
28-
<PackageReference Include="Avalonia" Version="11.0.10" />
29-
<PackageReference Include="Avalonia.Skia" Version="11.0.10" />
30-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
28+
<PackageReference Include="Avalonia" Version="11.0.11" />
29+
<PackageReference Include="Avalonia.Skia" Version="11.0.11" />
30+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
3131
</ItemGroup>
3232

3333
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
34-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
34+
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" />
3535
</ItemGroup>
3636

3737
</Project>

0 commit comments

Comments
 (0)