Fixed beefball sample not building

vchelaru · Dec 31, 2023 · 4addaba · 4addaba
1 parent 92edd2d
commit 4addaba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 43 deletions.
diff --git a/Samples/Beefball/Beefball/Beefball.csproj b/Samples/Beefball/Beefball/Beefball.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
@@ -44,49 +44,11 @@
     <Compile Include="Factories\ScoreHudFactory.Generated.cs" />
     <Compile Include="FileAliases.Generated.cs" />
     <Compile Include="Game1.cs" />
-    <Compile Include="Game1.Generated.cs" />
+    <Compile Include="Game1.Generated.cs">
+      <DependentUpon>Game1.cs</DependentUpon>
+    </Compile>
     <Compile Include="GlobalContent.Generated.cs" />
     <Compile Include="GlueCommunication\GameConnectionManager.Generated.cs" />
-    <Compile Include="GlueControl\CommandReceiver.Generated.cs" />
-    <Compile Include="GlueControl\Dtos.Generated.cs" />
-    <Compile Include="GlueControl\Editing\CameraLogic.Generated.cs" />
-    <Compile Include="GlueControl\Editing\CopyPasteManager.Generated.cs" />
-    <Compile Include="GlueControl\Editing\EditingManager.Generated.cs" />
-    <Compile Include="GlueControl\Editing\EditorVisuals.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Guides.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\GenerateCodeCommands.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\GlueCommands.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\GlueCommandsStateBase.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\GlueState.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\GluxCommands.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\ObjectFinder.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Managers\RefreshCommands.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Markers\MeasurementMarker.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Markers\PolygonPointHandles.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Markers\SelectionMarker.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Markers\TileShapeCollectionMarker.Generated.cs" />
-    <Compile Include="GlueControl\Editing\MoveObjectToContainerLogic.Generated.cs" />
-    <Compile Include="GlueControl\Editing\SelectionLogic.Generated.cs" />
-    <Compile Include="GlueControl\Editing\VariableAssignmentLogic.Generated.cs" />
-    <Compile Include="GlueControl\Editing\Visuals\Arrow.Generated.cs" />
-    <Compile Include="GlueControl\Forms\ObjectCreationWindow.Generated.cs" />
-    <Compile Include="GlueControl\GlueCallsClassGenerationManager.Generated.cs" />
-    <Compile Include="GlueControl\GlueControlManager.Generated.cs" />
-    <Compile Include="GlueControl\InstanceLogic.Generated.cs" />
-    <Compile Include="GlueControl\Models\CustomVariable.Generated.cs" />
-    <Compile Include="GlueControl\Models\GlueElement.Generated.cs" />
-    <Compile Include="GlueControl\Models\GlueElementFileReference.Generated.cs" />
-    <Compile Include="GlueControl\Models\GlueProjectSave.Generated.cs" />
-    <Compile Include="GlueControl\Models\GlueProjectSaveExtensions.Generated.cs" />
-    <Compile Include="GlueControl\Models\IElementExtensionMethods.Generated.cs" />
-    <Compile Include="GlueControl\Models\INamedObjectContainer.Generated.cs" />
-    <Compile Include="GlueControl\Models\NamedObjectSave.Generated.cs" />
-    <Compile Include="GlueControl\Models\NamedObjectSaveExtensionMethods.Generated.cs" />
-    <Compile Include="GlueControl\Models\ReferencedFileSave.Generated.cs" />
-    <Compile Include="GlueControl\Models\StateSave.Generated.cs" />
-    <Compile Include="GlueControl\Models\StateSaveCategory.Generated.cs" />
-    <Compile Include="GlueControl\Runtime\DynamicEntity.Generated.cs" />
-    <Compile Include="GlueControl\Screens\EntityViewingScreen.Generated.cs" />
     <Compile Include="Performance\IEntityFactory.Generated.cs" />
     <Compile Include="Performance\PoolList.Generated.cs" />
     <Compile Include="Program.cs" />
@@ -170,6 +132,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="GlueControl\Forms\" />
+  </ItemGroup>
   <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
     <Message Text="Restoring dotnet tools" Importance="High" />
     <Exec Command="dotnet tool restore" />

diff --git a/Samples/Beefball/Beefball/GlueSettings/CompilerSettings.json b/Samples/Beefball/Beefball/GlueSettings/CompilerSettings.json
@@ -1 +1 @@
-{"GenerateGlueControlManagerCode":false,"EmbedGameInGameTab":true,"RestartScreenOnLevelContentChange":true,"PortNumber":8675,"ShowScreenBoundsWhenViewingEntities":true,"ShowGrid":true,"GridSize":32.0,"GridAlpha":0.15,"EnableSnapping":true,"SnapSize":8.0,"PolygonPointSnapSize":1.0,"SetBackgroundColor":false,"BackgroundRed":0,"BackgroundGreen":0,"BackgroundBlue":0,"ToolbarObjects":[]}
+{"GenerateGlueControlManagerCode":false,"EmbedGameInGameTab":true,"RestartScreenOnLevelContentChange":true,"PortNumber":8675,"ShowScreenBoundsWhenViewingEntities":true,"RestartOnFailedCommands":false,"ShowGrid":true,"GridSize":32.0,"GridAlpha":0.15,"EnableSnapping":true,"SnapSize":8.0,"PolygonPointSnapSize":1.0,"SetBackgroundColor":false,"BackgroundRed":0,"BackgroundGreen":0,"BackgroundBlue":0,"ToolbarObjects":[]}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"GenerateGlueControlManagerCode":false,"EmbedGameInGameTab":true,"RestartScreenOnLevelContentChange":true,"PortNumber":8675,"ShowScreenBoundsWhenViewingEntities":true,"ShowGrid":true,"GridSize":32.0,"GridAlpha":0.15,"EnableSnapping":true,"SnapSize":8.0,"PolygonPointSnapSize":1.0,"SetBackgroundColor":false,"BackgroundRed":0,"BackgroundGreen":0,"BackgroundBlue":0,"ToolbarObjects":[]}
		{"GenerateGlueControlManagerCode":false,"EmbedGameInGameTab":true,"RestartScreenOnLevelContentChange":true,"PortNumber":8675,"ShowScreenBoundsWhenViewingEntities":true,"RestartOnFailedCommands":false,"ShowGrid":true,"GridSize":32.0,"GridAlpha":0.15,"EnableSnapping":true,"SnapSize":8.0,"PolygonPointSnapSize":1.0,"SetBackgroundColor":false,"BackgroundRed":0,"BackgroundGreen":0,"BackgroundBlue":0,"ToolbarObjects":[]}