From 2121de5bfcf646bd80a9aee1c1b1508b984506b2 Mon Sep 17 00:00:00 2001 From: Yuuki Wesp Date: Mon, 16 Sep 2024 16:41:11 +0300 Subject: [PATCH] update frameworks for fix build --- .nuke/Build.cs | 5 +- .nuke/build.csproj | 7 +- .nuke/build.schema.json | 152 +++++++++--------- Directory.Build.props | 2 +- .../vein.compiler.shared.csproj | 1 + lib/version/version.csproj | 2 +- tools/compiler/veinc.csproj | 2 +- tools/rune-cli/rune-cli.csproj | 1 + 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.nuke/Build.cs b/.nuke/Build.cs index ab2e8973..9fde525b 100644 --- a/.nuke/Build.cs +++ b/.nuke/Build.cs @@ -266,6 +266,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly) DotNetPublish(c => c .SetProject(RuneCLI) .SetConfiguration(Configuration.Release) + .SetFramework("net9.0") .SetRuntime(runtime) .SetOutput(outputDir) .EnableNoRestore()); @@ -293,6 +294,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly) .SetProject(Veinc) .SetConfiguration(Configuration.Release) .SetRuntime(runtime) + .SetFramework("net9.0") .SetOutput(outputDir) .EnableNoRestore()); Compress(outputDir, OutputDirectory / $"veinc.compiler.{runtime}.zip"); @@ -323,6 +325,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly) .SetRuntime(runtime) .SetConfiguration(Configuration.Release) .SetPublishTrimmed(true) + .SetFramework("net9.0") .SetOutput(outputDir) .SetPublishReadyToRun(true) .DisableNoRestore() @@ -349,7 +352,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly) .SetConfiguration(Configuration.Release) .SetRuntime(runtime) .SetPublishTrimmed(true) - .SetFramework("net8.0") + .SetFramework("net9.0") .EnableNoRestore()); // fucking nuke cannot work with native aot diff --git a/.nuke/build.csproj b/.nuke/build.csproj index 50548244..5ba14201 100644 --- a/.nuke/build.csproj +++ b/.nuke/build.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net8.0 CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006 .. @@ -12,12 +12,13 @@ true true 0 + true - - + + diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 98c40ce0..adbda605 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,46 +1,85 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/build", - "title": "Build Schema", + "properties": { + "CodeMaidPat": { + "type": "string", + "default": "Secrets must be entered via 'nuke :secrets [profile]'" + }, + "HasPublishWorkloads": { + "type": "boolean" + }, + "Solution": { + "type": "string", + "description": "Path to a solution file that is automatically loaded" + }, + "VeinApiKey": { + "type": "string", + "default": "Secrets must be entered via 'nuke :secrets [profile]'" + } + }, "definitions": { - "build": { - "type": "object", + "Host": { + "type": "string", + "enum": [ + "AppVeyor", + "AzurePipelines", + "Bamboo", + "Bitbucket", + "Bitrise", + "GitHubActions", + "GitLab", + "Jenkins", + "Rider", + "SpaceAutomation", + "TeamCity", + "Terminal", + "TravisCI", + "VSCode", + "VisualStudio" + ] + }, + "ExecutableTarget": { + "type": "string", + "enum": [ + "BuildIshtar", + "BuildIshtarNative", + "BuildRune", + "BuildTest", + "BuildVeinStd", + "BuildVeinc", + "Compile", + "Pack", + "PackIshtar", + "PublishRelease", + "PublishVeinStd", + "PublishWorkloads", + "Restore", + "TestWithCoverage" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "CodeMaidPat": { - "type": "string", - "default": "Secrets must be entered via 'nuke :secrets [profile]'" - }, "Continue": { "type": "boolean", "description": "Indicates to continue a previously failed build attempt" }, - "HasPublishWorkloads": { - "type": "boolean" - }, "Help": { "type": "boolean", "description": "Shows the help text for this build assembly" }, "Host": { - "type": "string", "description": "Host for execution. Default is 'automatic'", - "enum": [ - "AppVeyor", - "AzurePipelines", - "Bamboo", - "Bitbucket", - "Bitrise", - "GitHubActions", - "GitLab", - "Jenkins", - "Rider", - "SpaceAutomation", - "TeamCity", - "Terminal", - "TravisCI", - "VSCode", - "VisualStudio" - ] + "$ref": "#/definitions/Host" }, "NoLogo": { "type": "boolean", @@ -69,67 +108,22 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "BuildIshtar", - "BuildIshtarNative", - "BuildRune", - "BuildTest", - "BuildVeinStd", - "BuildVeinc", - "Compile", - "Pack", - "PackIshtar", - "PublishRelease", - "PublishVeinStd", - "PublishWorkloads", - "Restore", - "TestWithCoverage" - ] + "$ref": "#/definitions/ExecutableTarget" } }, - "Solution": { - "type": "string", - "description": "Path to a solution file that is automatically loaded" - }, "Target": { "type": "array", "description": "List of targets to be invoked. Default is '{default_target}'", "items": { - "type": "string", - "enum": [ - "BuildIshtar", - "BuildIshtarNative", - "BuildRune", - "BuildTest", - "BuildVeinStd", - "BuildVeinc", - "Compile", - "Pack", - "PackIshtar", - "PublishRelease", - "PublishVeinStd", - "PublishWorkloads", - "Restore", - "TestWithCoverage" - ] + "$ref": "#/definitions/ExecutableTarget" } }, - "VeinApiKey": { - "type": "string", - "default": "Secrets must be entered via 'nuke :secrets [profile]'" - }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", - "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" - ] + "$ref": "#/definitions/Verbosity" } } } - } + }, + "$ref": "#/definitions/NukeBuild" } diff --git a/Directory.Build.props b/Directory.Build.props index 3cb28468..6d83079b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ $(DefineConstants);STATIC_VALIDATE_IL;DEBUG_VTABLE;VALIDATE_RUNTIME_TOKEN;DEBUG - net9.0 + net8.0;net9.0 true true latest diff --git a/lib/vein.compiler.shared/vein.compiler.shared.csproj b/lib/vein.compiler.shared/vein.compiler.shared.csproj index d6a9490a..f7cdb796 100644 --- a/lib/vein.compiler.shared/vein.compiler.shared.csproj +++ b/lib/vein.compiler.shared/vein.compiler.shared.csproj @@ -1,6 +1,7 @@ + net8.0;net9.0 enable enable diff --git a/lib/version/version.csproj b/lib/version/version.csproj index e9d65634..827b19e7 100644 --- a/lib/version/version.csproj +++ b/lib/version/version.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.0;net8.0;net9.0 enable enable diff --git a/tools/compiler/veinc.csproj b/tools/compiler/veinc.csproj index 3a82fc11..2f94f0d7 100644 --- a/tools/compiler/veinc.csproj +++ b/tools/compiler/veinc.csproj @@ -2,6 +2,7 @@ veinc vein + net8.0;net9.0 Exe enable enable @@ -28,7 +29,6 @@ - net9.0 false false false diff --git a/tools/rune-cli/rune-cli.csproj b/tools/rune-cli/rune-cli.csproj index 8323ed80..c071da15 100644 --- a/tools/rune-cli/rune-cli.csproj +++ b/tools/rune-cli/rune-cli.csproj @@ -1,5 +1,6 @@ + net8.0;net9.0 rune vein Exe