fix: compatibility for windows

cherrynik · Jun 21, 2024 · 4ab50b3 · 4ab50b3
1 parent f91ea94
commit 4ab50b3
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 21 deletions.
diff --git a/MonoGame.sln b/MonoGame.sln
@@ -33,10 +33,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scellecs.Morpeh.Extended",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.Entities", "src\UnitTests\UnitTests.Entities\UnitTests.Entities.csproj", "{57F0A75A-5AD6-4187-9DC6-3CBA44333061}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monogame.ImGuiNet", "src\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj", "{C6DC05BB-8C77-4849-AC93-5A653DB503E9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "src\Libs\UI\UI.csproj", "{B7BAA8DC-A62F-4746-B6C4-9908C0AFD30A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monogame.ImGuiNet", "src\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj", "{62A786A2-BC48-453E-8185-01A403B15159}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -98,6 +98,10 @@ Global
 		{C6DC05BB-8C77-4849-AC93-5A653DB503E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6DC05BB-8C77-4849-AC93-5A653DB503E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6DC05BB-8C77-4849-AC93-5A653DB503E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62A786A2-BC48-453E-8185-01A403B15159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62A786A2-BC48-453E-8185-01A403B15159}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62A786A2-BC48-453E-8185-01A403B15159}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62A786A2-BC48-453E-8185-01A403B15159}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5E3B6238-A92E-4703-8527-1C2410D7906A} = {F5258F7E-B0BA-466D-8CF8-4DAB84722BE3}
@@ -114,8 +118,7 @@ Global
 		{7AD01EBF-370B-4F35-9AEC-172A889D643F} = {7AE4DC46-59EB-4F69-9240-C7363F0778AA}
 		{5D45D0B2-6B53-4487-B9C2-3F685B2EC1E4} = {FE9CE932-6F98-4455-A80F-2A0CDB6DB46E}
 		{57F0A75A-5AD6-4187-9DC6-3CBA44333061} = {FC0D63F3-9B01-46BD-9435-A7E26C905825}
-		{56FF7C50-4B5F-4480-A5BE-BA95925152A1} = {FE9CE932-6F98-4455-A80F-2A0CDB6DB46E}
 		{B7BAA8DC-A62F-4746-B6C4-9908C0AFD30A} = {7AE4DC46-59EB-4F69-9240-C7363F0778AA}
-		{C6DC05BB-8C77-4849-AC93-5A653DB503E9} = {FE9CE932-6F98-4455-A80F-2A0CDB6DB46E}
+		{62A786A2-BC48-453E-8185-01A403B15159} = {FE9CE932-6F98-4455-A80F-2A0CDB6DB46E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Apps/GameDesktop/GameDesktop.csproj b/src/Apps/GameDesktop/GameDesktop.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <RollForward>Major</RollForward>
     <PublishReadyToRun>false</PublishReadyToRun>
-    <LangVersion>default</LangVersion>
+    <LangVersion>preview</LangVersion>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
@@ -112,7 +112,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libs\Components\Components.csproj" />
-    <ProjectReference Include="..\..\Libs\External\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj" />
     <ProjectReference Include="..\..\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj" />
     <ProjectReference Include="..\..\Libs\Features\Features.csproj" />
     <ProjectReference Include="..\..\Libs\Services\Services.csproj" />

diff --git a/src/Libs/Components/Components.csproj b/src/Libs/Components/Components.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
     <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>default</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MonoGame.Aseprite" Version="5.1.1" />

diff --git a/src/Libs/Entities/Entities.csproj b/src/Libs/Entities/Entities.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>default</LangVersion>
+        <LangVersion>preview</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -13,12 +13,7 @@
 
     <ItemGroup>
       <PackageReference Include="LDtkMonogame" Version="1.3.2" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="LightInject">
-        <HintPath>..\..\..\..\..\.nuget\packages\lightinject\6.6.4\lib\net6.0\LightInject.dll</HintPath>
-      </Reference>
+      <PackageReference Include="LightInject" Version="6.6.4" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Libs/External/Scellecs.Morpeh.Extended/Scellecs.Morpeh.Extended.csproj b/src/Libs/External/Scellecs.Morpeh.Extended/Scellecs.Morpeh.Extended.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>default</LangVersion>
+        <LangVersion>preview</LangVersion>
     </PropertyGroup>
 
 

diff --git a/src/Libs/Features/Features.csproj b/src/Libs/Features/Features.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>default</LangVersion>
+    <LangVersion>preview</LangVersion>
     <IsDebug Condition="'$(Configuration)' == 'Debug'">true</IsDebug>
     <IsRelease Condition="'$(Configuration)' == 'Release'">true</IsRelease>
   </PropertyGroup>

diff --git a/src/Libs/Services/Services.csproj b/src/Libs/Services/Services.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>default</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Libs/Systems.Debugging/Systems.Debugging.csproj b/src/Libs/Systems.Debugging/Systems.Debugging.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>default</LangVersion>
+        <LangVersion>preview</LangVersion>
         <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
@@ -13,7 +13,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Components\Components.csproj" />
-      <ProjectReference Include="..\External\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj" />
+      <ProjectReference Include="..\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Libs/Systems/CollisionSystem.cs b/src/Libs/Systems/CollisionSystem.cs
@@ -18,7 +18,7 @@ public class CollisionSystem(World world) : IFixedSystem
 
     // TODO: Use graph instead (e.g. QuikGraph library), so will be handled the cases of relations like (combinatorics):
     // { 1: [2, 3] }, { 2: [1, 2] }, { 3: [1] }, { 4: [] }
-    private (EntityId, EntityId)[] _activeIntersect = [];
+    private (EntityId, EntityId)[] _activeIntersect = Array.Empty<(EntityId, EntityId)>();
 
     public delegate void OutsideHandler(Entity sender, Entity with);
 

diff --git a/src/Libs/Systems/Systems.csproj b/src/Libs/Systems/Systems.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
     <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>default</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LDtkMonogame" Version="1.3.2" />

diff --git a/src/Libs/UI/UI.csproj b/src/Libs/UI/UI.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>