Skip to content

Commit 3be5a7e

Browse files
AArnottAArnott
authored
Merge pull request #1350 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents 14e1dfc + 0a07ed6 commit 3be5a7e

8 files changed

+66
-38
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.4.6",
6+
"version": "7.5.0",
77
"commands": [
88
"pwsh"
99
],

‎.github/dependabot.yml

-23
This file was deleted.

‎.github/renovate.json

+39
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,45 @@
1616
"matchDatasources": ["dotnet-version", "docker"],
1717
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
1818
"groupName": "Dockerfile and global.json updates"
19+
},
20+
{
21+
"matchPackageNames": ["*"],
22+
"allowedVersions": "!/-g[a-f0-9]+$/"
23+
},
24+
{
25+
"matchPackageNames": [
26+
"System.Collections.Immutable",
27+
"System.Composition*",
28+
"System.Diagnostics.DiagnosticSource",
29+
"System.IO.Pipelines",
30+
"System.Reflection.Metadata",
31+
"System.Text.Json",
32+
"System.Threading.Tasks.Dataflow",
33+
"Microsoft.Bcl.AsyncInterfaces"
34+
],
35+
"allowedVersions": "<9.0",
36+
"groupName": "Included in .NET runtime"
37+
},
38+
{
39+
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
40+
"groupName": "microbuild"
41+
},
42+
{
43+
"matchPackageNames": ["Microsoft.VisualStudio.*"],
44+
"groupName": "Visual Studio SDK"
45+
},
46+
{
47+
"matchPackageNames": ["Microsoft.VisualStudio.*"],
48+
"matchUpdateTypes": ["patch"],
49+
"enabled": false
50+
},
51+
{
52+
"matchPackageNames": ["MessagePack"],
53+
"enabled": false
54+
},
55+
{
56+
"matchJsonata": [ "sharedVariableName='CodeAnalysisVersionForAnalyzers'" ],
57+
"enabled": false
1958
}
2059
]
2160
}

‎.github/workflows/docs_validate.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,23 @@ name: 📃 Docfx Validate
33
on:
44
pull_request:
55
workflow_dispatch:
6+
push:
7+
branches:
8+
- main
9+
- microbuild
610

711
jobs:
812
build:
9-
name: 📚 docfx
10-
runs-on: ubuntu-22.04
13+
name: 📚 Doc validation
14+
runs-on: ubuntu-24.04
1115
steps:
1216
- uses: actions/checkout@v4
1317
with:
1418
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
19+
- name: 🔗 Markup Link Checker (mlc)
20+
uses: becheran/[email protected]
21+
with:
22+
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*
1523
- name: ⚙ Install prerequisites
1624
run: |
1725
./init.ps1 -UpgradePrerequisites

‎.github/workflows/libtemplate-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
# Pushing commits that add or change files under .github/workflows will cause our workflow to fail.
4747
# But it usually isn't necessary because the target branch already has (or doesn't have) these changes.
48-
# So if the merged doesn't bring in any changes to these files, try the merge locally and push that
48+
# So if the merge doesn't bring in any changes to these files, try the merge locally and push that
4949
# to keep github happy.
5050
if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) {
5151
# Indeed there are no changes in that area. So merge locally to try to appease GitHub.

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You should install the version specified in `global.json` or a later version wit
2525
the same major.minor.Bxx "hundreds" band.
2626
For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
2727
while the 2.2.400 version would not be considered compatible by .NET SDK.
28-
See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information.
28+
See [.NET Core Versioning](https://learn.microsoft.com/dotnet/core/versions/) for more information.
2929

3030
## Package restore
3131

@@ -49,7 +49,7 @@ When we identify a gem that we should support but do not yet support, file [an i
4949
## Releases
5050

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

5454
Push the tag.
5555

‎Directory.Packages.props

+12-8
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77

8-
<MicroBuildVersion>2.0.171</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.181</MicroBuildVersion>
99
<MetadataVersion>61.0.15-preview</MetadataVersion>
1010
<WDKMetadataVersion>0.12.8-experimental</WDKMetadataVersion>
1111
<!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
1212
<ApiDocsVersion>0.1.42-alpha</ApiDocsVersion>
1313
<CodeAnalysisVersion>4.12.0</CodeAnalysisVersion>
14-
<CodeAnalysisVersion Condition="'$(IsTestProject)'!='true'">3.11.0</CodeAnalysisVersion>
14+
<CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
1515
</PropertyGroup>
1616
<ItemGroup>
17+
<!-- We have to use the MessagePack version used by win32metadata (https://github.com/microsoft/CsWin32/issues/371) -->
1718
<PackageVersion Include="MessagePack" Version="2.2.85" />
1819
<PackageVersion Include="MessagePackAnalyzer" Version="2.5.192" />
1920
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
@@ -36,19 +37,22 @@
3637
<PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
3738
<PackageVersion Include="Xunit.Assert" Version="2.3.0" />
3839
</ItemGroup>
39-
<ItemGroup Label="Library.Template">
40-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
41-
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
42-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
43-
<PackageVersion Include="xunit.v3" Version="1.0.1" />
44-
</ItemGroup>
4540
<ItemGroup Condition="'$(IsTestProject)'!='true'">
4641
<!-- These versions carefully chosen to support VS 2019 Update 11. -->
42+
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
43+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersionForAnalyzers)" />
44+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
4745
<PackageVersion Update="System.Collections.Immutable" Version="5.0.0" />
4846
<PackageVersion Update="System.Memory" Version="4.5.4" />
4947
<PackageVersion Update="System.Reflection.Metadata" Version="5.0.0" />
5048
<PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
5149
</ItemGroup>
50+
<ItemGroup Label="Library.Template">
51+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
52+
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
53+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
54+
<PackageVersion Include="xunit.v3" Version="1.1.0" />
55+
</ItemGroup>
5256
<ItemGroup>
5357
<!-- Put repo-specific GlobalPackageReference items in this group. -->
5458
</ItemGroup>

‎tools/Get-NuGetTool.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#>
77
Param(
88
[Parameter()]
9-
[string]$NuGetVersion='6.4.0'
9+
[string]$NuGetVersion='6.12.2'
1010
)
1111

1212
$toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"

0 commit comments

Comments
 (0)