Skip to content

Commit 6dc6ace

Browse files
committed
Merge remote-tracking branch 'origin/main' into microbuild
2 parents 5e1fec3 + dc3950f commit 6dc6ace

6 files changed

Lines changed: 9 additions & 8 deletions

File tree

.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: 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/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
@@ -53,9 +53,9 @@ Push the tag.
5353
When your repo is hosted by GitHub and you are using GitHub Actions, you should create a GitHub Release using the standard GitHub UI.
5454
Having previously used `nbgv tag` and pushing the tag will help you identify the precise commit and name to use for this release.
5555

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

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

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

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<ItemGroup Label="Library.Template">
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1515
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
16-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
17-
<PackageVersion Include="xunit.v3" Version="3.0.0" />
16+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
17+
<PackageVersion Include="xunit.v3" Version="3.0.1" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<!-- Put repo-specific GlobalPackageReference items in this group. -->

0 commit comments

Comments
 (0)