Merge pull request #130 from Arthri/use-slnf

Consolidate solution files into one single solution file. Add solution files in place of old solutions
SignatureBeef · May 11, 2024 · a74e49f · a74e49f
2 parents 59b06f3 + 1233468
commit a74e49f
Show file tree

Hide file tree

Showing 12 changed files with 349 additions and 337 deletions.
diff --git a/.github/workflows/ci-nuget.yml b/.github/workflows/ci-nuget.yml
@@ -46,9 +46,9 @@ jobs:
 
       - name: Build the project
         run: |
-          dotnet build OTAPI.Mods.sln
+          dotnet build OTAPI.Mods.slnf
           (cd OTAPI.Patcher/bin/Debug/net6.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
-          dotnet build OTAPI.Server.Launcher.sln
+          dotnet build OTAPI.Server.Launcher.slnf
           (cd OTAPI.Server.Launcher/bin/Debug/net6.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
 
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,9 +51,9 @@ jobs:
 
       - name: Build the project
         run: |
-          dotnet build OTAPI.Mods.sln
+          dotnet build OTAPI.Mods.slnf
           (cd OTAPI.Patcher/bin/Debug/net6.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
-          dotnet build OTAPI.Server.Launcher.sln
+          dotnet build OTAPI.Server.Launcher.slnf
           (cd OTAPI.Server.Launcher/bin/Debug/net6.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
 
       - uses: actions/upload-artifact@v3

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/OTAPI.Mods.sln",
+                "${workspaceFolder}/OTAPI.Mods.slnf",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],

diff --git a/OTAPI.Client.Launcher.sln b/OTAPI.Client.Launcher.sln
diff --git a/OTAPI.Client.Launcher.slnf b/OTAPI.Client.Launcher.slnf
@@ -0,0 +1,12 @@
+{
+  "solution": {
+    "path": "OTAPI.sln",
+    "projects": [
+      "FNA\\FNA.Core.csproj",
+      "OTAPI.Client.Launcher\\OTAPI.Client.Launcher.csproj",
+      "OTAPI.Common\\OTAPI.Common.csproj",
+      "OTAPI.Patcher\\OTAPI.Patcher.csproj",
+      "OTAPI.Scripts\\OTAPI.Scripts.csproj"
+    ]
+  }
+}
diff --git a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
@@ -2,7 +2,6 @@
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
-		<Platforms>x64</Platforms>
 		<Nullable>enable</Nullable>
 		<DebugType>embedded</DebugType>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>

diff --git a/OTAPI.Mods.slnf b/OTAPI.Mods.slnf
@@ -0,0 +1,11 @@
+{
+  "solution": {
+    "path": "OTAPI.sln",
+    "projects": [
+      "FNA\\FNA.Core.csproj",
+      "OTAPI.Common\\OTAPI.Common.csproj",
+      "OTAPI.Patcher\\OTAPI.Patcher.csproj",
+      "OTAPI.Scripts\\OTAPI.Scripts.csproj"
+    ]
+  }
+}
diff --git a/OTAPI.Scripts/OTAPI.Scripts.csproj b/OTAPI.Scripts/OTAPI.Scripts.csproj
@@ -6,7 +6,6 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <Platforms>x64</Platforms>
   </PropertyGroup>
   <Import Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\Debug\net6.0\AutoGenerated.target" />
   <Import Condition="Exists('..\OTAPI.Client.Launcher\bin\Debug\net6.0\AutoGenerated.target')" Project="..\OTAPI.Client.Launcher\bin\Debug\net6.0\AutoGenerated.target" />

diff --git a/OTAPI.Server.Launcher.sln b/OTAPI.Server.Launcher.sln
diff --git a/OTAPI.Server.Launcher.slnf b/OTAPI.Server.Launcher.slnf
@@ -0,0 +1,9 @@
+{
+  "solution": {
+    "path": "OTAPI.sln",
+    "projects": [
+      "OTAPI.Server.Launcher\\OTAPI.Server.Launcher.csproj",
+      "examples\\RuntimeExample.Server\\RuntimeExample.Server.csproj"
+    ]
+  }
+}