Skip to content

Commit 24c2f64

Browse files
committed
Create updated version3 branch for future use if needed
1 parent fa8061d commit 24c2f64

4 files changed

Lines changed: 40 additions & 18 deletions

File tree

.config/dotnet-tools.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "5.0.0",
6+
"version": "6.2.0",
77
"commands": [
88
"dotnet-cake"
99
],
1010
"rollForward": false
11+
},
12+
"gitversion.tool": {
13+
"version": "6.4.0",
14+
"commands": [
15+
"dotnet-gitversion"
16+
],
17+
"rollForward": false
18+
},
19+
"gitreleasemanager.tool": {
20+
"version": "0.20.0",
21+
"commands": [
22+
"dotnet-gitreleasemanager"
23+
],
24+
"rollForward": false
1125
}
1226
}
1327
}

.github/workflows/NUnitProjectLoader.CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525

2626
steps:
2727
- name: ⤵️ Checkout Source
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6.0.2
2929
with:
3030
fetch-depth: 0
3131

3232
- name: 🛠️ Setup .NET
33-
uses: actions/setup-dotnet@v4
33+
uses: actions/setup-dotnet@v5.2.0
3434
with:
3535
dotnet-version: |
3636
6.0.x
@@ -54,15 +54,15 @@ jobs:
5454

5555
- name: 🪵 Upload InternalTrace logs
5656
if: always()
57-
uses: actions/upload-artifact@v4
57+
uses: actions/upload-artifact@v7
5858
with:
5959
name: InternalTraceLogs
6060
# This path is defined in build-settings.cake
6161
path: "*.log"
6262
# if-no-files-found: error
6363

6464
- name: 💾 Upload test results
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v7
6666
if: always()
6767
with:
6868
name: "Test Results"

GitVersion.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
next-version: 3.9.0
22
mode: ContinuousDelivery
3-
legacy-semver-padding: 5
4-
build-metadata-padding: 5
5-
commits-since-version-source-padding: 5
63
branches:
7-
master:
8-
regex: ^(main|version4)$
9-
tag: alpha
4+
main:
5+
label: alpha
106
release:
11-
tag: pre
7+
label: pre
128
pull-request:
13-
tag: pr
9+
label: pr

build.cake

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
#tool nuget:?package=NUnit.ConsoleRunner&version=3.22.0
2+
#tool nuget:?package=NUnit.ConsoleRunner&version=3.21.1
3+
#tool nuget:?package=NUnit.ConsoleRunner&version=3.20.2
14
#tool nuget:?package=NUnit.ConsoleRunner&version=3.19.2
25
#tool nuget:?package=NUnit.ConsoleRunner&version=3.18.3
36
#tool nuget:?package=NUnit.ConsoleRUnner&version=3.17.0
47
#tool nuget:?package=NUnit.ConsoleRunner&version=3.15.5
8+
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.22.0
9+
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.21.1
10+
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.20.2
511
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.19.2
612
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.18.3
713
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.17.0
@@ -15,14 +21,20 @@
1521
// StandardRunners is used as the default setting for our tests,
1622
// since the standard runner can execute all of them
1723
var StandardRunners = new IPackageTestRunner[] {
18-
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.19.2"),
24+
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.22.0"),
25+
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.21.1"),
26+
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.20.2"),
27+
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.19.2"),
1928
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.18.3"),
2029
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.17.0"),
2130
new NUnitConsoleRunner("NUnit.ConsoleRunner", "3.15.5"),
2231
};
2332

2433
var NetCoreRunners = new IPackageTestRunner[] {
25-
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.19.2", "tools/net8.0/any/nunit3-console.exe"),
34+
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.22.0", "tools/net8.0/any/nunit3-console.exe"),
35+
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.21.1", "tools/net8.0/any/nunit3-console.exe"),
36+
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.20.2", "tools/net8.0/any/nunit3-console.exe"),
37+
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.19.2", "tools/net8.0/any/nunit3-console.exe"),
2638
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.18.3", "tools/net6.0/any/nunit3-console.exe"),
2739
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.17.0", "tools/net6.0/any/nunit3-console.exe"),
2840
new NUnit3NetCoreConsoleRunner("NUnit.ConsoleRunner.NetCore", "3.15.5", "tools/net6.0/any/nunit3-console.exe")
@@ -33,7 +45,7 @@ var NetCoreRunners = new IPackageTestRunner[] {
3345
var AllRunners = new List<IPackageTestRunner>( StandardRunners.Concat(NetCoreRunners) ).ToArray();
3446

3547
// Load the recipe
36-
#load nuget:?package=NUnit.Cake.Recipe&version=1.4.0-alpha.5
48+
#load nuget:?package=NUnit.Cake.Recipe&version=1.6.0
3749
// Comment out above line and uncomment below for local tests of recipe changes
3850
//#load ../NUnit.Cake.Recipe/recipe/*.cake
3951

@@ -127,7 +139,7 @@ var AllTests = new PackageTest[] {
127139
BuildSettings.Packages.Add(
128140
new NuGetPackage(
129141
"NUnit.Extension.NUnitProjectLoader",
130-
"nuget/nunit-project-loader.nuspec",
142+
source: "nuget/nunit-project-loader.nuspec",
131143
checks: new PackageCheck[] {
132144
HasFiles("LICENSE.txt", "nunit_256.png"),
133145
HasDirectory("tools").WithFile("nunit-project-loader.legacy.addins"),
@@ -144,7 +156,7 @@ BuildSettings.Packages.Add(
144156
BuildSettings.Packages.Add(
145157
new ChocolateyPackage(
146158
"nunit-extension-nunit-project-loader",
147-
"choco/nunit-project-loader.nuspec",
159+
source: "choco/nunit-project-loader.nuspec",
148160
checks: new PackageCheck[] {
149161
HasDirectory("tools").WithFiles("LICENSE.txt", "VERIFICATION.txt", "nunit-project-loader.legacy.addins"),
150162
HasDirectory("tools/net462").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll"),

0 commit comments

Comments
 (0)