Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Specifically, this merges [574886f from that repo](AArnott/Library.Template@574886f).
  • Loading branch information
AArnott authored Feb 8, 2025
2 parents 21a83d3 + 574886f commit 0db458b
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .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 All @@ -17,7 +17,7 @@
"rollForward": false
},
"nbgv": {
"version": "3.7.112",
"version": "3.7.115",
"commands": [
"nbgv"
],
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:9.0.101-noble
FROM mcr.microsoft.com/dotnet/sdk:9.0.102-noble

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
Expand Down
4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"matchDatasources": ["dotnet-version", "docker"],
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
"groupName": "Dockerfile and global.json updates"
},
{
"matchPackageNames": ["*"],
"allowedVersions": "!/-g[a-f0-9]+$/"
}
]
}
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,13 @@ jobs:
with:
name: benchmarks-${{ matrix.os }}
path: ${{ runner.temp }}/_artifacts/benchmarks

docs:
name: 📃 Docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: 🔗 Markup Link Checker (mlc)
uses: becheran/[email protected]
with:
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
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project is actively developed using the following software.
It is highly recommended that anyone contributing to this library use the same
software.

1. [Visual Studio 2019][VS]
1. [Visual Studio 2022][VS]

Check warning on line 12 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📃 Docs

link checker warning

https://www.visualstudio.com/downloads/. Request was redirected to https://visualstudio.microsoft.com/downloads/
2. [Node.js][NodeJs] v16 (v18 breaks our build)

Check warning on line 13 in CONTRIBUTING.md

View workflow job for this annotation

GitHub Actions / 📃 Docs

link checker warning

https://nodejs.org. Request was redirected to https://nodejs.org/en

### Optional additional software
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</ItemGroup>
<ItemGroup Label="Library.Template">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
<PackageVersion Include="xunit" Version="2.9.2" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.101",
"version": "9.0.102",
"rollForward": "patch",
"allowPrerelease": false
}
Expand Down
5 changes: 0 additions & 5 deletions test/Cake.GitVersioning.Tests/app.config

This file was deleted.

4 changes: 4 additions & 0 deletions test/Cake.GitVersioning.Tests/xunit.runner.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
"shadowCopy": false
}
4 changes: 4 additions & 0 deletions test/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup>
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="Exists('xunit.runner.json')" />
</ItemGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
</Project>
5 changes: 0 additions & 5 deletions test/Nerdbank.GitVersioning.Tests/app.config

This file was deleted.

4 changes: 4 additions & 0 deletions test/Nerdbank.GitVersioning.Tests/xunit.runner.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
"shadowCopy": false
}
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
2 changes: 1 addition & 1 deletion tools/artifacts/_stage_all.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ param (
[switch]$AvoidSymbolicLinks
)

$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal
$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal

function Create-SymbolicLink {
param (
Expand Down
2 changes: 1 addition & 1 deletion tools/artifacts/build_logs.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1"
$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"

if (!(Test-Path $ArtifactStagingFolder/build_logs)) { return }

Expand Down
2 changes: 1 addition & 1 deletion tools/artifacts/testResults.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $result = @{}
$testRoot = Resolve-Path "$PSScriptRoot\..\..\test"
$result[$testRoot] = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File)

$artifactStaging = & "$PSScriptRoot\..\Get-ArtifactsStagingDirectory.ps1"
$artifactStaging = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"
$testlogsPath = Join-Path $artifactStaging "test_logs"
if (Test-Path $testlogsPath) {
$result[$testlogsPath] = Get-ChildItem $testlogsPath -Recurse;
Expand Down

0 comments on commit 0db458b

Please sign in to comment.