Improve linux support (new launcher)

.editorconfig

@@ -12,6 +12,8 @@ resharper_braces_for_ifelse = required_for_multiline
 resharper_braces_redundant = false
 resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_object_and_collection_initializer_style = chop_if_long
+resharper_space_before_self_closing = true
+resharper_xmldoc_space_before_self_closing = true
 
 [*.{proj,csproj,props,targets}]
 indent_size = 4
@@ -107,9 +109,6 @@ csharp_style_var_elsewhere = false:silent
 csharp_style_conditional_delegate_call = true:suggestion
 csharp_using_directive_placement = outside_namespace:silent
 
-[*.g.cs]
-generated_code = true
-
 # Newlines
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
@@ -217,3 +216,6 @@ dotnet_naming_rule.public_fields.severity = warning
 dotnet_naming_rule.general_types.symbols = types
 dotnet_naming_rule.general_types.style = pascal_case_style
 dotnet_naming_rule.general_types.severity = warning
+
+[*.g.cs]
+generated_code = true

.gitignore

@@ -3,6 +3,11 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+# MacOS specific
+.DS_Store
+# Generated by MSBuild for MacOS
+Info.plist
+
 # User-specific files
 *.rsuser
 *.suo
@@ -385,4 +390,4 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 .idea/
-*.sln.iml
+*.sln.iml

Directory.Build.props

@@ -1,29 +1,41 @@
-<Project>
-    <!-- Set default properties for all projects (can be overridden per project) -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <Import Project="Nitrox.Shared.props" />
+
+    <!-- Framework properties -->
     <PropertyGroup>
-        <LangVersion>12.0</LangVersion>
+        <LangVersion>13</LangVersion>
         <Version>1.8.0.0</Version>
-        <NitroxProject>false</NitroxProject>
-        <TestLibrary>false</TestLibrary>
-        <NitroxLibrary>false</NitroxLibrary>
-        <UnityModLibrary>false</UnityModLibrary>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Prefer32Bit>false</Prefer32Bit>
         <DebugType>embedded</DebugType>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <Nullable>disable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
         <PathMap>$(MSBuildProjectDirectory)=$(MSBuildProjectName)</PathMap>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <PolySharpUsePublicAccessibilityForGeneratedTypes>true</PolySharpUsePublicAccessibilityForGeneratedTypes>
+        <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
+    </PropertyGroup>
+
+    <!-- Nitrox specific properties -->
+    <PropertyGroup>
+        <!-- Fix for dotnet build CLI ; MSBuildThisFileDirectory refers to the folder where Directory.Build.props is defined -->
+        <NitroxRootDir>$(MSBuildThisFileDirectory)</NitroxRootDir>
+        <Authors>Nitrox</Authors>
+        <Company>Nitrox</Company>
+        <NitroxProject>false</NitroxProject>
+        <TestLibrary>false</TestLibrary>
+        <NitroxLibrary>false</NitroxLibrary>
+        <UnityModLibrary>false</UnityModLibrary>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectName), '^Nitrox.*$'))">
         <NitroxProject>true</NitroxProject>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(NitroxProject)' == 'true'">
+    <PropertyGroup Condition="'$(NitroxProject)' == 'true' and '$(MSBuildProjectName)' != 'Nitrox.Test'">
         <NitroxLibrary>true</NitroxLibrary>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(NitroxLibrary)' == 'true' and '$(MSBuildProjectName)' != 'NitroxModel' and '$(MSBuildProjectName)' != 'NitroxServer'">
+    <PropertyGroup Condition="'$(NitroxLibrary)' == 'true' and '$(MSBuildProjectName)' != 'NitroxModel' and '$(MSBuildProjectName)' != 'NitroxServer' and '$(MSBuildProjectName)' != 'Nitrox.Launcher'">
         <UnityModLibrary>true</UnityModLibrary>
     </PropertyGroup>
     <PropertyGroup Condition="'$(MSBuildProjectName)' == 'Nitrox.Test'">
@@ -35,50 +47,42 @@
     </PropertyGroup>
 
     <!-- Shared dependencies for all Nitrox.* projects -->
-    <Choose>
-        <When Condition="'$(NitroxProject)' == 'true'">
-            <ItemGroup>
-                <PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
-                    <Aliases>JB</Aliases>
-                </PackageReference>
-
-                <PackageReference Include="PolySharp" Version="1.14.1">
-                    <PrivateAssets>all</PrivateAssets>
-                    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-                </PackageReference>
-
-                <PackageReference Include="System.Memory" Version="4.5.5" />
-                <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-            </ItemGroup>
-        </When>
-    </Choose>
+    <ItemGroup Condition="'$(NitroxProject)' == 'true'">
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0">
+            <Aliases>JB</Aliases>
+        </PackageReference>
+        <PackageReference Include="IsExternalInit" Version="1.0.3">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="IndexRange" Version="1.0.3" />
+        <PackageReference Include="System.Memory" Version="4.5.5" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    </ItemGroup>
 
     <!-- Include default project references to all other "Nitrox*" projects -->
     <Choose>
-        <When Condition="'$(UnityModLibrary)' == 'true'">
+        <When Condition="'$(UnityModLibrary)' == 'true' or '$(TestLibrary)' == 'true'">
             <ItemGroup>
                 <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2">
                     <PrivateAssets>all</PrivateAssets>
                     <IncludeAssets>build; native; contentfiles; analyzers</IncludeAssets>
                 </PackageReference>
-                <PackageReference Include="Nitrox.Discovery.MSBuild" Version="0.0.5">
+                <PackageReference Include="Nitrox.Discovery.MSBuild" Version="0.1.0">
                     <PrivateAssets>all</PrivateAssets>
                     <IncludeAssets>build; native; contentfiles; analyzers</IncludeAssets>
                 </PackageReference>
-                <ProjectReference Include="$(SolutionDir)NitroxModel\NitroxModel.csproj">
-                    <Name>NitroxModel</Name>
-                </ProjectReference>
                 <PackageReference Include="Nitrox.Analyzers" Version="*">
                     <PrivateAssets>all</PrivateAssets>
-                    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+                    <IncludeAssets>build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
                 </PackageReference>
             </ItemGroup>
         </When>
     </Choose>
 
     <!-- Set internals visible for all projects for Nitrox.Test (excluding Nitrox.Test itself) -->
     <Choose>
-        <When Condition="'$(NitroxLibrary)' == 'true' and '$(TestLibrary)' != 'true'">
+        <When Condition="'$(NitroxLibrary)' == 'true'">
             <ItemGroup>
                 <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
                     <_Parameter1>Nitrox.Test</_Parameter1>