Reorganize projects

MonoGame · Nov 7, 2023 · dd6e1b4 · dd6e1b4
1 parent f3c66d9
commit dd6e1b4
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 53 deletions.
diff --git a/build/BuildContext.cs → ...Game.Library.BuildScripts/BuildContext.cs b/build/BuildContext.cs → ...Game.Library.BuildScripts/BuildContext.cs
diff --git a/MonoGame.Library.BuildScripts/MonoGame.Librar.BuildScripts.csproj b/MonoGame.Library.BuildScripts/MonoGame.Librar.BuildScripts.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/Icon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <LogicalName>Icon.png</LogicalName>
+    </EmbeddedResource>
+
+    <EmbeddedResource Include="Resources/MonoGame.Library.X.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <LogicalName>MonoGame.Library.X.txt</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Cake.Frosting" />
+    <Using Include="Cake.Common.Build" />
+    <Using Include="Cake.Common.Diagnostics" />
+    <Using Include="Cake.Common.Tools.DotNet" />
+    <Using Include="Cake.Common.Tools.DotNet.MSBuild" />
+    <Using Include="Cake.Common.Tools.DotNet.Pack" />
+    <Using Include="Cake.Common.IO" />
+    <Using Include="Cake.Common" />
+    <Using Include="Cake.Core" />
+    <Using Include="Cake.Core.Diagnostics" />
+    <Using Include="Cake.Core.IO" />
+    <Using Include="Cake.FileHelpers" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
+    <PackageReference Include="Cake.Frosting" Version="3.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/build/PackContext.cs → MonoGame.Library.BuildScripts/PackContext.cs b/build/PackContext.cs → MonoGame.Library.BuildScripts/PackContext.cs
diff --git a/build/Resources/Icon.png → ...e.Library.BuildScripts/Resources/Icon.png b/build/Resources/Icon.png → ...e.Library.BuildScripts/Resources/Icon.png
diff --git a/build/Resources/MonoGame.Library.X.txt → ...dScripts/Resources/MonoGame.Library.X.txt b/build/Resources/MonoGame.Library.X.txt → ...dScripts/Resources/MonoGame.Library.X.txt
diff --git a/build/Tasks.cs → MonoGame.Library.BuildScripts/Tasks.cs b/build/Tasks.cs → MonoGame.Library.BuildScripts/Tasks.cs
@@ -2,9 +2,6 @@
 namespace BuildScripts;
 
 [TaskName("BuildLibrary")]
-[IsDependentOn(typeof(BuildWindowsTask))]
-[IsDependentOn(typeof(BuildMacOSTask))]
-[IsDependentOn(typeof(BuildLinuxTask))]
 public class BuildLibraryTask : FrostingTask { }
 
 [TaskName("TestLibrary")]

diff --git a/build/Tasks/PrepTask.cs → ...me.Library.BuildScripts/Tasks/PrepTask.cs b/build/Tasks/PrepTask.cs → ...me.Library.BuildScripts/Tasks/PrepTask.cs
diff --git a/build/Tasks/PublishLibraryTask.cs → ....BuildScripts/Tasks/PublishLibraryTask.cs b/build/Tasks/PublishLibraryTask.cs → ....BuildScripts/Tasks/PublishLibraryTask.cs
diff --git a/build/Tasks/PublishPackageTask.cs → ....BuildScripts/Tasks/PublishPackageTask.cs b/build/Tasks/PublishPackageTask.cs → ....BuildScripts/Tasks/PublishPackageTask.cs
diff --git a/build/Tasks/TestLinuxTask.cs → ...brary.BuildScripts/Tasks/TestLinuxTask.cs b/build/Tasks/TestLinuxTask.cs → ...brary.BuildScripts/Tasks/TestLinuxTask.cs
diff --git a/build/Tasks/TestMacOSTask.cs → ...brary.BuildScripts/Tasks/TestMacOSTask.cs b/build/Tasks/TestMacOSTask.cs → ...brary.BuildScripts/Tasks/TestMacOSTask.cs
diff --git a/build/Tasks/TestWindowsTask.cs → ...ary.BuildScripts/Tasks/TestWindowsTask.cs b/build/Tasks/TestWindowsTask.cs → ...ary.BuildScripts/Tasks/TestWindowsTask.cs
diff --git a/build/Build.csproj b/build/Build.csproj
@@ -1,50 +1,36 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources/Icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <LogicalName>Icon.png</LogicalName>
-    </EmbeddedResource>
-
-    <EmbeddedResource Include="Resources/MonoGame.Library.X.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <LogicalName>MonoGame.Library.X.txt</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="../src/BuildWindowsTask.cs" />
-    <Compile Include="../src/BuildMacOSTask.cs" />
-    <Compile Include="../src/BuildLinuxTask.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Cake.Frosting" />
-    <Using Include="Cake.Common.Build" />
-    <Using Include="Cake.Common.Diagnostics" />
-    <Using Include="Cake.Common.Tools.DotNet" />
-    <Using Include="Cake.Common.Tools.DotNet.MSBuild" />
-    <Using Include="Cake.Common.Tools.DotNet.Pack" />
-    <Using Include="Cake.Common.IO" />
-    <Using Include="Cake.Common" />
-    <Using Include="Cake.Core" />
-    <Using Include="Cake.Core.Diagnostics" />
-    <Using Include="Cake.Core.IO" />
-    <Using Include="Cake.FileHelpers" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
-    <PackageReference Include="Cake.Frosting" Version="3.1.0" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="Cake.Frosting" />
+    <Using Include="Cake.Common.Build" />
+    <Using Include="Cake.Common.Diagnostics" />
+    <Using Include="Cake.Common.Tools.DotNet" />
+    <Using Include="Cake.Common.Tools.DotNet.MSBuild" />
+    <Using Include="Cake.Common.Tools.DotNet.Pack" />
+    <Using Include="Cake.Common.IO" />
+    <Using Include="Cake.Common" />
+    <Using Include="Cake.Core" />
+    <Using Include="Cake.Core.Diagnostics" />
+    <Using Include="Cake.Core.IO" />
+    <Using Include="Cake.FileHelpers" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
+    <PackageReference Include="Cake.Frosting" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MonoGame.Library.BuildScripts\MonoGame.Librar.BuildScripts.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BuildLinuxTask.cs → build/BuildLinuxTask.cs b/src/BuildLinuxTask.cs → build/BuildLinuxTask.cs
@@ -4,6 +4,7 @@ namespace BuildScripts;
 
 [TaskName("Build Linux")]
 [IsDependentOn(typeof(PrepTask))]
+[IsDependeeOf(typeof(BuildLibraryTask))]
 public sealed class BuildLinuxTask : FrostingTask<BuildContext>
 {
     public override bool ShouldRun(BuildContext context) => context.IsRunningOnLinux();

diff --git a/src/BuildMacOSTask.cs → build/BuildMacOSTask.cs b/src/BuildMacOSTask.cs → build/BuildMacOSTask.cs
@@ -4,6 +4,7 @@ namespace BuildScripts;
 
 [TaskName("Build macOS")]
 [IsDependentOn(typeof(PrepTask))]
+[IsDependeeOf(typeof(BuildLibraryTask))]
 public sealed class BuildMacOSTask : FrostingTask<BuildContext>
 {
     public override bool ShouldRun(BuildContext context) => context.IsRunningOnMacOs();

diff --git a/src/BuildWindowsTask.cs → build/BuildWindowsTask.cs b/src/BuildWindowsTask.cs → build/BuildWindowsTask.cs
@@ -4,6 +4,7 @@ namespace BuildScripts;
 
 [TaskName("Build Windows")]
 [IsDependentOn(typeof(PrepTask))]
+[IsDependeeOf(typeof(BuildLibraryTask))]
 public sealed class BuildWindowsTask : FrostingTask<BuildContext>
 {
     public override bool ShouldRun(BuildContext context) => context.IsRunningOnWindows();

diff --git a/build/Program.cs b/build/Program.cs
@@ -5,6 +5,7 @@ public static class Program
 {
     public static int Main(string[] args)
         => new CakeHost()
+            .AddAssembly(typeof(BuildContext).Assembly)
             .UseWorkingDirectory("../")
             .UseContext<BuildContext>()
             .Run(args);