Skip to content

Commit

Permalink
update frameworks for fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
0xF6 committed Sep 16, 2024
1 parent cf79519 commit 2121de5
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 86 deletions.
5 changes: 4 additions & 1 deletion .nuke/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
DotNetPublish(c => c
.SetProject(RuneCLI)
.SetConfiguration(Configuration.Release)
.SetFramework("net9.0")
.SetRuntime(runtime)
.SetOutput(outputDir)
.EnableNoRestore());
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -323,6 +325,7 @@ AbsolutePath GetDotCoverOutputFile(string testAssembly)
.SetRuntime(runtime)
.SetConfiguration(Configuration.Release)
.SetPublishTrimmed(true)
.SetFramework("net9.0")
.SetOutput(outputDir)
.SetPublishReadyToRun(true)
.DisableNoRestore()
Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .nuke/build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -12,12 +12,13 @@
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<InvariantGlobalization>true</InvariantGlobalization>
<WarningLevel>0</WarningLevel>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.CodeGeneration" Version="6.3.0" />
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Utilities.IO.Globbing" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="8.1.0" />
<PackageReference Include="Nuke.Utilities.IO.Globbing" Version="8.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
152 changes: 73 additions & 79 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<DefineConstants>$(DefineConstants);STATIC_VALIDATE_IL;DEBUG_VTABLE;VALIDATE_RUNTIME_TOKEN;DEBUG</DefineConstants>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<InvariantGlobalization>true</InvariantGlobalization>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion>
Expand Down
1 change: 1 addition & 0 deletions lib/vein.compiler.shared/vein.compiler.shared.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion lib/version/version.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/compiler/veinc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<AssemblyName>veinc</AssemblyName>
<RootNamespace>vein</RootNamespace>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -28,7 +29,6 @@
<Using Include="System.Diagnostics.CodeAnalysis" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<TargetFramework>net9.0</TargetFramework>
<DebuggerSupport>false</DebuggerSupport>
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
<EventSourceSupport>false</EventSourceSupport>
Expand Down
1 change: 1 addition & 0 deletions tools/rune-cli/rune-cli.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<AssemblyName>rune</AssemblyName>
<RootNamespace>vein</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down

0 comments on commit 2121de5

Please sign in to comment.