DarkRiftNetworking · JamJar00 · Aug 7, 2022 · Aug 7, 2022 · Aug 7, 2022
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.2.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -12,8 +12,7 @@ jobs:
       with:
         # TODO install all targeted .NET versions then test against all of them
         dotnet-version: 6.0.104
-    - name: Build
-      # MSBuildCommunityTasks doesn't play well with .NET 6 so skip all that
-      run: dotnet build --configuration Pro -p:DRBuildMode=coreonly -p:SkipCopyToBuild=true
+    - name: Restore
+      run: dotnet tool restore
     - name: Test
-      run: dotnet test -p:DRBuildMode=coreonly -p:SkipCopyToBuild=true
+      run: dotnet cake --target Test --configuration Pro --core-only
diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -13,9 +13,9 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.104
-    - name: Build
-      run: dotnet build --configuration Pro -p:DRBuildMode=coreonly -p:SkipCopyToBuild=true
+    - name: Restore
+      run: dotnet tool restore
     - name: Test
-      run: dotnet test -p:DRBuildMode=coreonly -p:SkipCopyToBuild=true
-    # TODO create GitHub release, this might require moving away from MSBuildTasks due to no .NET Core support
+      run: dotnet cake --target Test --configuration Pro --core-only
+    # TODO create GitHub release
     # TODO pack unitypackage using somehting like https://github.com/FatihBAKIR/UnityPacker
diff --git a/.props b/.props
diff --git a/.targets b/.targets
diff --git a/.version b/.version
@@ -0,0 +1 @@
+2.12.0-prerelease
diff --git a/BUILDING.md b/BUILDING.md
@@ -1,4 +1,30 @@
-To build the DarkRift 2 solution *you must have Microsoft Visual Studio 2022* installed. The Community edition is fine for open source projects, and is easily attained from https://visualstudio.microsoft.com/vs/community/
+DarkRift is build using [Cake](https://cakebuild.net/). To create a full build of DarkRift run `dotnet cake` (you will need to run `dotnet tool restore` the first time).
+
+This command will:
+- Build DarkRift
+- Create neatly organized packages in `./Build`
+- Test DR
+
+You will need the .NET 6 SDK to build DarkRift.
+
+For editing DarkRift we recommend using Microsoft Visual Studio 2022 although other editors will work.
+
+## Cake Tasks
+The following tasks are defined in `build.cake`:
+- `Clean` - Cleans the `./Build` directory
+- `Build` - Builds DarkRift
+- `Test` (default) - Builds and tests DarkRift
+- `InstallInCLITool` - Builds and installs a dev version of DarkRift into the DarkRift CLI tool as version `dev`. This is useful for easy local testing
+
+The following arguments can be passed to the build script:
+- `--target <task>` - choose the task to run (see list above)
+- `--configuration <configuration>` - the configuration of DR to build (see below section)
+- `--core-only` - only build for .NET Core, this can get around issues building .NET Framework applications such as on Linux
+
+For example:
+```bash
+dotnet cake --target InstallInCLITool --configuration Pro
+```
 
 ## Configurations
 
@@ -25,4 +51,4 @@ If you're looking to manually copy assemblies into your Unity assets, you should
 
 If you're an existing DarkRift 2 user, there's a decent chance you will want to reproduce the Free or Pro .unitypackage DarkRift 2 used to ship with in order to stick with the way DR2 in your Assets folder is organized. Even as a new user, a .unitypackage can be a practical way install the typical DarkRift version into your Unity project if you don't intend to make changes.
 
-*TODO: Fix package building in post_release.sh and write guide for how to export packages*
+*TODO: Fix package building in post_release.sh and write guide for how to export packages*
diff --git a/DarkRift.Client/DarkRift.Client.csproj b/DarkRift.Client/DarkRift.Client.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
@@ -26,4 +23,4 @@
     <ProjectReference Include="..\DarkRift\DarkRift.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/DarkRift.Server.Console/DarkRift.Server.Console.csproj b/DarkRift.Server.Console/DarkRift.Server.Console.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.0;netcoreapp2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netcoreapp2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
@@ -39,7 +36,4 @@
     <ProjectReference Include="..\DarkRift.Server\DarkRift.Server.csproj" />
     <ProjectReference Include="..\DarkRift\DarkRift.csproj" />
   </ItemGroup>
-
-  <Import Project="$(SolutionDir).targets" Condition="'$(SkipCopyToBuild)' != 'true'" />
-
 </Project>
diff --git a/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj b/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.5;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">net6.0</TargetFrameworks>

diff --git a/DarkRift.Server/DarkRift.Server.csproj b/DarkRift.Server/DarkRift.Server.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
@@ -26,4 +23,4 @@
     <ProjectReference Include="..\DarkRift.Client\DarkRift.Client.csproj" />
     <ProjectReference Include="..\DarkRift\DarkRift.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj b/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
     <Configurations>Debug;Free;Pro</Configurations>

diff --git a/DarkRift.Testing/DarkRift.Testing.csproj b/DarkRift.Testing/DarkRift.Testing.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.5;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">net6.0</TargetFrameworks>

diff --git a/DarkRift/DarkRift.csproj b/DarkRift/DarkRift.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(SolutionDir).props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
@@ -22,4 +19,4 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>DEBUG;TRACE;PRO</DefineConstants>
   </PropertyGroup>
-</Project>
+</Project>