Skip to content

Commit c623276

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [66c7b5d from that repo](AArnott/Library.Template@66c7b5d).
2 parents f0f18ce + 66c7b5d commit c623276

14 files changed

Lines changed: 43 additions & 23 deletions

.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

.github/prompts/update-library-template.prompt.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description: Merges the latest Library.Template into this repo (at position of H
44

55
# Instructions
66

7-
1. Run `tools\MergeFrom-Template.ps1`
7+
1. Run `tools/MergeFrom-Template.ps1`
88
2. Resolve merge conflicts, taking into account conflict resolution policy below.
99
3. Validate the changes, as described in the validation section below.
10-
4. Commiting your changes (if applicable).
10+
4. Committing your changes (if applicable).
1111

1212
## Conflict resolution policy
1313

@@ -33,7 +33,7 @@ Conflicts in the following files should always be resolved by keeping the curren
3333
Very typically, when the incoming change is to a file that was deleted locally, the correct resolution is to re-delete the file.
3434

3535
In some cases however, the deleted file may have incoming changes that should be applied to other files.
36-
The `test\Library.Tests\Library.Tests.csproj` file is very typical of this.
36+
The `test/Library.Tests/Library.Tests.csproj` file is very typical of this.
3737
Changes to this file should very typically be applied to any and all test projects in the repo.
3838
You are responsible for doing this in addition to re-deleting this template file.
3939

@@ -44,7 +44,7 @@ Use #runSubagent for each step.
4444

4545
1. Verify that `dotnet restore` succeeds. Fix any issues that come up.
4646
2. Verify that `dotnet build` succeeds.
47-
3. Verify that tests succeed by running `tools\dotnet-test-cloud.ps1`.
47+
3. Verify that tests succeed by running `tools/dotnet-test-cloud.ps1`.
4848

4949
While these validations are described using `dotnet` CLI commands, some repos require using full msbuild.exe.
5050
You can detect this by checking the `azure-pipelines/dotnet.yml` or `.github/workflows/build.yml` files for use of one or the other tool.

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<PackageVersion Update="System.Reflection.Metadata" Version="9.0.0" />
5151
</ItemGroup>
5252
<ItemGroup Label="Library.Template">
53-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
53+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
5454
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
5555
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
5656
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />

azure-pipelines/archive-sourcecode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extends:
3636
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
3737
parameters:
3838
settings:
39-
networkIsolationPolicy: Permissive,CFSClean
39+
networkIsolationPolicy: Permissive,CFSClean2
4040
sdl:
4141
sourceAnalysisPool: VSEng-MicroBuildVSStable
4242

azure-pipelines/libtemplate-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extends:
3131
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
3232
parameters:
3333
settings:
34-
networkIsolationPolicy: Permissive,CFSClean
34+
networkIsolationPolicy: Permissive,CFSClean2
3535
sdl:
3636
sourceAnalysisPool:
3737
name: AzurePipelines-EO

azure-pipelines/official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extends:
4646
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
4747
parameters:
4848
settings:
49-
networkIsolationPolicy: Permissive,CFSClean
49+
networkIsolationPolicy: Permissive,CFSClean2
5050
sdl:
5151
sourceAnalysisPool: VSEng-MicroBuildVSStable
5252
codeSignValidation:

azure-pipelines/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extends:
2121
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
2222
parameters:
2323
settings:
24-
networkIsolationPolicy: Permissive,CFSClean
24+
networkIsolationPolicy: Permissive,CFSClean2
2525
sdl:
2626
sourceAnalysisPool: VSEng-MicroBuildVSStable
2727

0 commit comments

Comments
 (0)