Skip to content

Commit e28d543

Browse files
authored
Merge pull request #357 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents 9298386 + 6eb8450 commit e28d543

13 files changed

+27
-27
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.304-noble@sha256:1f7ccf88e076bc1cb1ddbd81959fb55b886b01851b092867bb7a638435fa1f1f
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-noble@sha256:0b7186a7247bf8c07085fd700613bb0425a6f8f6467a0342c12a535e767da803
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
* 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.
1616
* 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"`.
1718

1819
## Coding style
1920

.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: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ on:
55
branches:
66
- main
77

8-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
9-
permissions:
10-
actions: read
11-
pages: write
12-
id-token: write
13-
contents: read
14-
158
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
169
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
1710
concurrency:
@@ -20,12 +13,18 @@ concurrency:
2013

2114
jobs:
2215
publish-docs:
16+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
17+
permissions:
18+
actions: read
19+
pages: write
20+
id-token: write
21+
contents: read
2322
environment:
2423
name: github-pages
2524
url: ${{ steps.deployment.outputs.page_url }}
2625
runs-on: ubuntu-latest
2726
steps:
28-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2928
with:
3029
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3130
- name: ⚙ Install prerequisites
@@ -35,7 +34,7 @@ jobs:
3534
name: 📚 Generate documentation
3635

3736
- name: Upload artifact
38-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
37+
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
3938
with:
4039
path: docfx/_site
4140

.github/workflows/docs_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: 📚 Doc validation
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)

.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Building, testing, and packing the .NET code in this repository can be done by u
7878
For a good language service experience in VS Code, follow [these instructions](https://yarnpkg.com/getting-started/editor-sdks#vscode).
7979
In particular, the part about selecting the "Workspace Version" of TypeScript.
8080

81-
[pwsh]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell?view=powershell-6
81+
[pwsh]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell
8282

8383
## Releases
8484

@@ -92,9 +92,9 @@ Push the tag.
9292
When your repo is hosted by GitHub and you are using GitHub Actions, you should create a GitHub Release using the standard GitHub UI.
9393
Having previously used `nbgv tag` and pushing the tag will help you identify the precise commit and name to use for this release.
9494

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

97-
1. Find the most recent `.github\workflows\build.yml` GitHub workflow run of the tagged release.
97+
1. Find the most recent `.github/workflows/build.yml` GitHub workflow run of the tagged release.
9898
1. Upload the `deployables` artifact from that workflow run to your GitHub Release.
9999
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.
100100

@@ -131,7 +131,7 @@ The best way to keep your repo in sync with Library.Template's evolving features
131131
```ps1
132132
git fetch
133133
git checkout origin/main
134-
.\tools\MergeFrom-Template.ps1
134+
./tools/MergeFrom-Template.ps1
135135
# resolve any conflicts, then commit the merge commit.
136136
git push origin -u HEAD
137137
```

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersion)" />
2222
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
2323
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
24-
<PackageVersion Include="microsoft.testing.platform.msbuild" Version="1.7.3" />
24+
<PackageVersion Include="microsoft.testing.platform.msbuild" Version="1.8.2" />
2525
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.20" />
2626
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.13.40008" />
2727
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
@@ -42,13 +42,13 @@
4242
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
4343
<PackageVersion Include="TraceSource.ActivityTracing" Version="0.1.201-beta" />
4444
<PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
45-
<PackageVersion Include="xunit.v3.core" Version="3.0.0" />
45+
<PackageVersion Include="xunit.v3.core" Version="3.0.1" />
4646
</ItemGroup>
4747
<ItemGroup Label="Library.Template">
4848
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
4949
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
50-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
51-
<PackageVersion Include="xunit.v3" Version="3.0.0" />
50+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
51+
<PackageVersion Include="xunit.v3" Version="3.0.1" />
5252
</ItemGroup>
5353
<ItemGroup>
5454
<GlobalPackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />

SECURITY.md

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

55
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
66

7-
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://learn.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
88

99
## Reporting Security Issues
1010

azure-pipelines/PostPRMessage.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param(
88
$CommentState='Active'
99
)
1010

11-
# See https://docs.microsoft.com/en-us/dotnet/api/microsoft.teamfoundation.sourcecontrol.webapi.commentthreadstatus?view=azure-devops-dotnet
11+
# See https://learn.microsoft.com/dotnet/api/microsoft.teamfoundation.sourcecontrol.webapi.commentthreadstatus
1212
if ($CommentState -eq 'Active') {
1313
$StatusCode = 1
1414
} elseif ($CommentState -eq 'ByDesign') {
@@ -38,7 +38,7 @@ $body = ConvertTo-Json @{
3838
Write-Verbose "Posting JSON payload: `n$Body"
3939

4040
# Post the message to the Pull Request
41-
# https://docs.microsoft.com/en-us/rest/api/azure/devops/git/pull%20request%20threads?view=azure-devops-rest-5.1
41+
# https://learn.microsoft.com/rest/api/azure/devops/git/pull-request-threads
4242
$url = "$($env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)$env:SYSTEM_TEAMPROJECTID/_apis/git/repositories/$($env:BUILD_REPOSITORY_NAME)/pullRequests/$($env:SYSTEM_PULLREQUEST_PULLREQUESTID)/threads?api-version=5.1"
4343
if ($PSCmdlet.ShouldProcess($url, 'Post comment via REST call')) {
4444
try {

0 commit comments

Comments
 (0)