gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inklecate: upgrade to .NET 8

Browse Source
This commit is contained in:
GGG
2025-01-04 01:34:56 +01:00
committed by Weijia Wang
parent 2a05f934fc
commit c9e58193d8
2 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
+65
View File
@@ -0,0 +1,65 @@
diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj
index d729fee..ea3e9e6 100644
--- a/InkTestBed/InkTestBed.csproj
+++ b/InkTestBed/InkTestBed.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<RootNamespace>InkTestBed</RootNamespace>
<AssemblyName>InkTestBed</AssemblyName>
diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj
index a6dd06b..c4708cc 100644
--- a/compiler/ink_compiler.csproj
+++ b/compiler/ink_compiler.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink</RootNamespace>
<AssemblyName>ink_compiler</AssemblyName>
</PropertyGroup>
diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
index caba6df..777c109 100644
--- a/ink-engine-runtime/ink-engine-runtime.csproj
+++ b/ink-engine-runtime/ink-engine-runtime.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net6.0</TargetFrameworks>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink.Runtime</RootNamespace>
<AssemblyName>ink-engine-runtime</AssemblyName>
</PropertyGroup>
diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj
index 0a02264..cf7b254 100644
--- a/inklecate/inklecate.csproj
+++ b/inklecate/inklecate.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink</RootNamespace>
<AssemblyName>inklecate</AssemblyName>
</PropertyGroup>
diff --git a/tests/tests.csproj b/tests/tests.csproj
index 8d3bd6b..a9731c5 100644
--- a/tests/tests.csproj
+++ b/tests/tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>tests</RootNamespace>
<AssemblyName>ink-tests</AssemblyName>
pkgs/by-name/in/inklecate/package.nix
+9 -7
View File
@@ -1,8 +1,9 @@
{ lib
, stdenv
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
{
lib,
stdenv,
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
}:
buildDotnetModule rec {
@@ -16,14 +17,15 @@ buildDotnetModule rec {
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
};
patches = [ ./dotnet-8-upgrade.patch ];
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
projectFile = "inklecate/inklecate.csproj";
nugetDeps = ./deps.json;
executables = [ "inklecate" ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
meta = with lib; {
description = "Compiler for ink, inkle's scripting language";