Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest Library.Template #1382

Merged
merged 18 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"powershell": {
"version": "7.4.6",
"version": "7.5.0",
"commands": [
"pwsh"
],
Expand Down
4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"matchDatasources": ["dotnet-version", "docker"],
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
"groupName": "Dockerfile and global.json updates"
},
{
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
"groupName": "microbuild"
}
]
}
6 changes: 5 additions & 1 deletion .github/workflows/docs_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ on:

jobs:
build:
name: 📚 docfx
name: 📚 Doc validation
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: 🔗 Markup Link Checker (mlc)
uses: becheran/mlc@v0.19.0
with:
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dev.azure.com/*,https://app.codecov.io/*,https://msrc.microsoft.com/*,https://www.microsoft.com/en-us/msrc* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://www.microsoft.com/msrc/cvd,https://www.microsoft.com/msrc,https://microsoft.sharepoint.com/*
- name: ⚙ Install prerequisites
run: |
./init.ps1 -UpgradePrerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/libtemplate-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

# Pushing commits that add or change files under .github/workflows will cause our workflow to fail.
# But it usually isn't necessary because the target branch already has (or doesn't have) these changes.
# So if the merged doesn't bring in any changes to these files, try the merge locally and push that
# So if the merge doesn't bring in any changes to these files, try the merge locally and push that
# to keep github happy.
if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) {
# Indeed there are no changes in that area. So merge locally to try to appease GitHub.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

### Prerequisites

* [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) with the version matching our [global.json](global.json) file. The version you install must be at least the version specified in the global.json file, and must be within the same hundreds version for the 3rd integer: x.y.Czz (x.y.C must match, and zz must be at least as high).

Check warning on line 20 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📚 Doc validation

link checker warning

https://dotnet.microsoft.com/download/dotnet-core/2.2. 200 - OK

Check warning on line 20 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📚 Doc validation

link checker warning

https://dotnet.microsoft.com/download/dotnet-core/2.2. 200 - OK
The easiest way to get this is to run the `init` script at the root of the repo. Use the `-InstallLocality Machine` and approve admin elevation if you wish so the SDK is always discoverable from VS. See the `init` script usage doc for more details.
* Optional: [Visual Studio 2019](https://www.visualstudio.com/)

Check warning on line 22 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📚 Doc validation

link checker warning

https://www.visualstudio.com/. Request was redirected to https://visualstudio.microsoft.com/

Check warning on line 22 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📚 Doc validation

link checker warning

https://www.visualstudio.com/. Request was redirected to https://visualstudio.microsoft.com/

The only prerequisite for building, testing, and deploying from this repository
is the [.NET SDK](https://get.dot.net/).
Expand All @@ -27,7 +27,7 @@
the same major.minor.Bxx "hundreds" band.
For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
while the 2.2.400 version would not be considered compatible by .NET SDK.
See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information.
See [.NET Core Versioning](https://learn.microsoft.com/dotnet/core/versions/) for more information.

## Package restore

Expand All @@ -49,7 +49,7 @@
## Releases

Use `nbgv tag` to create a tag for a particular commit that you mean to release.
[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://github.com/dotnet/Nerdbank.GitVersioning/blob/main/doc/nbgv-cli.md).
[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://dotnet.github.io/Nerdbank.GitVersioning/docs/nbgv-cli.html).

Push the tag.

Expand Down
2 changes: 1 addition & 1 deletion doc/analyzers/editorconfigs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ While several project types have specific .editorconfig files defined in this fo
Libraries that may run in any process, whether they have a main thread or not, should code themselves defensively to avoid any dependency on the main thread so that applications that do not follow `JoinableTaskFactory` rules can avoid deadlocks even when synchronously blocking their main thread using `Task.Wait()` on code running inside your library.
In particular, shared libraries of general interest should _always_ use `.ConfigureAwait(false)` when awaiting on tasks.

[Learn more about authoring libraries following best threading practices](../library_with_jtf.md).
[Learn more about authoring libraries following best threading practices](../../library_with_jtf.md).

### Libraries that run inside a JoinableTaskFactory-compliant application

Expand Down
2 changes: 1 addition & 1 deletion tools/Get-NuGetTool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#>
Param(
[Parameter()]
[string]$NuGetVersion='6.4.0'
[string]$NuGetVersion='6.12.2'
)

$toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"
Expand Down
Loading