Skip to content

Commit 50ecc78

Browse files
authored
Merge pull request #1250 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents 215d79d + 44bc7f5 commit 50ecc78

16 files changed

+55
-15
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:4fd7d3e5aeb6cfb75e923a54cdb0b6e858b27ad3b517837917c57c2e632b5694
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-noble@sha256:1f7ccf88e076bc1cb1ddbd81959fb55b886b01851b092867bb7a638435fa1f1f
33

44
# Installing mono makes `dotnet test` work without errors even for net472.
55
# But installing it takes a long time, so it's excluded by default.

.github/copilot-instructions.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copilot instructions for this repository
2+
3+
## High level guidance
4+
5+
* 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.
7+
8+
## Software Design
9+
10+
* Design APIs to be highly testable, and all functionality should be tested.
11+
* Avoid introducing binary breaking changes in public APIs of projects under `src` unless their project files have `IsPackable` set to `false`.
12+
13+
## Testing
14+
15+
* There should generally be one test project (under the `test` directory) per shipping project (under the `src` directory). Test projects are named after the project being tested with a `.Test` suffix.
16+
* Tests should use the Xunit testing framework.
17+
* Some tests are known to be unstable. When running tests, you should skip the unstable ones by running `dotnet test --filter "TestCategory!=FailsInCloudTest"`.
18+
19+
## Coding style
20+
21+
* Honor StyleCop rules and fix any reported build warnings *after* getting tests to pass.
22+
* In C# files, use namespace *statements* instead of namespace *blocks* for all new files.
23+
* Add API doc comments to all new public and internal members.

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# You can define any steps you want, and they will run before the agent starts.
2727
# If you do not check out your code, Copilot will do this for you.
2828
steps:
29-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3030
with:
3131
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3232
- name: ⚙ Install prerequisites

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
url: ${{ steps.deployment.outputs.page_url }}
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
28+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2929
with:
3030
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3131
- name: ⚙ Install prerequisites

.github/workflows/docs_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)
20-
uses: becheran/mlc@88c9db09b8dabab813a2edd13f955b36aa73657a # v0.22.0
20+
uses: becheran/mlc@18a06b3aa2901ca197de59c8b0b1f54fdba6b3fa # v1.0.0
2121
with:
2222
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/*,https://microsoft.github.io/vs-threading/* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*
2323
- name: ⚙ Install prerequisites

.github/workflows/libtemplate-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818
pull-requests: write
1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2121
with:
2222
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
2323

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Push the tag.
5656
When your repo is hosted by GitHub and you are using GitHub Actions, you should create a GitHub Release using the standard GitHub UI.
5757
Having previously used `nbgv tag` and pushing the tag will help you identify the precise commit and name to use for this release.
5858

59-
After publishing the release, the `.github\workflows\release.yml` workflow will be automatically triggered, which will:
59+
After publishing the release, the `.github/workflows/release.yml` workflow will be automatically triggered, which will:
6060

61-
1. Find the most recent `.github\workflows\build.yml` GitHub workflow run of the tagged release.
61+
1. Find the most recent `.github/workflows/build.yml` GitHub workflow run of the tagged release.
6262
1. Upload the `deployables` artifact from that workflow run to your GitHub Release.
6363
1. If you have `NUGET_API_KEY` defined as a secret variable for your repo or org, any nuget packages in the `deployables` artifact will be pushed to nuget.org.
6464

@@ -95,7 +95,7 @@ The best way to keep your repo in sync with Library.Template's evolving features
9595
```ps1
9696
git fetch
9797
git checkout origin/main
98-
.\tools\MergeFrom-Template.ps1
98+
./tools/MergeFrom-Template.ps1
9999
# resolve any conflicts, then commit the merge commit.
100100
git push origin -u HEAD
101101
```

CodeQL.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
path_classifiers:
2+
library:
3+
- 'test/**'

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77
<MessagePackVersion>2.5.198</MessagePackVersion>
8-
<MicroBuildVersion>2.0.198</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.199</MicroBuildVersion>
99
<RoslynVersion>4.14.0</RoslynVersion>
1010
<RoslynVersionForAnalyzers>4.14.0</RoslynVersionForAnalyzers>
1111
<VisualStudioThreadingVersion>17.14.15</VisualStudioThreadingVersion>
@@ -58,8 +58,8 @@
5858
<ItemGroup Label="Library.Template">
5959
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
6060
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
61-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
62-
<PackageVersion Include="xunit.v3" Version="2.0.3" />
61+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
62+
<PackageVersion Include="xunit.v3" Version="3.0.1" />
6363
</ItemGroup>
6464
<ItemGroup>
6565
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(CodeAnalysisAnalyzerVersion)" />

azure-pipelines/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ jobs:
248248
parameters:
249249
Is1ESPT: ${{ parameters.Is1ESPT }}
250250
RunTests: ${{ parameters.RunTests }}
251+
BuildRequiresAccessToken: ${{ parameters.RealSign }} # Real signing on non-Windows machines requires passing through access token to build steps that sign
251252
osRID: linux
252253
- ${{ if parameters.EnableDotNetFormatCheck }}:
253254
- script: dotnet format --verify-no-changes --exclude test/NativeAOTCompatibility.Test
@@ -284,6 +285,7 @@ jobs:
284285
parameters:
285286
Is1ESPT: ${{ parameters.Is1ESPT }}
286287
RunTests: ${{ parameters.RunTests }}
288+
BuildRequiresAccessToken: ${{ parameters.RealSign }} # Real signing on non-Windows machines requires passing through access token to build steps that sign
287289
osRID: osx
288290

289291
- job: WrapUp

0 commit comments

Comments
 (0)