pyrox.dev
inklecate: upgrade to .NET 8
authored by GGG and committed by Weijia Wang c9e58193 2a05f934
+65
pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
+65
pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
···
···
1
+
diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj
2
+
index d729fee..ea3e9e6 100644
3
+
--- a/InkTestBed/InkTestBed.csproj
4
+
+++ b/InkTestBed/InkTestBed.csproj
5
+
@@ -2,7 +2,7 @@
6
+
7
+
<PropertyGroup>
8
+
<OutputType>Exe</OutputType>
9
+
- <TargetFramework>net6.0</TargetFramework>
10
+
+ <TargetFramework>net8.0</TargetFramework>
11
+
<TieredCompilation>true</TieredCompilation>
12
+
<RootNamespace>InkTestBed</RootNamespace>
13
+
<AssemblyName>InkTestBed</AssemblyName>
14
+
diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj
15
+
index a6dd06b..c4708cc 100644
16
+
--- a/compiler/ink_compiler.csproj
17
+
+++ b/compiler/ink_compiler.csproj
18
+
@@ -1,7 +1,7 @@
19
+
<Project Sdk="Microsoft.NET.Sdk">
20
+
21
+
<PropertyGroup>
22
+
- <TargetFramework>net6.0</TargetFramework>
23
+
+ <TargetFramework>net8.0</TargetFramework>
24
+
<RootNamespace>Ink</RootNamespace>
25
+
<AssemblyName>ink_compiler</AssemblyName>
26
+
</PropertyGroup>
27
+
diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
28
+
index caba6df..777c109 100644
29
+
--- a/ink-engine-runtime/ink-engine-runtime.csproj
30
+
+++ b/ink-engine-runtime/ink-engine-runtime.csproj
31
+
@@ -1,7 +1,7 @@
32
+
<Project Sdk="Microsoft.NET.Sdk">
33
+
34
+
<PropertyGroup>
35
+
- <TargetFrameworks>net6.0</TargetFrameworks>
36
+
+ <TargetFramework>net8.0</TargetFramework>
37
+
<RootNamespace>Ink.Runtime</RootNamespace>
38
+
<AssemblyName>ink-engine-runtime</AssemblyName>
39
+
</PropertyGroup>
40
+
diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj
41
+
index 0a02264..cf7b254 100644
42
+
--- a/inklecate/inklecate.csproj
43
+
+++ b/inklecate/inklecate.csproj
44
+
@@ -2,7 +2,7 @@
45
+
46
+
<PropertyGroup>
47
+
<OutputType>Exe</OutputType>
48
+
- <TargetFramework>net6.0</TargetFramework>
49
+
+ <TargetFramework>net8.0</TargetFramework>
50
+
<RootNamespace>Ink</RootNamespace>
51
+
<AssemblyName>inklecate</AssemblyName>
52
+
</PropertyGroup>
53
+
diff --git a/tests/tests.csproj b/tests/tests.csproj
54
+
index 8d3bd6b..a9731c5 100644
55
+
--- a/tests/tests.csproj
56
+
+++ b/tests/tests.csproj
57
+
@@ -1,7 +1,7 @@
58
+
<Project Sdk="Microsoft.NET.Sdk">
59
+
60
+
<PropertyGroup>
61
+
- <TargetFramework>net6.0</TargetFramework>
62
+
+ <TargetFramework>net8.0</TargetFramework>
63
+
<RootNamespace>tests</RootNamespace>
64
+
<AssemblyName>ink-tests</AssemblyName>
65
+
+9
-7
pkgs/by-name/in/inklecate/package.nix
+9
-7
pkgs/by-name/in/inklecate/package.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, buildDotnetModule
4
-
, dotnetCorePackages
5
-
, fetchFromGitHub
6
}:
7
8
buildDotnetModule rec {
···
16
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
17
};
18
19
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
20
21
projectFile = "inklecate/inklecate.csproj";
22
nugetDeps = ./deps.json;
23
executables = [ "inklecate" ];
24
25
-
dotnet-sdk = dotnetCorePackages.sdk_6_0;
26
-
dotnet-runtime = dotnetCorePackages.runtime_6_0;
27
28
meta = with lib; {
29
description = "Compiler for ink, inkle's scripting language";
···
1
+
{
2
+
lib,
3
+
stdenv,
4
+
buildDotnetModule,
5
+
dotnetCorePackages,
6
+
fetchFromGitHub,
7
}:
8
9
buildDotnetModule rec {
···
17
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
18
};
19
20
+
patches = [ ./dotnet-8-upgrade.patch ];
21
+
22
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
23
24
projectFile = "inklecate/inklecate.csproj";
25
nugetDeps = ./deps.json;
26
executables = [ "inklecate" ];
27
28
+
dotnet-sdk = dotnetCorePackages.sdk_8_0;
29
30
meta = with lib; {
31
description = "Compiler for ink, inkle's scripting language";