Skip to content

Commit 2121de5

Browse files
0xF60xF6
committed
update frameworks for fix build
1 parent cf79519 commit 2121de5

File tree

8 files changed

+86
-86
lines changed

8 files changed

+86
-86
lines changed

‎.nuke/Build.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
266266
DotNetPublish(c => c
267267
.SetProject(RuneCLI)
268268
.SetConfiguration(Configuration.Release)
269+
.SetFramework("net9.0")
269270
.SetRuntime(runtime)
270271
.SetOutput(outputDir)
271272
.EnableNoRestore());
@@ -293,6 +294,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
293294
.SetProject(Veinc)
294295
.SetConfiguration(Configuration.Release)
295296
.SetRuntime(runtime)
297+
.SetFramework("net9.0")
296298
.SetOutput(outputDir)
297299
.EnableNoRestore());
298300
Compress(outputDir, OutputDirectory / $"veinc.compiler.{runtime}.zip");
@@ -323,6 +325,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
323325
.SetRuntime(runtime)
324326
.SetConfiguration(Configuration.Release)
325327
.SetPublishTrimmed(true)
328+
.SetFramework("net9.0")
326329
.SetOutput(outputDir)
327330
.SetPublishReadyToRun(true)
328331
.DisableNoRestore()
@@ -349,7 +352,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
349352
.SetConfiguration(Configuration.Release)
350353
.SetRuntime(runtime)
351354
.SetPublishTrimmed(true)
352-
.SetFramework("net8.0")
355+
.SetFramework("net9.0")
353356
.EnableNoRestore());
354357

355358
// fucking nuke cannot work with native aot

‎.nuke/build.csproj

+4-3
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;CA1050;CA1822;CA2211;IDE1006</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -12,12 +12,13 @@
1212
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1313
<InvariantGlobalization>true</InvariantGlobalization>
1414
<WarningLevel>0</WarningLevel>
15+
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
1516
</PropertyGroup>
1617

1718
<ItemGroup>
1819
<PackageReference Include="Nuke.CodeGeneration" Version="6.3.0" />
19-
<PackageReference Include="Nuke.Common" Version="8.0.0" />
20-
<PackageReference Include="Nuke.Utilities.IO.Globbing" Version="8.0.0" />
20+
<PackageReference Include="Nuke.Common" Version="8.1.0" />
21+
<PackageReference Include="Nuke.Utilities.IO.Globbing" Version="8.1.0" />
2122
</ItemGroup>
2223

2324
<ItemGroup>

‎.nuke/build.schema.json

+73-79
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,85 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
3+
"properties": {
4+
"CodeMaidPat": {
5+
"type": "string",
6+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
7+
},
8+
"HasPublishWorkloads": {
9+
"type": "boolean"
10+
},
11+
"Solution": {
12+
"type": "string",
13+
"description": "Path to a solution file that is automatically loaded"
14+
},
15+
"VeinApiKey": {
16+
"type": "string",
17+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
18+
}
19+
},
520
"definitions": {
6-
"build": {
7-
"type": "object",
21+
"Host": {
22+
"type": "string",
23+
"enum": [
24+
"AppVeyor",
25+
"AzurePipelines",
26+
"Bamboo",
27+
"Bitbucket",
28+
"Bitrise",
29+
"GitHubActions",
30+
"GitLab",
31+
"Jenkins",
32+
"Rider",
33+
"SpaceAutomation",
34+
"TeamCity",
35+
"Terminal",
36+
"TravisCI",
37+
"VSCode",
38+
"VisualStudio"
39+
]
40+
},
41+
"ExecutableTarget": {
42+
"type": "string",
43+
"enum": [
44+
"BuildIshtar",
45+
"BuildIshtarNative",
46+
"BuildRune",
47+
"BuildTest",
48+
"BuildVeinStd",
49+
"BuildVeinc",
50+
"Compile",
51+
"Pack",
52+
"PackIshtar",
53+
"PublishRelease",
54+
"PublishVeinStd",
55+
"PublishWorkloads",
56+
"Restore",
57+
"TestWithCoverage"
58+
]
59+
},
60+
"Verbosity": {
61+
"type": "string",
62+
"description": "",
63+
"enum": [
64+
"Verbose",
65+
"Normal",
66+
"Minimal",
67+
"Quiet"
68+
]
69+
},
70+
"NukeBuild": {
871
"properties": {
9-
"CodeMaidPat": {
10-
"type": "string",
11-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
12-
},
1372
"Continue": {
1473
"type": "boolean",
1574
"description": "Indicates to continue a previously failed build attempt"
1675
},
17-
"HasPublishWorkloads": {
18-
"type": "boolean"
19-
},
2076
"Help": {
2177
"type": "boolean",
2278
"description": "Shows the help text for this build assembly"
2379
},
2480
"Host": {
25-
"type": "string",
2681
"description": "Host for execution. Default is 'automatic'",
27-
"enum": [
28-
"AppVeyor",
29-
"AzurePipelines",
30-
"Bamboo",
31-
"Bitbucket",
32-
"Bitrise",
33-
"GitHubActions",
34-
"GitLab",
35-
"Jenkins",
36-
"Rider",
37-
"SpaceAutomation",
38-
"TeamCity",
39-
"Terminal",
40-
"TravisCI",
41-
"VSCode",
42-
"VisualStudio"
43-
]
82+
"$ref": "#/definitions/Host"
4483
},
4584
"NoLogo": {
4685
"type": "boolean",
@@ -69,67 +108,22 @@
69108
"type": "array",
70109
"description": "List of targets to be skipped. Empty list skips all dependencies",
71110
"items": {
72-
"type": "string",
73-
"enum": [
74-
"BuildIshtar",
75-
"BuildIshtarNative",
76-
"BuildRune",
77-
"BuildTest",
78-
"BuildVeinStd",
79-
"BuildVeinc",
80-
"Compile",
81-
"Pack",
82-
"PackIshtar",
83-
"PublishRelease",
84-
"PublishVeinStd",
85-
"PublishWorkloads",
86-
"Restore",
87-
"TestWithCoverage"
88-
]
111+
"$ref": "#/definitions/ExecutableTarget"
89112
}
90113
},
91-
"Solution": {
92-
"type": "string",
93-
"description": "Path to a solution file that is automatically loaded"
94-
},
95114
"Target": {
96115
"type": "array",
97116
"description": "List of targets to be invoked. Default is '{default_target}'",
98117
"items": {
99-
"type": "string",
100-
"enum": [
101-
"BuildIshtar",
102-
"BuildIshtarNative",
103-
"BuildRune",
104-
"BuildTest",
105-
"BuildVeinStd",
106-
"BuildVeinc",
107-
"Compile",
108-
"Pack",
109-
"PackIshtar",
110-
"PublishRelease",
111-
"PublishVeinStd",
112-
"PublishWorkloads",
113-
"Restore",
114-
"TestWithCoverage"
115-
]
118+
"$ref": "#/definitions/ExecutableTarget"
116119
}
117120
},
118-
"VeinApiKey": {
119-
"type": "string",
120-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
121-
},
122121
"Verbosity": {
123-
"type": "string",
124122
"description": "Logging verbosity during build execution. Default is 'Normal'",
125-
"enum": [
126-
"Minimal",
127-
"Normal",
128-
"Quiet",
129-
"Verbose"
130-
]
123+
"$ref": "#/definitions/Verbosity"
131124
}
132125
}
133126
}
134-
}
127+
},
128+
"$ref": "#/definitions/NukeBuild"
135129
}

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<DefineConstants>$(DefineConstants);STATIC_VALIDATE_IL;DEBUG_VTABLE;VALIDATE_RUNTIME_TOKEN;DEBUG</DefineConstants>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<InvariantGlobalization>true</InvariantGlobalization>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<LangVersion>latest</LangVersion>

‎lib/vein.compiler.shared/vein.compiler.shared.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
45
<ImplicitUsings>enable</ImplicitUsings>
56
<Nullable>enable</Nullable>
67
</PropertyGroup>

‎lib/version/version.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

‎tools/compiler/veinc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<AssemblyName>veinc</AssemblyName>
44
<RootNamespace>vein</RootNamespace>
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
56
<OutputType>Exe</OutputType>
67
<ImplicitUsings>enable</ImplicitUsings>
78
<Nullable>enable</Nullable>
@@ -28,7 +29,6 @@
2829
<Using Include="System.Diagnostics.CodeAnalysis" />
2930
</ItemGroup>
3031
<PropertyGroup Condition="'$(Configuration)'=='Release'">
31-
<TargetFramework>net9.0</TargetFramework>
3232
<DebuggerSupport>false</DebuggerSupport>
3333
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
3434
<EventSourceSupport>false</EventSourceSupport>

‎tools/rune-cli/rune-cli.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
34
<AssemblyName>rune</AssemblyName>
45
<RootNamespace>vein</RootNamespace>
56
<OutputType>Exe</OutputType>

0 commit comments

Comments
 (0)