Skip to content

Commit ae5b6ac

Browse files
AArnottCharles-Gagnonrenovate[bot]
authored
Merge latest Library.Template (#345)
* Skip native binary PDB conversion Add check to skip conversion for native binary PDBs. * Only disable NBGV_GitEngine when necessary * Merge pull request 481 from AArnott/renovate/docfx-2.x Update dependency docfx to v2.78.5 * Update mcr.microsoft.com/dotnet/sdk:10.0.103 Docker digest to e362a8d (480) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency dotnet-coverage to v18.5.1 (483) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency Microsoft.Testing.Extensions.CodeCoverage to 18.5.1 (484) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update GitHub Artifact Actions (482) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Bump DotNetRepoTools to 1.2.1 * Update dependency Microsoft.Testing.Extensions.CodeCoverage to 18.5.2 (486) * Update dependency dotnet-coverage to v18.5.2 (485) --------- Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 parents bd2895c + d3ecd9d commit ae5b6ac

File tree

6 files changed

+32
-12
lines changed

6 files changed

+32
-12
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "18.4.1",
13+
"version": "18.5.2",
1414
"commands": [
1515
"dotnet-coverage"
1616
],
@@ -24,14 +24,14 @@
2424
"rollForward": false
2525
},
2626
"docfx": {
27-
"version": "2.78.4",
27+
"version": "2.78.5",
2828
"commands": [
2929
"docfx"
3030
],
3131
"rollForward": false
3232
},
3333
"nerdbank.dotnetrepotools": {
34-
"version": "1.1.1",
34+
"version": "1.2.1",
3535
"commands": [
3636
"repo"
3737
],

.github/Prime-ForCopilot.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if ((git rev-parse --is-shallow-repository) -eq 'true')
2+
{
3+
Write-Host "Shallow clone detected, disabling NBGV Git engine so the build can succeed."
4+
$env:NBGV_GitEngine='Disabled'
5+
}

.github/actions/publish-artifacts/action.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,46 @@ runs:
1414

1515
- name: 📢 Upload project.assets.json files
1616
if: always()
17-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
17+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1818
with:
1919
name: projectAssetsJson-${{ runner.os }}
2020
path: ${{ runner.temp }}/_artifacts/projectAssetsJson
2121
continue-on-error: true
2222
- name: 📢 Upload variables
23-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
23+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
2424
with:
2525
name: variables-${{ runner.os }}
2626
path: ${{ runner.temp }}/_artifacts/Variables
2727
continue-on-error: true
2828
- name: 📢 Upload build_logs
2929
if: always()
30-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
30+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3131
with:
3232
name: build_logs-${{ runner.os }}
3333
path: ${{ runner.temp }}/_artifacts/build_logs
3434
continue-on-error: true
3535
- name: 📢 Upload testResults
3636
if: always()
37-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
37+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3838
with:
3939
name: testResults-${{ runner.os }}
4040
path: ${{ runner.temp }}/_artifacts/testResults
4141
continue-on-error: true
4242
- name: 📢 Upload coverageResults
4343
if: always()
44-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
44+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4545
with:
4646
name: coverageResults-${{ runner.os }}
4747
path: ${{ runner.temp }}/_artifacts/coverageResults
4848
continue-on-error: true
4949
- name: 📢 Upload symbols
50-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
50+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5151
with:
5252
name: symbols-${{ runner.os }}
5353
path: ${{ runner.temp }}/_artifacts/symbols
5454
continue-on-error: true
5555
- name: 📢 Upload deployables
56-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
56+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5757
with:
5858
name: deployables-${{ runner.os }}
5959
path: ${{ runner.temp }}/_artifacts/deployables

.github/copilot-instructions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
## High level guidance
44

55
* Review the `CONTRIBUTING.md` file for instructions to build and test the software.
6-
* Set the `NBGV_GitEngine` environment variable to `Disabled` before running any `dotnet` or `msbuild` commands.
6+
* Run the `.github\Prime-ForCopilot.ps1` script (once) before running any `dotnet` or `msbuild` commands.
7+
If you see any build errors about not finding git objects or a shallow clone, it may be time to run this script again.
78

89
## Software Design
910

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageVersion Include="Moq" Version="4.20.72" />
1414
</ItemGroup>
1515
<ItemGroup Label="Library.Template">
16-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
16+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
1717
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
1818
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
1919
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />

tools/Prepare-Legacy-Symbols.ps1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ Get-ChildItem "$ArtifactStagingFolder\*.pdb" -Recurse |% {
2020
}
2121

2222
if ($BinaryImagePath) {
23+
# Native binaries can't have their PDBs converted to legacy (Windows) format so just skip them
24+
try {
25+
$assembly = [System.Reflection.AssemblyName]::GetAssemblyName($BinaryImagePath)
26+
$isManaged = $true
27+
}
28+
catch {
29+
$isManaged = $false
30+
}
31+
32+
if (-not $isManaged) {
33+
Write-Host "Skipping native binary PDB: $_" -ForegroundColor DarkYellow
34+
return
35+
}
36+
2337
# Convert the PDB to legacy Windows PDBs
2438
Write-Host "Converting PDB for $_" -ForegroundColor DarkGray
2539
$WindowsPdbDir = "$($_.Directory.FullName)\$WindowsPdbSubDirName"

0 commit comments

Comments
 (0)