Skip to content

Commit a576970

Browse files
�� CopilotCopilot
authored and
AArnott
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges commit 54db0f8 from that repo.\n\nConflict resolutions:\n- kept the current README badges\n- adopted the template's Microsoft Testing Platform and MicroBuild version updates while retaining repo-specific package pins\n- added init.ps1 support for the template's Setup plugin install path\n- re-deleted Expand-Template.ps1 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents fee5c9b + 54db0f8 commit a576970

25 files changed

Lines changed: 166 additions & 163 deletions

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.5.4",
6+
"version": "7.6.0",
77
"commands": [
88
"pwsh"
99
],
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "18.5.2",
13+
"version": "18.6.2",
1414
"commands": [
1515
"dotnet-coverage"
1616
],
@@ -31,7 +31,7 @@
3131
"rollForward": false
3232
},
3333
"nerdbank.dotnetrepotools": {
34-
"version": "1.2.1",
34+
"version": "1.3.13",
3535
"commands": [
3636
"repo"
3737
],

‎.github/Prime-ForCopilot.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if ((git rev-parse --is-shallow-repository) -eq 'true')
1+
if ((git -C $PSScriptRoot rev-parse --is-shallow-repository) -eq 'true')
22
{
33
Write-Host "Shallow clone detected, disabling NBGV Git engine so the build can succeed."
44
$env:NBGV_GitEngine='Disabled'

‎.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
17+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
23+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
30+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
37+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
44+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
50+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
56+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5757
with:
5858
name: deployables-${{ runner.os }}
5959
path: ${{ runner.temp }}/_artifacts/deployables

‎.github/copilot-instructions.md‎

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

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

99
## Software Design

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ 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

40+
## Updating package and SDK versions
41+
42+
After the merge, always check global.json for MSBuild Sdks with names starting with `Microsoft.VisualStudio.Internal.MicroBuild`.
43+
These SDK versions should match the value of the `MicroBuildVersion` property found in `Directory.Packages.props`.
44+
Always take the latest of the versions you see among these SDKs and the `MicroBuildVersion` property.
45+
4046
## Validation
4147

4248
Validate the merge result (after resolving any conflicts, if applicable).

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
DocFx: true # Workaround https://github.com/dotnet/docfx/issues/10808
3737

3838
- name: Upload artifact
39-
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
39+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
4040
with:
4141
path: docfx/_site
4242

4343
- name: Deploy to GitHub Pages
4444
id: deployment
45-
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
45+
uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<PropertyGroup>
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
7-
<MicrosoftTestingPlatformVersion>2.1.0</MicrosoftTestingPlatformVersion>
7+
<MicrosoftTestingPlatformVersion>2.2.1</MicrosoftTestingPlatformVersion>
88
<MessagePackVersion>2.5.198</MessagePackVersion>
9-
<MicroBuildVersion>2.0.208</MicroBuildVersion>
9+
<MicroBuildVersion>2.0.226</MicroBuildVersion>
1010
<RoslynVersion>4.14.0</RoslynVersion>
1111
<CodeAnalysisAnalyzerVersion>4.14.0</CodeAnalysisAnalyzerVersion>
1212
<VisualStudioThreadingVersion>17.14.15</VisualStudioThreadingVersion>
@@ -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.5.2" />
53+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ variables:
3535
extends:
3636
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
3737
parameters:
38-
settings:
39-
networkIsolationPolicy: Permissive,CFSClean2
4038
sdl:
4139
sourceAnalysisPool: VSEng-MicroBuildVSStable
4240

‎azure-pipelines/libtemplate-update.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ variables:
3030
extends:
3131
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
3232
parameters:
33-
settings:
34-
networkIsolationPolicy: Permissive,CFSClean2
3533
sdl:
3634
sourceAnalysisPool:
3735
name: AzurePipelines-EO

‎azure-pipelines/official.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ variables:
4545
extends:
4646
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
4747
parameters:
48-
settings:
49-
networkIsolationPolicy: Permissive,CFSClean2
5048
sdl:
5149
sourceAnalysisPool: VSEng-MicroBuildVSStable
5250
codeSignValidation:

0 commit comments

Comments
 (0)