| blob | 0504c7f1307eeded27ad8513ed73d7c65bb70975 |
1 From aecfb0a69f9e418158d4a09ec955e0c3f4d8f062 Mon Sep 17 00:00:00 2001
2 From: Lyze <11274700+lyze237@users.noreply.github.com>
3 Date: Fri, 20 Sep 2024 19:48:58 +0200
4 Subject: [PATCH] Fix nixos crashing
6 ---
7 .../LogicReinc.BlendFarm.Client.csproj | 2 +-
8 LogicReinc.BlendFarm.Client/RenderTask.cs | 1 +
9 LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs | 1 +
10 LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs | 1 +
11 LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs | 1 +
12 .../runtimeconfig.template.json | 10 ++++++++++
13 LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj | 2 --
14 LogicReinc.BlendFarm/nuget.config | 11 -----------
15 LogicReinc.BlendFarm/runtimeconfig.template.json | 10 ++++++++++
16 9 files changed, 25 insertions(+), 14 deletions(-)
17 create mode 100644 LogicReinc.BlendFarm.Client/runtimeconfig.template.json
18 delete mode 100644 LogicReinc.BlendFarm/nuget.config
19 create mode 100644 LogicReinc.BlendFarm/runtimeconfig.template.json
21 diff --git a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
22 index d534ea7..698e8d6 100644
23 --- a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
24 +++ b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
25 @@ -8,7 +8,7 @@
26 </PropertyGroup>
28 <ItemGroup>
29 - <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
30 + <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
31 <PackageReference Include="System.Text.Json" Version="5.0.0" />
32 </ItemGroup>
34 diff --git a/LogicReinc.BlendFarm.Client/RenderTask.cs b/LogicReinc.BlendFarm.Client/RenderTask.cs
35 index 9cc67dd..5ba3086 100644
36 --- a/LogicReinc.BlendFarm.Client/RenderTask.cs
37 +++ b/LogicReinc.BlendFarm.Client/RenderTask.cs
38 @@ -13,6 +13,7 @@
39 using System.Text;
40 using System.Threading;
41 using System.Threading.Tasks;
42 +using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
44 namespace LogicReinc.BlendFarm.Shared
45 {
46 diff --git a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
47 index 310fa20..d84dbea 100644
48 --- a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
49 +++ b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
50 @@ -5,6 +5,7 @@
51 using System.Drawing;
52 using System.Linq;
53 using System.Text;
54 +using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
56 namespace LogicReinc.BlendFarm.Client.Tasks
57 {
58 diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
59 index 6ed55dd..bf1eb14 100644
60 --- a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
61 +++ b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
62 @@ -8,6 +8,7 @@
63 using System.Linq;
64 using System.Text;
65 using System.Threading.Tasks;
66 +using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
68 namespace LogicReinc.BlendFarm.Client.Tasks
69 {
70 diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
71 index 7edcb92..5483d8f 100644
72 --- a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
73 +++ b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
74 @@ -9,6 +9,7 @@
75 using System.Text;
76 using System.Threading;
77 using System.Threading.Tasks;
78 +using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
80 namespace LogicReinc.BlendFarm.Client.Tasks
81 {
82 diff --git a/LogicReinc.BlendFarm.Client/runtimeconfig.template.json b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json
83 new file mode 100644
84 index 0000000..738771b
85 --- /dev/null
86 +++ b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json
87 @@ -0,0 +1,10 @@
88 +{
89 + "properties": {
90 + "runtimeOptions": {
91 + "System.Drawing.EnableUnixSupport": true
92 + }
93 + },
94 + "configProperties": {
95 + "System.Drawing.EnableUnixSupport": true
96 + }
97 +}
98 diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
99 index 97aa471..7e7096c 100644
100 --- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
101 +++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
102 @@ -60,8 +60,6 @@
103 <ItemGroup>
104 <PackageReference Include="Avalonia" Version="0.10.15" />
105 <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
106 - <PackageReference Include="runtime.linux-x64.CoreCompat.System.Drawing" Version="1.0.0-beta009" />
107 - <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
108 <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.0" />
109 </ItemGroup>
110 <ItemGroup>
111 diff --git a/LogicReinc.BlendFarm/nuget.config b/LogicReinc.BlendFarm/nuget.config
112 deleted file mode 100644
113 index 6c273ab..0000000
114 --- a/LogicReinc.BlendFarm/nuget.config
115 +++ /dev/null
116 @@ -1,11 +0,0 @@
117 -<?xml version="1.0" encoding="utf-8"?>
118 -
119 -<!--
120 - To use the Avalonia CI feed to get unstable packages, move this file to the root of your solution.
121 --->
122 -
123 -<configuration>
124 - <packageSources>
125 - <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
126 - </packageSources>
127 -</configuration>
128 diff --git a/LogicReinc.BlendFarm/runtimeconfig.template.json b/LogicReinc.BlendFarm/runtimeconfig.template.json
129 new file mode 100644
130 index 0000000..738771b
131 --- /dev/null
132 +++ b/LogicReinc.BlendFarm/runtimeconfig.template.json
133 @@ -0,0 +1,10 @@
134 +{
135 + "properties": {
136 + "runtimeOptions": {
137 + "System.Drawing.EnableUnixSupport": true
138 + }
139 + },
140 + "configProperties": {
141 + "System.Drawing.EnableUnixSupport": true
142 + }
143 +}