Skip to content

Commit bb34a75

Browse files
FlorianRapplFlorianRappl
authored
Merge pull request #99 from lahma/update-deps
Upgrade dependencies and remove obsolete NET 6 and 7
2 parents 5187721 + b90ef8a commit bb34a75

File tree

5 files changed

+96
-94
lines changed

5 files changed

+96
-94
lines changed

‎.nuke/build.schema.json

+77-76
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,56 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Clean",
28+
"Compile",
29+
"CopyFiles",
30+
"CreatePackage",
31+
"Default",
32+
"Package",
33+
"PrePublish",
34+
"Publish",
35+
"PublishPackage",
36+
"PublishPreRelease",
37+
"PublishRelease",
38+
"Restore",
39+
"RunUnitTests"
40+
]
41+
},
42+
"Verbosity": {
43+
"type": "string",
44+
"description": "",
45+
"enum": [
46+
"Verbose",
47+
"Normal",
48+
"Minimal",
49+
"Quiet"
50+
]
51+
},
52+
"NukeBuild": {
853
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
1754
"Continue": {
1855
"type": "boolean",
1956
"description": "Indicates to continue a previously failed build attempt"
@@ -23,25 +60,8 @@
2360
"description": "Shows the help text for this build assembly"
2461
},
2562
"Host": {
26-
"type": "string",
2763
"description": "Host for execution. Default is 'automatic'",
28-
"enum": [
29-
"AppVeyor",
30-
"AzurePipelines",
31-
"Bamboo",
32-
"Bitbucket",
33-
"Bitrise",
34-
"GitHubActions",
35-
"GitLab",
36-
"Jenkins",
37-
"Rider",
38-
"SpaceAutomation",
39-
"TeamCity",
40-
"Terminal",
41-
"TravisCI",
42-
"VisualStudio",
43-
"VSCode"
44-
]
64+
"$ref": "#/definitions/Host"
4565
},
4666
"NoLogo": {
4767
"type": "boolean",
@@ -62,10 +82,6 @@
6282
"type": "string"
6383
}
6484
},
65-
"ReleaseNotesFilePath": {
66-
"type": "string",
67-
"description": "ReleaseNotesFilePath - To determine the SemanticVersion"
68-
},
6985
"Root": {
7086
"type": "string",
7187
"description": "Root directory during build execution"
@@ -74,61 +90,46 @@
7490
"type": "array",
7591
"description": "List of targets to be skipped. Empty list skips all dependencies",
7692
"items": {
77-
"type": "string",
78-
"enum": [
79-
"Clean",
80-
"Compile",
81-
"CopyFiles",
82-
"CreatePackage",
83-
"Default",
84-
"Package",
85-
"PrePublish",
86-
"Publish",
87-
"PublishPackage",
88-
"PublishPreRelease",
89-
"PublishRelease",
90-
"Restore",
91-
"RunUnitTests"
92-
]
93+
"$ref": "#/definitions/ExecutableTarget"
9394
}
9495
},
95-
"Solution": {
96-
"type": "string",
97-
"description": "Path to a solution file that is automatically loaded"
98-
},
9996
"Target": {
10097
"type": "array",
10198
"description": "List of targets to be invoked. Default is '{default_target}'",
10299
"items": {
103-
"type": "string",
104-
"enum": [
105-
"Clean",
106-
"Compile",
107-
"CopyFiles",
108-
"CreatePackage",
109-
"Default",
110-
"Package",
111-
"PrePublish",
112-
"Publish",
113-
"PublishPackage",
114-
"PublishPreRelease",
115-
"PublishRelease",
116-
"Restore",
117-
"RunUnitTests"
118-
]
100+
"$ref": "#/definitions/ExecutableTarget"
119101
}
120102
},
121103
"Verbosity": {
122-
"type": "string",
123104
"description": "Logging verbosity during build execution. Default is 'Normal'",
105+
"$ref": "#/definitions/Verbosity"
106+
}
107+
}
108+
}
109+
},
110+
"allOf": [
111+
{
112+
"properties": {
113+
"Configuration": {
114+
"type": "string",
115+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
124116
"enum": [
125-
"Minimal",
126-
"Normal",
127-
"Quiet",
128-
"Verbose"
117+
"Debug",
118+
"Release"
129119
]
120+
},
121+
"ReleaseNotesFilePath": {
122+
"type": "string",
123+
"description": "ReleaseNotesFilePath - To determine the SemanticVersion"
124+
},
125+
"Solution": {
126+
"type": "string",
127+
"description": "Path to a solution file that is automatically loaded"
130128
}
131129
}
130+
},
131+
{
132+
"$ref": "#/definitions/NukeBuild"
132133
}
133-
}
134+
]
134135
}

‎nuke/Build.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
using System.IO;
1616
using System.Linq;
1717
using Nuke.Common.Tooling;
18-
using static Nuke.Common.IO.FileSystemTasks;
18+
1919
using static Nuke.Common.Tools.DotNet.DotNetTasks;
2020
using static Nuke.Common.Tools.NuGet.NuGetTasks;
21+
2122
using Project = Nuke.Common.ProjectModel.Project;
2223

2324
class Build : NukeBuild
@@ -143,7 +144,7 @@ protected override void OnBuildInitialized()
143144
.EnableNoRestore()
144145
.EnableNoBuild()
145146
.SetProcessEnvironmentVariable("prefetched", "false")
146-
.When(GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
147+
.When(_ => GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
147148
);
148149

149150
DotNetTest(s => s
@@ -152,7 +153,7 @@ protected override void OnBuildInitialized()
152153
.EnableNoRestore()
153154
.EnableNoBuild()
154155
.SetProcessEnvironmentVariable("prefetched", "true")
155-
.When(GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
156+
.When(_ => GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
156157
);
157158
});
158159

@@ -165,14 +166,14 @@ protected override void OnBuildInitialized()
165166
var targetDir = NugetDirectory / "lib" / item;
166167
var srcDir = BuildDirectory / item;
167168

168-
CopyFile(srcDir / $"{TargetProjectName}.dll", targetDir / $"{TargetProjectName}.dll", FileExistsPolicy.OverwriteIfNewer);
169-
CopyFile(srcDir / $"{TargetProjectName}.pdb", targetDir / $"{TargetProjectName}.pdb", FileExistsPolicy.OverwriteIfNewer);
170-
CopyFile(srcDir / $"{TargetProjectName}.xml", targetDir / $"{TargetProjectName}.xml", FileExistsPolicy.OverwriteIfNewer);
169+
(srcDir / $"{TargetProjectName}.dll").Copy(targetDir / $"{TargetProjectName}.dll", policy: ExistsPolicy.FileOverwriteIfNewer);
170+
(srcDir / $"{TargetProjectName}.pdb").Copy(targetDir / $"{TargetProjectName}.pdb", policy: ExistsPolicy.FileOverwriteIfNewer);
171+
(srcDir / $"{TargetProjectName}.xml").Copy(targetDir / $"{TargetProjectName}.xml", policy: ExistsPolicy.FileOverwriteIfNewer);
171172
}
172173

173-
CopyFile(SourceDirectory / $"{TargetProjectName}.nuspec", NugetDirectory / $"{TargetProjectName}.nuspec", FileExistsPolicy.OverwriteIfNewer);
174-
CopyFile(RootDirectory / "logo.png", NugetDirectory / "logo.png", FileExistsPolicy.OverwriteIfNewer);
175-
CopyFile(RootDirectory / "README.md", NugetDirectory / "README.md", FileExistsPolicy.OverwriteIfNewer);
174+
(SourceDirectory / $"{TargetProjectName}.nuspec").Copy(NugetDirectory / $"{TargetProjectName}.nuspec", policy: ExistsPolicy.FileOverwriteIfNewer);
175+
(RootDirectory / "logo.png").Copy(NugetDirectory / "logo.png", policy: ExistsPolicy.FileOverwriteIfNewer);
176+
(RootDirectory / "README.md").Copy(NugetDirectory / "README.md", policy: ExistsPolicy.FileOverwriteIfNewer);
176177
});
177178

178179
Target CreatePackage => _ => _

‎nuke/_build.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="8.0.0" />
14+
<PackageReference Include="Nuke.Common" Version="9.0.4" />
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageDownload Include="NuGet.CommandLine" Version="[6.3.1]" />
18+
<PackageDownload Include="NuGet.CommandLine" Version="[6.12.2]" />
1919
</ItemGroup>
2020

2121
</Project>

‎src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0;net7.0;net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net462;net472;net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- https://github.com/Tyrrrz/GitHubActionsTestLogger/issues/5 -->
77
</PropertyGroup>
@@ -14,15 +14,15 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="AngleSharp.Io" Version="1.0.0" />
17-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
17+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
2121
<PackageReference Include="AngleSharp.Css" Version="1.0.0-beta.139" />
2222
<PackageReference Include="AngleSharp.Xml" Version="1.0.0" />
2323
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2424
<PackageReference Include="NUnit" Version="3.14.0" />
25-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
25+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2727
</ItemGroup>
2828
</Project>

‎src/AngleSharp.Js/AngleSharp.Js.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<RepositoryUrl>https://github.com/AngleSharp/AngleSharp.Js</RepositoryUrl>
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="AngleSharp" Version="1.1.2" />
21-
<PackageReference Include="Jint" Version="4.0.0" />
21+
<PackageReference Include="Jint" Version="4.1.0" />
2222
</ItemGroup>
2323

2424
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

0 commit comments

Comments
 (0)