Skip to content

Commit 0315a50

Browse files
psimsapsimsa
authored
Revert to .net8 (#64)
1 parent 2a1a78d commit 0315a50

File tree

9 files changed

+70
-91
lines changed

9 files changed

+70
-91
lines changed

‎.github/workflows/Build_main_and_publish_to_nuget.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@v4
30-
- name: Set up .NET 9.0
31-
uses: actions/setup-dotnet@v4
32-
with:
33-
dotnet-version: 9.0.x
3430
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3531
uses: actions/cache@v4
3632
with:

‎.github/workflows/Continuous_build.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@v4
30-
- name: Set up .NET 9.0
31-
uses: actions/setup-dotnet@v4
32-
with:
33-
dotnet-version: 9.0.x
3430
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3531
uses: actions/cache@v4
3632
with:

‎.github/workflows/Manual_publish_to_Github_Nuget.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v4
27-
- name: Set up .NET 9.0
28-
uses: actions/setup-dotnet@v4
29-
with:
30-
dotnet-version: 9.0.x
3127
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3228
uses: actions/cache@v4
3329
with:

‎.nuke/build.schema.json‎

Lines changed: 64 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,19 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3+
"$ref": "#/definitions/build",
4+
"title": "Build Schema",
35
"definitions": {
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-
"Pack",
30-
"Publish",
31-
"PublishToGitHubNuget",
32-
"Restore",
33-
"Test"
34-
]
35-
},
36-
"Verbosity": {
37-
"type": "string",
38-
"description": "",
39-
"enum": [
40-
"Verbose",
41-
"Normal",
42-
"Minimal",
43-
"Quiet"
44-
]
45-
},
46-
"NukeBuild": {
6+
"build": {
7+
"type": "object",
478
"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+
},
4817
"Continue": {
4918
"type": "boolean",
5019
"description": "Indicates to continue a previously failed build attempt"
@@ -54,13 +23,34 @@
5423
"description": "Shows the help text for this build assembly"
5524
},
5625
"Host": {
26+
"type": "string",
5727
"description": "Host for execution. Default is 'automatic'",
58-
"$ref": "#/definitions/Host"
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+
]
5945
},
6046
"NoLogo": {
6147
"type": "boolean",
6248
"description": "Disables displaying the NUKE logo"
6349
},
50+
"NuGetApiKey": {
51+
"type": "string",
52+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
53+
},
6454
"Partition": {
6555
"type": "string",
6656
"description": "Partition to use on CI"
@@ -84,46 +74,49 @@
8474
"type": "array",
8575
"description": "List of targets to be skipped. Empty list skips all dependencies",
8676
"items": {
87-
"$ref": "#/definitions/ExecutableTarget"
77+
"type": "string",
78+
"enum": [
79+
"Clean",
80+
"Compile",
81+
"Pack",
82+
"Publish",
83+
"PublishToGitHubNuget",
84+
"Restore",
85+
"Test"
86+
]
8887
}
8988
},
89+
"Solution": {
90+
"type": "string",
91+
"description": "Path to a solution file that is automatically loaded"
92+
},
9093
"Target": {
9194
"type": "array",
9295
"description": "List of targets to be invoked. Default is '{default_target}'",
9396
"items": {
94-
"$ref": "#/definitions/ExecutableTarget"
97+
"type": "string",
98+
"enum": [
99+
"Clean",
100+
"Compile",
101+
"Pack",
102+
"Publish",
103+
"PublishToGitHubNuget",
104+
"Restore",
105+
"Test"
106+
]
95107
}
96108
},
97109
"Verbosity": {
98-
"description": "Logging verbosity during build execution. Default is 'Normal'",
99-
"$ref": "#/definitions/Verbosity"
100-
}
101-
}
102-
}
103-
},
104-
"allOf": [
105-
{
106-
"properties": {
107-
"Configuration": {
108110
"type": "string",
109-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
111+
"description": "Logging verbosity during build execution. Default is 'Normal'",
110112
"enum": [
111-
"Debug",
112-
"Release"
113+
"Minimal",
114+
"Normal",
115+
"Quiet",
116+
"Verbose"
113117
]
114-
},
115-
"NuGetApiKey": {
116-
"type": "string",
117-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
118-
},
119-
"Solution": {
120-
"type": "string",
121-
"description": "Path to a solution file that is automatically loaded"
122118
}
123119
}
124-
},
125-
{
126-
"$ref": "#/definitions/NukeBuild"
127120
}
128-
]
121+
}
129122
}

‎build/Build.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
using Nuke.Common.ProjectModel;
88
using Nuke.Common.Tooling;
99
using Nuke.Common.Tools.DotNet;
10+
using static Nuke.Common.IO.FileSystemTasks;
1011
using static Nuke.Common.Tools.DotNet.DotNetTasks;
1112

1213
[GitHubActions(
1314
"Continuous build",
1415
GitHubActionsImage.UbuntuLatest,
15-
AutoGenerate = false,
1616
OnPushBranchesIgnore = new[] { "main" },
1717
InvokedTargets = new[] { nameof(Clean), nameof(Compile), nameof(Test), nameof(Pack) },
1818
EnableGitHubToken = true
@@ -21,15 +21,13 @@
2121
"Manual publish to Github Nuget",
2222
GitHubActionsImage.UbuntuLatest,
2323
On = new[] { GitHubActionsTrigger.WorkflowDispatch },
24-
AutoGenerate = false,
2524
InvokedTargets = new[] { nameof(Pack), nameof(PublishToGitHubNuget) },
2625
EnableGitHubToken = true
2726
)]
2827
[GitHubActions(
2928
"Build main and publish to nuget",
3029
GitHubActionsImage.UbuntuLatest,
3130
OnPushBranches = new[] { "main" },
32-
AutoGenerate = false,
3331
InvokedTargets = new[]
3432
{ nameof(Clean), nameof(Compile), nameof(Pack), nameof(PublishToGitHubNuget), nameof(Publish) },
3533
ImportSecrets = new[] { nameof(NuGetApiKey) },

‎build/_build.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

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

1717
<ItemGroup>

‎src/DotnetDispatcher.Generator/DotnetDispatcher.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" PrivateAssets="all" />
2222
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎test/DotnetDispatcher.Tests.Domain/DotnetDispatcher.Tests.Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎test/DotnetDispatcher.Tests/DotnetDispatcher.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

0 commit comments

Comments
 (0)