Decompose ImeSense.Launchers.Belarus to projects

imesense · Apr 26, 2024 · ff689b8 · ff689b8
1 parent 6b74b67
commit ff689b8
Show file tree

Hide file tree

Showing 12 changed files with 949 additions and 188 deletions.
diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml
@@ -43,7 +43,7 @@ jobs:
     runs-on: ${{ matrix.system }}
 
     env:
-      LauncherProject: src\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj
+      LauncherProject: src\ImeSense.Launchers.Belarus.Desktop\ImeSense.Launchers.Belarus.Desktop.csproj
 
     steps:
     - name: Checkout
@@ -158,7 +158,7 @@ jobs:
     runs-on: ${{ matrix.system }}
 
     env:
-      LauncherProject: src\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj
+      LauncherProject: src\ImeSense.Launchers.Belarus.Desktop\ImeSense.Launchers.Belarus.Desktop.csproj
 
     steps:
     - name: Checkout
@@ -188,7 +188,7 @@ jobs:
           --runtime ${{ matrix.runtime }} `
           --self-contained true `
           -p:PublishAot=true `
-          -p:InvariantGlobalization=true `
+          -p:InvariantGlobalization=false `
           -p:IsAotCompatible=true `
           -p:DebugSymbols=false `
           -p:DebugType=None

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/src/ImeSense.Launchers.Belarus/ImeSense.Launchers.Belarus.csproj",
+                "${workspaceFolder}/src/ImeSense.Launchers.Belarus.Desktop/ImeSense.Launchers.Belarus.Desktop.csproj",
                 "-p:GenerateFullPaths=true",
                 "--consoleloggerparameters:NoSummary"
             ],

diff --git a/BelarusLauncher.sln b/BelarusLauncher.sln
@@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImeSense.Launchers.Belarus", "src\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj", "{909E77E9-FE72-41F3-A631-D552185DF754}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5C302503-C8E0-442C-BD33-7B70930858F0} = {5C302503-C8E0-442C-BD33-7B70930858F0}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9A3AF009-CDC3-4035-B1A7-554D325D5408}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -25,6 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Settings.XamlStyler = Settings.XamlStyler
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImeSense.Launchers.Belarus.Desktop", "src\ImeSense.Launchers.Belarus.Desktop\ImeSense.Launchers.Belarus.Desktop.csproj", "{D04E3777-1DBA-423E-A2C8-5ABA80C29A88}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImeSense.Launchers.Belarus", "src\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj", "{909E77E9-FE72-41F3-A631-D552185DF754}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5C302503-C8E0-442C-BD33-7B70930858F0} = {5C302503-C8E0-442C-BD33-7B70930858F0}
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImeSense.Launchers.Belarus.Core", "src\ImeSense.Launchers.Belarus.Core\ImeSense.Launchers.Belarus.Core.csproj", "{9B628B77-B05A-435E-8D99-1D0DFB8BE20D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImeSense.Launchers.Belarus.Legacy", "src\ImeSense.Launchers.Belarus.Legacy\ImeSense.Launchers.Belarus.Legacy.csproj", "{0FD8494A-7CBD-428E-9B66-EC96F30FF9C0}"
@@ -65,6 +67,10 @@ Global
 		{5C302503-C8E0-442C-BD33-7B70930858F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C302503-C8E0-442C-BD33-7B70930858F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C302503-C8E0-442C-BD33-7B70930858F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D04E3777-1DBA-423E-A2C8-5ABA80C29A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D04E3777-1DBA-423E-A2C8-5ABA80C29A88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D04E3777-1DBA-423E-A2C8-5ABA80C29A88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D04E3777-1DBA-423E-A2C8-5ABA80C29A88}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/publish-launcher.bat b/publish-launcher.bat
@@ -1,4 +1,4 @@
-dotnet publish src\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj ^
+dotnet publish src\ImeSense.Launchers.Belarus.Desktop\ImeSense.Launchers.Belarus.Desktop.csproj ^
     --configuration Release ^
     --runtime win-x64 ^
     -p:PublishAot=true ^

diff --git a/src/ImeSense.Launchers.Belarus.Desktop/ImeSense.Launchers.Belarus.Desktop.csproj b/src/ImeSense.Launchers.Belarus.Desktop/ImeSense.Launchers.Belarus.Desktop.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <InvariantGlobalization>false</InvariantGlobalization>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <TrimmableAssembly Include="ImeSense.Launchers.Belarus.Themes.Avalonia" />
+        <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
+    </ItemGroup>
+
+    <PropertyGroup>
+        <ApplicationIcon>..\ImeSense.Launchers.Belarus\Assets\Icons\stalker_cs.ico</ApplicationIcon>
+        <AssemblyName>SBLauncher</AssemblyName>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <PublishAot>true</PublishAot>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\ImeSense.Launchers.Belarus\ImeSense.Launchers.Belarus.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/src/ImeSense.Launchers.Belarus/Program.cs → ...ense.Launchers.Belarus.Desktop/Program.cs b/src/ImeSense.Launchers.Belarus/Program.cs → ...ense.Launchers.Belarus.Desktop/Program.cs
@@ -8,11 +8,11 @@
 
 using Serilog;
 
-namespace ImeSense.Launchers.Belarus;
+namespace ImeSense.Launchers.Belarus.Desktop;
 
 internal class Program
 {
-    private const string _mutexName = "Belarus.Launcher.Avalonia";
+    private const string _mutexName = "Belarus.Launcher.Desktop";
 
     private static Mutex? _mutex;
 

diff --git a/...eSense.Launchers.Belarus/TrimmerRoots.xml → ...aunchers.Belarus.Desktop/TrimmerRoots.xml b/...eSense.Launchers.Belarus/TrimmerRoots.xml → ...aunchers.Belarus.Desktop/TrimmerRoots.xml
@@ -10,7 +10,7 @@
         <type fullname="CompiledAvaloniaXaml.XamlIlTrampolines" />
     </assembly>
 
-    <assembly fullname="SBLauncher">
+    <assembly fullname="ImeSense.Launchers.Belarus">
         <type fullname="CompiledAvaloniaXaml.!AvaloniaResources" />
         <type fullname="CompiledAvaloniaXaml.!IndexerAccessorFactoryClosure" />
         <type fullname="CompiledAvaloniaXaml.!XamlLoader" />

diff --git a/src/ImeSense.Launchers.Belarus/app.manifest → ...se.Launchers.Belarus.Desktop/app.manifest b/src/ImeSense.Launchers.Belarus/app.manifest → ...se.Launchers.Belarus.Desktop/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-    <assemblyIdentity name="ImeSense.Launchers.Belarus" version="2.1.0.0" />
+    <assemblyIdentity name="ImeSense.Launchers.Belarus.Desktop" version="2.1.0.0" />
 
     <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
         <application>