Skip to content

Commit 5b6491a

Browse files
pablobrownhspablobrownhs
authored
Merge branch 'git-ecosystem:main' into main
2 parents 1c7a954 + e0e310e commit 5b6491a

File tree

16 files changed

+122
-79
lines changed

16 files changed

+122
-79
lines changed

‎.azure-pipelines/release.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Release-$(Date:yyyyMMdd)$(Rev:.r)
2+
trigger: none
3+
pr: none
4+
5+
resources:
6+
repositories:
7+
- repository: 1ESPipelines
8+
type: git
9+
name: 1ESPipelineTemplates/1ESPipelineTemplates
10+
ref: refs/tags/release
11+
12+
parameters:
13+
- name: 'esrp'
14+
type: boolean
15+
default: false
16+
displayName: 'Enable ESRP code signing'
17+
18+
extends:
19+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelines
20+
parameters:
21+
stages:
22+
- stage: windows
23+
displayName: 'Windows'
24+
jobs:
25+
- job: win_x86_build
26+
displayName: 'Windows Build and Sign (x86)'
27+
pool:
28+
name: GitClient-1ESHostedPool-intel-pc
29+
image: win-x86_64-ado1es
30+
os: windows
31+
steps:
32+
- checkout: self

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
language: [ 'csharp' ]
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Setup .NET
28-
uses: actions/setup-dotnet@v4.2.0
28+
uses: actions/setup-dotnet@v5.0.0
2929
with:
3030
dotnet-version: 8.0.x
3131

‎.github/workflows/continuous-integration.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
runs-on: windows-latest
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@v4.2.0
22+
uses: actions/setup-dotnet@v5.0.0
2323
with:
2424
dotnet-version: 8.0.x
2525

@@ -59,10 +59,10 @@ jobs:
5959
runtime: [ linux-x64, linux-arm64, linux-arm ]
6060

6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v5
6363

6464
- name: Setup .NET
65-
uses: actions/setup-dotnet@v4.2.0
65+
uses: actions/setup-dotnet@v5.0.0
6666
with:
6767
dotnet-version: 8.0.x
6868

@@ -103,10 +103,10 @@ jobs:
103103
runtime: [ osx-x64, osx-arm64 ]
104104

105105
steps:
106-
- uses: actions/checkout@v4
106+
- uses: actions/checkout@v5
107107

108108
- name: Setup .NET
109-
uses: actions/setup-dotnet@v4.2.0
109+
uses: actions/setup-dotnet@v5.0.0
110110
with:
111111
dotnet-version: 8.0.x
112112

‎.github/workflows/lint-docs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
name: Lint markdown files
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

23-
- uses: DavidAnson/markdownlint-cli2-action@eb5ca3ab411449c66620fe7f1b3c9e10547144b0
23+
- uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
2424
with:
2525
globs: |
2626
"**/*.md"
@@ -30,12 +30,12 @@ jobs:
3030
name: Check for broken links
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434

3535
- name: Run link checker
3636
# For any troubleshooting, see:
3737
# https://github.com/lycheeverse/lychee/blob/master/docs/TROUBLESHOOTING.md
38-
uses: lycheeverse/lychee-action@f81112d0d2814ded911bd23e3beaa9dda9093915
38+
uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2
3939

4040
with:
4141
# user-agent: if a user agent is not specified, some websites (e.g.

‎.github/workflows/maintainer-absence.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: create-issue
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/github-script@v7
21+
- uses: actions/github-script@v8
2222
with:
2323
script: |
2424
const startDate = new Date('${{ github.event.inputs.startDate }}');

‎.github/workflows/release.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
outputs:
1515
version: ${{ steps.version.outputs.version }}
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818

1919
- name: Set version
2020
run: echo "version=$(cat VERSION | sed -E 's/.[0-9]+$//')" >> $GITHUB_OUTPUT
@@ -32,10 +32,10 @@ jobs:
3232
matrix:
3333
runtime: [ osx-x64, osx-arm64 ]
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636

3737
- name: Set up .NET
38-
uses: actions/setup-dotnet@v4.2.0
38+
uses: actions/setup-dotnet@v5.0.0
3939
with:
4040
dotnet-version: 8.0.x
4141

@@ -147,10 +147,10 @@ jobs:
147147
environment: release
148148
needs: prereqs
149149
steps:
150-
- uses: actions/checkout@v4
150+
- uses: actions/checkout@v5
151151

152152
- name: Set up .NET
153-
uses: actions/setup-dotnet@v4.2.0
153+
uses: actions/setup-dotnet@v5.0.0
154154
with:
155155
dotnet-version: 8.0.x
156156

@@ -177,7 +177,7 @@ jobs:
177177
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
178178

179179
- name: Sign payload files with Azure Code Signing
180-
uses: azure/[email protected].0
180+
uses: azure/[email protected].9
181181
with:
182182
endpoint: https://wus2.codesigning.azure.net/
183183
trusted-signing-account-name: git-fundamentals-signing
@@ -190,7 +190,7 @@ jobs:
190190

191191
# The Azure Code Signing action overrides the .NET version, so we reset it.
192192
- name: Set up .NET
193-
uses: actions/setup-dotnet@v4.2.0
193+
uses: actions/setup-dotnet@v5.0.0
194194
with:
195195
dotnet-version: 8.0.x
196196

@@ -204,7 +204,7 @@ jobs:
204204
-Destination $env:GITHUB_WORKSPACE\installers
205205
206206
- name: Sign installers with Azure Code Signing
207-
uses: azure/[email protected].0
207+
uses: azure/[email protected].9
208208
with:
209209
endpoint: https://wus2.codesigning.azure.net/
210210
trusted-signing-account-name: git-fundamentals-signing
@@ -236,10 +236,10 @@ jobs:
236236
matrix:
237237
runtime: [ linux-x64, linux-arm64, linux-arm ]
238238
steps:
239-
- uses: actions/checkout@v4
239+
- uses: actions/checkout@v5
240240

241241
- name: Set up .NET
242-
uses: actions/setup-dotnet@v4.2.0
242+
uses: actions/setup-dotnet@v5.0.0
243243
with:
244244
dotnet-version: 8.0.x
245245

@@ -317,10 +317,10 @@ jobs:
317317
runs-on: ubuntu-latest
318318
needs: prereqs
319319
steps:
320-
- uses: actions/checkout@v4
320+
- uses: actions/checkout@v5
321321

322322
- name: Set up .NET
323-
uses: actions/setup-dotnet@v4.2.0
323+
uses: actions/setup-dotnet@v5.0.0
324324
with:
325325
dotnet-version: 8.0.x
326326

@@ -341,10 +341,10 @@ jobs:
341341
environment: release
342342
needs: dotnet-tool-build
343343
steps:
344-
- uses: actions/checkout@v4
344+
- uses: actions/checkout@v5
345345

346346
- name: Download payload
347-
uses: actions/download-artifact@v4
347+
uses: actions/download-artifact@v5
348348
with:
349349
name: tmp.dotnet-tool-build
350350

@@ -384,16 +384,16 @@ jobs:
384384
runs-on: ubuntu-latest
385385
needs: [ prereqs, dotnet-tool-payload-sign ]
386386
steps:
387-
- uses: actions/checkout@v4
387+
- uses: actions/checkout@v5
388388

389389
- name: Download signed payload
390-
uses: actions/download-artifact@v4
390+
uses: actions/download-artifact@v5
391391
with:
392392
name: dotnet-tool-payload-sign
393393
path: signed
394394

395395
- name: Set up .NET
396-
uses: actions/setup-dotnet@v4.2.0
396+
uses: actions/setup-dotnet@v5.0.0
397397
with:
398398
dotnet-version: 8.0.x
399399

@@ -416,10 +416,10 @@ jobs:
416416
environment: release
417417
needs: dotnet-tool-pack
418418
steps:
419-
- uses: actions/checkout@v4
419+
- uses: actions/checkout@v5
420420

421421
- name: Download unsigned package
422-
uses: actions/download-artifact@v4
422+
uses: actions/download-artifact@v5
423423
with:
424424
name: tmp.dotnet-tool-package-unsigned
425425
path: nupkg
@@ -494,15 +494,15 @@ jobs:
494494
runs-on: ${{ matrix.component.os }}
495495
needs: [ create-macos-artifacts, create-windows-artifacts, create-linux-artifacts, dotnet-tool-sign ]
496496
steps:
497-
- uses: actions/checkout@v4
497+
- uses: actions/checkout@v5
498498

499499
- name: Set up .NET
500-
uses: actions/setup-dotnet@v4.2.0
500+
uses: actions/setup-dotnet@v5.0.0
501501
with:
502502
dotnet-version: 8.0.x
503503

504504
- name: Download artifacts
505-
uses: actions/download-artifact@v4
505+
uses: actions/download-artifact@v5
506506
with:
507507
name: ${{ matrix.component.artifact }}
508508

@@ -564,15 +564,15 @@ jobs:
564564
environment: release
565565
needs: [ prereqs, validate ]
566566
steps:
567-
- uses: actions/checkout@v4
567+
- uses: actions/checkout@v5
568568

569569
- name: Set up .NET
570-
uses: actions/setup-dotnet@v4.2.0
570+
uses: actions/setup-dotnet@v5.0.0
571571
with:
572572
dotnet-version: 8.0.x
573573

574574
- name: Download artifacts
575-
uses: actions/download-artifact@v4
575+
uses: actions/download-artifact@v5
576576

577577
- name: Archive macOS payload and symbols
578578
run: |
@@ -608,7 +608,7 @@ jobs:
608608
cp gcm-public.asc linux-arm64-artifacts/
609609
mv gcm-public.asc linux-arm-artifacts
610610
611-
- uses: actions/github-script@v7
611+
- uses: actions/github-script@v8
612612
with:
613613
script: |
614614
const fs = require('fs');

‎.github/workflows/validate-install-from-source.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- image: tgagor/centos
2424
- image: redhat/ubi8
2525
- image: alpine
26-
- image: alpine:3.14.10
26+
- image: alpine:3.19.8
2727
- image: opensuse/leap
2828
- image: opensuse/tumbleweed
2929
- image: registry.suse.com/suse/sle15:15.4.27.11.31
@@ -41,7 +41,7 @@ jobs:
4141
GNUPGHOME=/root/.gnupg tdnf install tar -y # needed for `actions/checkout`
4242
fi
4343
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545

4646
- run: |
4747
sh "${GITHUB_WORKSPACE}/src/linux/Packaging.Linux/install-from-source.sh" -y

‎CODEOWNERS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* @git-ecosystem/git-client
2+
/src/shared/Microsoft.AzureRepos/ @git-ecosystem/git-client @git-ecosystem/gcm-azure-maintainers
3+
/src/shared/Microsoft.AzureRepos.Tests/ @git-ecosystem/git-client @git-ecosystem/gcm-azure-maintainers
4+
/src/shared/GitHub/ @git-ecosystem/git-client @git-ecosystem/hubbers
5+
/src/shared/GitHub.Tests/ @git-ecosystem/git-client @git-ecosystem/hubbers

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup Condition = "'$(TargetFramework)' == 'net472'">
3030
<PackageReference Include="System.Text.Json">
31-
<Version>8.0.4</Version>
31+
<Version>8.0.5</Version>
3232
</PackageReference>
3333
</ItemGroup>
3434

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ supported by dotnet][dotnet-distributions].
5656
## Supported Git versions
5757

5858
Git Credential Manager tries to be compatible with the broadest set of Git
59-
versions (within reason). However there are some know problematic releases of
59+
versions (within reason). However there are some known problematic releases of
6060
Git that are not compatible.
6161

6262
- Git 1.x

0 commit comments

Comments
 (0)