Build Ready Project Files

Author: Matthew Bate

.github/workflows/dotnet-desktop.yml

@@ -16,14 +16,16 @@ permissions:
 
 env:
   SERVERMANAGER_PROJECT_PATH: BHD-ServerManager/ServerManager.csproj
+  REMOTECLIENT_PROJECT_PATH: RemoteClient/RemoteClient.csproj
   NETLIMITERBRIDGE_PROJECT_PATH: NetLimiterBridge/NetLimiterBridge.csproj
+  HAWKSYNCSHARED_PROJECT_PATH: HawkSyncShared/HawkSyncShared.csproj
   OUTPUT_NAME: HawkSync-ServerManager
   DOTNET_VERSION: '8.0.x'
 
 jobs:
   build:
     runs-on: windows-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -38,6 +40,12 @@ jobs:
     - name: Setup .NET Framework Build Tools
       uses: microsoft/setup-msbuild@v2
 
+    - name: Restore HawkSyncShared dependencies
+      run: dotnet restore ${{ env.HAWKSYNCSHARED_PROJECT_PATH }}
+
+    - name: Build HawkSyncShared
+      run: dotnet build ${{ env.HAWKSYNCSHARED_PROJECT_PATH }} --configuration Release
+
     - name: Restore ServerManager dependencies
       run: dotnet restore ${{ env.SERVERMANAGER_PROJECT_PATH }}
 
@@ -61,24 +69,43 @@ jobs:
           /p:BaseOutputPath=bin/ `
           /p:Platform="Any CPU"
 
+    - name: Restore RemoteClient dependencies
+      run: dotnet restore ${{ env.REMOTECLIENT_PROJECT_PATH }}
+
+    - name: Build RemoteClient (.NET 8.0)
+      run: |
+        dotnet build ${{ env.REMOTECLIENT_PROJECT_PATH }} `
+          --configuration Release `
+          --no-restore `
+          /p:UseCommonOutputDirectory=false `
+          /p:OutputPath=bin/Release/ `
+          /p:BaseOutputPath=bin/ `
+          /p:Platform="Any CPU"
+
     - name: Publish ServerManager
       run: |
         dotnet publish ${{ env.SERVERMANAGER_PROJECT_PATH }} `
           --configuration Release `
           --runtime win-x64 `
           --self-contained false `
-          --output ./publish `
+          --output ./publish/ServerManager `
+          /p:UseCommonOutputDirectory=false
+
+    - name: Publish RemoteClient
+      run: |
+        dotnet publish ${{ env.REMOTECLIENT_PROJECT_PATH }} `
+          --configuration Release `
+          --runtime win-x64 `
+          --self-contained false `
+          --output ./publish/RemoteClient `
           /p:UseCommonOutputDirectory=false
 
     - name: Copy NetLimiterBridge to ServerManager output
       shell: pwsh
       run: |
-        # Create NetLimiterBridge subfolder
-        New-Item -ItemType Directory -Force -Path ./publish/NetLimiterBridge
-        
-        # Copy NetLimiterBridge binaries
+        New-Item -ItemType Directory -Force -Path ./publish/ServerManager/NetLimiterBridge
         Copy-Item -Path ./NetLimiterBridge/bin/Release/* `
-          -Destination ./publish/NetLimiterBridge/ `
+          -Destination ./publish/ServerManager/NetLimiterBridge/ `
           -Recurse -Force
 
     - name: Create version info
@@ -101,7 +128,9 @@ jobs:
         
         Components:
         - ServerManager (.NET 8.0)
+        - RemoteClient (.NET 8.0)
         - NetLimiterBridge (.NET Framework 4.8.1)
+        - HawkSyncShared (.NET Standard/.NET 8.0)
         
         Requirements:
         - .NET 8.0 Runtime
@@ -133,39 +162,4 @@ jobs:
       with:
         name: ${{ env.OUTPUT_NAME }}-${{ env.VERSION }}
         path: ./${{ env.OUTPUT_NAME }}-${{ env.VERSION }}.zip
-        retention-days: 30
-
-    - name: Create Release
-      if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
-      uses: softprops/action-gh-release@v2
-      with:
-        tag_name: ${{ startsWith(github.ref, 'refs/tags/v') && github.ref_name || format('dev-{0}', env.VERSION) }}
-        name: ${{ startsWith(github.ref, 'refs/tags/v') && format('Release {0}', github.ref_name) || format('Development Build {0}', env.VERSION) }}
-        files: ./${{ env.OUTPUT_NAME }}-${{ env.VERSION }}.zip
-        body: |
-          ## HawkSync Server Manager ${{ env.VERSION }}
-          
-          ### Requirements
-          - Windows 10/11 (x64)
-          - [.NET 8.0 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
-          - [.NET Framework 4.8.1 Runtime](https://dotnet.microsoft.com/download/dotnet-framework/net481)
-          
-          ### Installation
-          1. Install .NET 8.0 Runtime if not already installed
-          2. Install .NET Framework 4.8.1 Runtime if not already installed
-          3. Download the ZIP file below
-          4. Extract to your desired location
-          5. Run `ServerManager.exe`
-          
-          ### Components
-          - **ServerManager**: Main application (.NET 8.0)
-          - **NetLimiterBridge**: Network limiting bridge (.NET Framework 4.8.1)
-          
-          ### Changes
-          See [commit history](https://github.com/${{ github.repository }}/commits/${{ github.ref_name }}) for details.
-        draft: false
-        prerelease: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        generate_release_notes: true
-        make_latest: ${{ startsWith(github.ref, 'refs/tags/v') }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        retention-days: 30

BHD-ServerManager/ServerManager.csproj

@@ -13,7 +13,7 @@
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <BaseOutputPath>\\VM-DEV\ServerData\Development\HawkSync</BaseOutputPath>
+    <BaseOutputPath></BaseOutputPath>
     <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
     <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
     <EnableNETAnalyzers>False</EnableNETAnalyzers>

HawkSyncShared/HawkSyncShared.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <BaseOutputPath>\\VM-DEV\ServerData\Development\HawkSync</BaseOutputPath>
+    <BaseOutputPath></BaseOutputPath>
   </PropertyGroup>
 
 </Project>

NetLimiterBridge/NetLimiterBridge.csproj

@@ -35,7 +35,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>\\VM-DEV\ServerData\Development\HawkSync\Debug\net10.0-windows10.0.19041.0\NetLimiterBridge\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

RemoteClient/RemoteClient.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <BaseOutputPath>\\VM-DEV\ServerData\Development\HawkSync\RemoteClient</BaseOutputPath>
+    <BaseOutputPath></BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>