diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 4166c17..69d144b 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
env:
DOTNET_VERSION: 9.0
- PROJECT: StarMapLoader/StarMapLoader.csproj
+ PROJECT: StarMap.Launcher/StarMap.Launcher.csproj
NUGET_SOURCE: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
steps:
@@ -33,8 +33,8 @@ jobs:
dotnet nuget add source --username "${{ secrets.ORG_PACKAGE_USERNAME }}" --password "${{ secrets.ORG_PACKAGE_TOKEN }}" --store-password-in-clear-text --name github "${{ env.NUGET_SOURCE }}"
dotnet restore ${{ env.PROJECT }}
- # - name: Run tests
- # run: dotnet test --no-build --verbosity normal
-
- name: Build
run: dotnet build ${{ env.PROJECT }} -c Release
+
+ # - name: Run tests
+ # run: dotnet test --no-build --verbosity normal
diff --git a/.github/workflows/rc-build.yml b/.github/workflows/rc-build.yml
new file mode 100644
index 0000000..766f5da
--- /dev/null
+++ b/.github/workflows/rc-build.yml
@@ -0,0 +1,198 @@
+name: Release new version
+
+on:
+ push:
+ branches: [dev]
+
+env:
+ DOTNET_VERSION: 10.0
+ STANDALONE_PROJECT: StarMap.Loader/StarMap.Loader.csproj
+ LAUNCHER_PROJECT: StarMap.Launcher/StarMap.Launcher.csproj
+ API_PROJECT: StarMap.API/StarMap.API.csproj
+ STANDALONE_OUTPUT_PATH: ./publish/standalone
+ LAUNCHER_OUTPUT_PATH: ./publish/launcher
+ OUTPUT_PATH: ./publish
+ NUGET_SOURCE: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
+ EXCLUDE: "*.pdb *.xml"
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ outputs:
+ new_version: ${{ steps.version.outputs.new_version }}
+ prev_version: ${{ steps.version.outputs.prev_version }}
+ hash_version: ${{ steps.version.outputs.hash_version }}
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ fetch-tags: true
+
+ - uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
+
+ - name: Determine version bump
+ id: version
+ run: |
+ git fetch --tags --force || true
+
+ # Find latest semantic version
+ current=$(git tag -l '[0-9]*.[0-9]*.[0-9]*' | sort -V | tail -n 1)
+ if [ -z "$current" ]; then
+ current="0.0.0"
+ fi
+ echo "Latest semantic tag: $current"
+
+ ver=${current#v}
+ major=$(printf "%s" "$ver" | awk -F. '{print $1+0}')
+ minor=$(printf "%s" "$ver" | awk -F. '{print $2+0}')
+ patch=$(printf "%s" "$ver" | awk -F. '{print $3+0}')
+
+ patch=$((patch+1))
+ new_version="${major}.${minor}.${patch}"
+
+ # Truly unique RC version
+ hash_version="${new_version}-rc.${GITHUB_RUN_NUMBER}+${GITHUB_SHA::7}"
+
+ echo "Next version: $new_version"
+ echo "RC version: $hash_version"
+
+ echo "prev_version=$current" >> $GITHUB_OUTPUT
+ echo "new_version=$new_version" >> $GITHUB_OUTPUT
+ echo "hash_version=$hash_version" >> $GITHUB_OUTPUT
+
+ - name: Setup NuGet source
+ run: |
+ dotnet nuget add source \
+ --username ${{ secrets.ORG_PACKAGE_USERNAME }} \
+ --password ${{ secrets.ORG_PACKAGE_TOKEN }} \
+ --store-password-in-clear-text \
+ --name github "${{ env.NUGET_SOURCE }}"
+
+ - name: Build launcher
+ run: |
+ dotnet publish ${{ env.LAUNCHER_PROJECT }} \
+ -c Release \
+ -o ${{ env.LAUNCHER_OUTPUT_PATH }} \
+ -r win-x64 \
+ --self-contained false \
+ /p:PackageVersion=${{ steps.version.outputs.hash_version }} \
+ /p:Version=${{ steps.version.outputs.new_version }} \
+ /p:AssemblyVersion=${{ steps.version.outputs.new_version }} \
+ /p:FileVersion=${{ steps.version.outputs.new_version }}
+
+ - name: Build standalone
+ run: |
+ dotnet publish ${{ env.STANDALONE_PROJECT }} \
+ -c Release \
+ -o ${{ env.STANDALONE_OUTPUT_PATH }} \
+ -r win-x64 \
+ --self-contained false \
+ /p:PackageVersion=${{ steps.version.outputs.hash_version }} \
+ /p:Version=${{ steps.version.outputs.new_version }} \
+ /p:AssemblyVersion=${{ steps.version.outputs.new_version }} \
+ /p:FileVersion=${{ steps.version.outputs.new_version }}
+
+ - name: Rename executables
+ run: |
+ mv ${{ env.LAUNCHER_OUTPUT_PATH }}/MyProgram.Launcher.exe ${{ env.LAUNCHER_OUTPUT_PATH }}/MyProgram.exe
+ mv ${{ env.STANDALONE_OUTPUT_PATH }}/MyProgram.exe ${{ env.STANDALONE_OUTPUT_PATH }}/MyProgram.exe
+
+ - name: Write version file
+ run: echo "${{ steps.version.outputs.hash_version }}" > version.txt
+
+ - name: Upload build artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: rc-build
+ path: |
+ ${{ env.LAUNCHER_OUTPUT_PATH }}
+ ${{ env.STANDALONE_OUTPUT_PATH }}
+ version.txt
+ retention-days: 1
+
+ publish-RC-nuget:
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+
+ - uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
+
+ - name: Download build artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: rc-build
+ path: ./build_artifacts
+
+ - name: Pack and push RC NuGet package
+ run: |
+ dotnet restore ${{ env.API_PROJECT }}
+ dotnet pack ${{ env.API_PROJECT }} \
+ -c Release \
+ -o ./nupkg \
+ /p:PackageVersion=${{ needs.build.outputs.hash_version }} \
+ /p:Version=${{ needs.build.outputs.new_version }} \
+ /p:InformationalVersion=${{ needs.build.outputs.hash_version }}
+ dotnet nuget add source --username "${{ github.actor }}" \
+ --password "${{ secrets.GITHUB_TOKEN }}" \
+ --store-password-in-clear-text \
+ --name github "${{ env.NUGET_SOURCE }}"
+ dotnet nuget push ./nupkg/*.nupkg \
+ --source github \
+ --api-key "${{ secrets.GITHUB_TOKEN }}" \
+ --skip-duplicate
+
+ release-RC-zip:
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+
+ - name: Download build artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: rc-build
+ path: ./build_artifacts
+
+ - name: Ensure zip is available
+ run: |
+ sudo apt-get update -y
+ sudo apt-get install -y zip
+
+ - name: Package launcher ZIP
+ run: |
+ cd ./build_artifacts/${{ env.LAUNCHER_OUTPUT_PATH }}
+ zip -r $GITHUB_WORKSPACE/StarMapLauncher-RC.zip . -x ${{ env.EXCLUDE }}
+ cd -
+
+ - name: Package standalone ZIP
+ run: |
+ cd ./build_artifacts/${{ env.STANDALONE_OUTPUT_PATH }}
+ zip -r $GITHUB_WORKSPACE/StarMapStandalone-RC.zip . -x ${{ env.EXCLUDE }}
+ cd -
+
+ - name: Update RC GitHub release
+ uses: softprops/action-gh-release@v1
+ with:
+ tag_name: rc
+ name: Release Candidate
+ prerelease: true
+ files: |
+ StarMapLauncher-RC.zip
+ StarMapStandalone-RC.zip
+ ./build_artifacts/version.txt
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Update RC tag
+ run: |
+ git tag -f rc
+ git push origin rc --force
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a22b626..60e3eeb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,10 @@ jobs:
packages: write
env:
DOTNET_VERSION: 9.0
- PROJECT: StarMapLoader/StarMapLoader.csproj
+ STANDALONE_PROJECT: StarMap.Loader/StarMap.Loader.csproj
+ LAUNCHER_PROJECT: StarMap.Launcher/StarMap.Launcher.csproj
+ STANDALONE_OUTPUT_PATH: ./publish/standalone
+ LAUNCHER_OUTPUT_PATH: ./publish/launcher
OUTPUT_PATH: ./publish
NUGET_SOURCE: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
EXCLUDE: "*.pdb *.xml"
@@ -65,15 +68,6 @@ jobs:
echo "type=$bump_type" >> $GITHUB_OUTPUT
echo "new=$new_version" >> $GITHUB_OUTPUT
- - name: Tag and push new version
- run: |
- git config user.name "github-actions"
- git config user.email "actions@github.com"
-
- NEW_VERSION="${{ steps.version.outputs.new }}"
- git tag "$NEW_VERSION"
- git push origin "$NEW_VERSION"
-
- name: Setup Github NuGet
run: |
dotnet nuget add source \
@@ -82,29 +76,27 @@ jobs:
--store-password-in-clear-text \
--name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
- - name: Build
- run: dotnet publish ${{ env.PROJECT }} -c Release -o ${{ env.OUTPUT_PATH }} -r win-x64 --self-contained false
+ - name: Build launcher
+ run: dotnet publish ${{ env.LAUNCHER_PROJECT }}
+ -c Release -o ${{ env.LAUNCHER_OUTPUT_PATH }}
+ -r win-x64
+ --self-contained false
+ /p:PackageVersion=${{ steps.version.outputs.new }} \
+ /p:Version=${{ steps.version.outputs.new }} \
+ /p:AssemblyVersion=${{ steps.version.outputs.new }} \
+ /p:FileVersion=${{ steps.version.outputs.new }}
- - name: Ensure zip is available
- run: |
- sudo apt-get update -y
- sudo apt-get install -y zip
+ # - name: Run tests
+ # run: dotnet test --no-build --verbosity normal
- - name: Package ZIP
+ - name: Tag and push new version
run: |
- cd ${{ env.OUTPUT_PATH }}
- zip -r $GITHUB_WORKSPACE/StarMap-${{ steps.version.outputs.new }}.zip . -x ${{ env.EXCLUDE }}
- cd -
+ git config user.name "github-actions"
+ git config user.email "actions@github.com"
- - name: Create GitHub Release
- uses: softprops/action-gh-release@v2
- with:
- tag_name: ${{ steps.version.outputs.new }}
- name: Release ${{ steps.version.outputs.new }}
- body: |
- Automated release for version ${{ steps.version.outputs.new }}
- Triggered by PR #${{ github.event.pull_request.number }}
- files: StarMap-${{ steps.version.outputs.new }}.zip
+ NEW_VERSION="${{ steps.version.outputs.new }}"
+ git tag "$NEW_VERSION"
+ git push origin "$NEW_VERSION"
- name: Check whether StarMap.API changed since previous tag
id: api_check
@@ -152,6 +144,42 @@ jobs:
--api-key "${{ secrets.NUGET_API_KEY }}" \
--skip-duplicate
+ - name: Build standalone
+ run: dotnet publish ${{ env.STANDALONE_PROJECT }}
+ -c Release -o ${{ env.STANDALONE_OUTPUT_PATH }}
+ -r win-x64
+ --self-contained false
+ /p:PackageVersion=${{ steps.version.outputs.new }} \
+ /p:Version=${{ steps.version.outputs.new }} \
+ /p:AssemblyVersion=${{ steps.version.outputs.new }} \
+ /p:FileVersion=${{ steps.version.outputs.new }}
+
+ - name: Rename executables
+ run: |
+ ren publish\launcher\MyProgram.Launcher.exe MyProgram.exe
+ ren publish\launcher\MyProgram.Launcher.exe MyProgram.exe
+
+ - name: Ensure zip is available
+ run: |
+ sudo apt-get update -y
+ sudo apt-get install -y zip
+
+ - name: Package launcher ZIP
+ run: |
+ cd ${{ env.LAUNCHER_OUTPUT_PATH }}
+ zip -r $GITHUB_WORKSPACE/StarMapLauncher-${{ steps.version.outputs.new }}.zip . -x ${{ env.EXCLUDE }}
+ cd -
+
+ - name: Create GitHub Release
+ uses: softprops/action-gh-release@v2
+ with:
+ tag_name: ${{ steps.version.outputs.new }}
+ name: Release ${{ steps.version.outputs.new }}
+ body: |
+ Automated release for version ${{ steps.version.outputs.new }}
+ Triggered by PR #${{ github.event.pull_request.number }}
+ files: StarMap-${{ steps.version.outputs.new }}.zip
+
- name: Upload publish folder for Windows installer
uses: actions/upload-artifact@v4
with:
diff --git a/DummyProgram/DummyProgram.csproj b/DummyProgram/DummyProgram.csproj
deleted file mode 100644
index 0bdd1d7..0000000
--- a/DummyProgram/DummyProgram.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
- KSA
-
-
-
-
-
-
-
diff --git a/DummyProgram/Mod.cs b/DummyProgram/Mod.cs
deleted file mode 100644
index 1723feb..0000000
--- a/DummyProgram/Mod.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Reflection;
-
-namespace KSA
-{
- public class Mod
- {
- public required string DirectoryPath { get; init; }
- public required AssemblyName Assembly { get; init; }
- public required string Name { get; init; }
-
- public Mod() { }
- public void PrepareSystems()
- {
- }
-
- public void DoSomething()
- {
- Console.WriteLine($"Mod {Name} is doing something!");
- }
- }
-}
diff --git a/DummyProgram/ModLibrary.cs b/DummyProgram/ModLibrary.cs
deleted file mode 100644
index 1b8d6d8..0000000
--- a/DummyProgram/ModLibrary.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Tomlyn.Model;
-using Tomlyn;
-
-namespace KSA
-{
- public class ModLibrary
- {
- public List Mods = [];
-
- public ModLibrary() { }
- public void LoadAll()
- {
- FetchMods();
- }
-
- public void FetchMods()
- {
- string modsPath = Path.GetFullPath("./mods");
- if (!Directory.Exists(modsPath))
- {
- return;
- }
-
- foreach (var folder in Directory.GetDirectories(modsPath))
- {
- string folderName = Path.GetFileName(folder);
- string tomlPath = Path.Combine(folder, folderName + ".toml");
-
- if (!File.Exists(tomlPath))
- continue;
-
- try
- {
- string tomlContent = File.ReadAllText(tomlPath);
- TomlTable tomlTable = Toml.ToModel(tomlContent);
-
- if (tomlTable.ContainsKey("mod_type") && tomlTable["mod_type"]?.ToString() == "StarMap")
- {
- string dllPath = Path.Combine(folder, folderName + ".dll");
-
- if (!File.Exists(dllPath))
- continue;
-
- AssemblyName assemblyName;
- try
- {
- assemblyName = AssemblyName.GetAssemblyName(dllPath);
- }
- catch
- {
- continue;
- }
-
- var mod = new Mod
- {
- DirectoryPath = folder,
- Assembly = assemblyName,
- Name = assemblyName.Name
- };
-
- mod.PrepareSystems();
- Mods.Add(mod);
-
- }
- }
- catch
- {
- throw;
- }
- }
- }
- }
-}
diff --git a/DummyProgram/Program.cs b/DummyProgram/Program.cs
deleted file mode 100644
index 2c72879..0000000
--- a/DummyProgram/Program.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace KSA
-{
- public class Program
- {
- public static ModLibrary ModLibrary = new ModLibrary();
-
- private static IScreen _currentScreen = new MainScreen();
-
- static void Main(string[] args)
- {
- ModLibrary.LoadAll();
-
- while (true)
- {
- Console.Clear();
- _currentScreen.Render();
-
- var stringInput = Console.ReadLine();
-
- if (_currentScreen is ExitScreen)
- {
- break;
- }
-
- if (string.IsNullOrEmpty(stringInput)) continue;
- if (!int.TryParse(stringInput, out var id)) continue;
-
- _currentScreen = _currentScreen.HandleInput(id);
- }
-
- MainScreen.Screens = null!;
- }
- }
-}
diff --git a/DummyProgram/Screens/IScreen.cs b/DummyProgram/Screens/IScreen.cs
deleted file mode 100644
index 16e0c5e..0000000
--- a/DummyProgram/Screens/IScreen.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KSA
-{
- public interface IScreen
- {
- string ScreenName { get; }
- void Render();
- IScreen HandleInput(int input);
- }
-}
diff --git a/DummyProgram/Screens/Screens.cs b/DummyProgram/Screens/Screens.cs
deleted file mode 100644
index 6d44e1c..0000000
--- a/DummyProgram/Screens/Screens.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KSA
-{
- public class MainScreen : IScreen
- {
- public static IScreen[] Screens { get; set; } = [new GameScreen(), new ExitScreen()];
-
- public string ScreenName => "Main";
-
- public IScreen HandleInput(int input)
- {
- if (input >= Screens.Length) return this;
-
- return Screens[input];
- }
-
- public void Render()
- {
- for (int i = 0; i < Screens.Length; i++)
- {
- Console.WriteLine($"{i}: {Screens[i]}");
- }
- }
- }
-
- public class ExitScreen : IScreen
- {
- public string ScreenName => "Quit";
-
- public IScreen HandleInput(int input)
- {
- return this;
- }
-
- public void Render()
- {
- Console.WriteLine("Quiting game");
- }
- }
-
- public class GameScreen : IScreen
- {
- public string ScreenName => "Game";
-
- public IScreen HandleInput(int input)
- {
- if (input == 1) return new MainScreen();
- Console.Clear();
- DoSomething();
-
- return this;
- }
-
- public void DoSomething()
- {
- Program.ModLibrary.Mods.ForEach((mod) => mod.DoSomething());
- Console.WriteLine("GameScreen.DoSomething");
- Console.ReadLine();
- }
-
- public void Render()
- {
- Console.WriteLine($"0: Do something");
- Console.WriteLine($"1: Main menu");
- }
- }
-}
diff --git a/StarMapLoader/GameProcessSupervisor.cs b/StarMap.Launcher/GameProcessSupervisor.cs
similarity index 98%
rename from StarMapLoader/GameProcessSupervisor.cs
rename to StarMap.Launcher/GameProcessSupervisor.cs
index ebbcd35..1a6806d 100644
--- a/StarMapLoader/GameProcessSupervisor.cs
+++ b/StarMap.Launcher/GameProcessSupervisor.cs
@@ -1,4 +1,4 @@
-using StarMap.Types.Pipes;
+/*using StarMap.Types.Pipes;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -87,3 +87,4 @@ void OnPrcessStarted(object? sender, EventArgs args)
}
}
}
+*/
\ No newline at end of file
diff --git a/StarMapLoader/LoaderFacade.cs b/StarMap.Launcher/LoaderFacade.cs
similarity index 99%
rename from StarMapLoader/LoaderFacade.cs
rename to StarMap.Launcher/LoaderFacade.cs
index 2f9838d..f9b8153 100644
--- a/StarMapLoader/LoaderFacade.cs
+++ b/StarMap.Launcher/LoaderFacade.cs
@@ -1,4 +1,4 @@
-using Google.Protobuf;
+/*using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
using StarMap.Types;
using StarMap.Types.Pipes;
@@ -122,3 +122,4 @@ public void Dispose()
}
}
}
+*/
\ No newline at end of file
diff --git a/StarMapLoader/ModDownloader.cs b/StarMap.Launcher/ModDownloader.cs
similarity index 100%
rename from StarMapLoader/ModDownloader.cs
rename to StarMap.Launcher/ModDownloader.cs
diff --git a/StarMapLoader/ModRepository.cs b/StarMap.Launcher/ModRepository.cs
similarity index 97%
rename from StarMapLoader/ModRepository.cs
rename to StarMap.Launcher/ModRepository.cs
index a1441be..e735c73 100644
--- a/StarMapLoader/ModRepository.cs
+++ b/StarMap.Launcher/ModRepository.cs
@@ -1,4 +1,4 @@
-using StarMap.Index.API;
+/*//using StarMap.Index.API;
using StarMap.Types.Proto.IPC;
using System.Text.Json;
@@ -10,7 +10,7 @@ internal class ModRepository
public bool HasChanges { get; private set; }
private readonly string _modsPath;
- private readonly IModRespositoryClient _foreignModRepository;
+ //private readonly IModRespositoryClient _foreignModRepository;
private readonly ModDownloader _downloader = new();
private IPCUpdateModInformation[] _changes = [];
@@ -114,3 +114,4 @@ public void ApplyModUpdates()
}
}
}
+*/
\ No newline at end of file
diff --git a/StarMapLoader/Program.cs b/StarMap.Launcher/Program.cs
similarity index 51%
rename from StarMapLoader/Program.cs
rename to StarMap.Launcher/Program.cs
index 9ebe886..9ec9de2 100644
--- a/StarMapLoader/Program.cs
+++ b/StarMap.Launcher/Program.cs
@@ -1,4 +1,4 @@
-using StarMap.Index.API;
+//using StarMap.Index.API;
using StarMap.Types.Pipes;
using StarMap.Types;
using System.Diagnostics;
@@ -9,7 +9,8 @@ internal class Program
{
static void Main(string[] args)
{
- MainInner().GetAwaiter().GetResult();
+ Console.WriteLine("Currently WIP, please use the standalone version or launch 'StarMap.Loader.exe'");
+ //MainInner().GetAwaiter().GetResult();
}
static async Task MainInner()
@@ -17,28 +18,28 @@ static async Task MainInner()
var config = new LoaderConfig();
if (!config.TryLoadConfig()) return;
- using var remoteModRepository = new ModRepositoryClient(config.RepositoryLocation);
- var modRepository = new ModRepository(config.GameLocation, remoteModRepository);
+ //using var remoteModRepository = new ModRepositoryClient(config.RepositoryLocation);
+ //var modRepository = new ModRepository(config.GameLocation, remoteModRepository);
var shouldReload = true;
var pipeName = Debugger.IsAttached ? "starmap_pipe" : $"starmap_pipe_{Guid.NewGuid()}";
using var pipeServer = new PipeServer(pipeName);
- using var facade = new LoaderFacade(pipeServer, config, modRepository);
+ //using var facade = new LoaderFacade(pipeServer, config, modRepository);
while (shouldReload)
{
CancellationTokenSource stopGameCancelationTokenSource = new();
- var gameSupervisor = new GameProcessSupervisor(config.GameLocation, facade, pipeServer);
+ //var gameSupervisor = new GameProcessSupervisor(config.GameLocation, facade, pipeServer);
- await await gameSupervisor.TryStartGameAsync(stopGameCancelationTokenSource.Token);
+ //await await gameSupervisor.TryStartGameAsync(stopGameCancelationTokenSource.Token);
- shouldReload = modRepository.HasChanges;
+ /*shouldReload = modRepository.HasChanges;
if (shouldReload)
{
modRepository.ApplyModUpdates();
- }
+ }*/
}
}
}
diff --git a/StarMap.Launcher/StarMap.Launcher.csproj b/StarMap.Launcher/StarMap.Launcher.csproj
new file mode 100644
index 0000000..ceec7aa
--- /dev/null
+++ b/StarMap.Launcher/StarMap.Launcher.csproj
@@ -0,0 +1,19 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/StarMap/GameAssemblyLoadContext.cs b/StarMap.Loader/GameAssemblyLoadContext.cs
similarity index 100%
rename from StarMap/GameAssemblyLoadContext.cs
rename to StarMap.Loader/GameAssemblyLoadContext.cs
diff --git a/StarMap/GameFacade.cs b/StarMap.Loader/GameFacade.cs
similarity index 100%
rename from StarMap/GameFacade.cs
rename to StarMap.Loader/GameFacade.cs
diff --git a/StarMap/GameSurveyer.cs b/StarMap.Loader/GameSurveyer.cs
similarity index 100%
rename from StarMap/GameSurveyer.cs
rename to StarMap.Loader/GameSurveyer.cs
diff --git a/StarMap/Program.cs b/StarMap.Loader/Program.cs
similarity index 100%
rename from StarMap/Program.cs
rename to StarMap.Loader/Program.cs
diff --git a/StarMap/Properties/launchSettings.json b/StarMap.Loader/Properties/launchSettings.json
similarity index 100%
rename from StarMap/Properties/launchSettings.json
rename to StarMap.Loader/Properties/launchSettings.json
diff --git a/StarMap/SoloGameFacade.cs b/StarMap.Loader/SoloGameFacade.cs
similarity index 100%
rename from StarMap/SoloGameFacade.cs
rename to StarMap.Loader/SoloGameFacade.cs
diff --git a/StarMap/StarMap.csproj b/StarMap.Loader/StarMap.Loader.csproj
similarity index 100%
rename from StarMap/StarMap.csproj
rename to StarMap.Loader/StarMap.Loader.csproj
diff --git a/StarMap.sln b/StarMap.sln
deleted file mode 100644
index 4da4e8f..0000000
--- a/StarMap.sln
+++ /dev/null
@@ -1,132 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.12.35707.178
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarMap", "StarMap\StarMap.csproj", "{1929ABD2-E606-4D10-8095-C1A42F033BA8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarMap.Core", "StarMap.Core\StarMap.Core.csproj", "{88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyProgram", "DummyProgram\DummyProgram.csproj", "{2CBF8323-9A54-47F0-A01F-312BC8951049}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarMapLoader", "StarMapLoader\StarMapLoader.csproj", "{8C1F84DF-7806-4780-9FD8-49EA21A10CF3}"
- ProjectSection(ProjectDependencies) = postProject
- {1929ABD2-E606-4D10-8095-C1A42F033BA8} = {1929ABD2-E606-4D10-8095-C1A42F033BA8}
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarMap.API", "StarMap.API\StarMap.API.csproj", "{41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarMap.Types", "StarMap.Types\StarMap.Types.csproj", "{C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|ARM64 = Debug|ARM64
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|ARM64 = Release|ARM64
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|ARM64.Build.0 = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|x64.Build.0 = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Debug|x86.Build.0 = Debug|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|Any CPU.Build.0 = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|ARM64.ActiveCfg = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|ARM64.Build.0 = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|x64.ActiveCfg = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|x64.Build.0 = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|x86.ActiveCfg = Release|Any CPU
- {1929ABD2-E606-4D10-8095-C1A42F033BA8}.Release|x86.Build.0 = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|ARM64.Build.0 = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|x64.ActiveCfg = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|x64.Build.0 = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|x86.ActiveCfg = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Debug|x86.Build.0 = Debug|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|Any CPU.Build.0 = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|ARM64.ActiveCfg = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|ARM64.Build.0 = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|x64.ActiveCfg = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|x64.Build.0 = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|x86.ActiveCfg = Release|Any CPU
- {88FE8BF1-1E63-4EFA-9AC9-EE429DCAE6E1}.Release|x86.Build.0 = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|ARM64.Build.0 = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|x64.ActiveCfg = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|x64.Build.0 = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Debug|x86.Build.0 = Debug|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|Any CPU.Build.0 = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|ARM64.ActiveCfg = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|ARM64.Build.0 = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|x64.ActiveCfg = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|x64.Build.0 = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|x86.ActiveCfg = Release|Any CPU
- {2CBF8323-9A54-47F0-A01F-312BC8951049}.Release|x86.Build.0 = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|ARM64.Build.0 = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|x64.Build.0 = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Debug|x86.Build.0 = Debug|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|Any CPU.Build.0 = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|ARM64.ActiveCfg = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|ARM64.Build.0 = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|x64.ActiveCfg = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|x64.Build.0 = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|x86.ActiveCfg = Release|Any CPU
- {8C1F84DF-7806-4780-9FD8-49EA21A10CF3}.Release|x86.Build.0 = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|ARM64.Build.0 = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|x64.Build.0 = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Debug|x86.Build.0 = Debug|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|Any CPU.Build.0 = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|ARM64.ActiveCfg = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|ARM64.Build.0 = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|x64.ActiveCfg = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|x64.Build.0 = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|x86.ActiveCfg = Release|Any CPU
- {41AA50C1-54A0-4EE5-8D8D-220FEF1B7D0A}.Release|x86.Build.0 = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|ARM64.Build.0 = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|x64.Build.0 = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Debug|x86.Build.0 = Debug|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|Any CPU.Build.0 = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|ARM64.ActiveCfg = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|ARM64.Build.0 = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|x64.ActiveCfg = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|x64.Build.0 = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|x86.ActiveCfg = Release|Any CPU
- {C3F3B0A9-4F22-47C0-9EAD-F3E7D3E2ED85}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/StarMap.slnx b/StarMap.slnx
new file mode 100644
index 0000000..17e57e4
--- /dev/null
+++ b/StarMap.slnx
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/StarMapLoader/StarMapLoader.csproj b/StarMapLoader/StarMapLoader.csproj
deleted file mode 100644
index 958de87..0000000
--- a/StarMapLoader/StarMapLoader.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-