Updating FNA template to include new nugets.

vchelaru · Apr 4, 2024 · 2abf4b0 · 2abf4b0
1 parent 52d18f7
commit 2abf4b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UpdateAssemblyVersions.cs b/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UpdateAssemblyVersions.cs
@@ -92,8 +92,17 @@ public override void ExecuteStep()
         private void UpdateTemplateNugets()
         {
             var engineName = "FlatRedBallDesktopGLNet6";
-            var net6Engine = AllData.Engines.First(item => item.EngineCSProjLocation?.Contains($"{engineName}.csproj") == true);
-            var templateLocation = net6Engine.TemplateCsProjFolder + "FlatRedBallDesktopGlNet6Template.csproj";
+            var templateName = "FlatRedBallDesktopGLNet6Template";
+
+            UpdateTemplateNuget(engineName, templateName);
+
+            UpdateTemplateNuget("FlatRedBall.FNA", "FlatRedBallDesktopFnaTemplate");
+        }
+
+        private void UpdateTemplateNuget(string engineName, string templateName)
+        {
+            var matchingEngine = AllData.Engines.First(item => item.EngineCSProjLocation?.Contains($"{engineName}.csproj") == true);
+            var templateLocation = matchingEngine.TemplateCsProjFolder + templateName + "csproj";
             ModifyNugetVersionInAssembly(DirectoryHelper.TemplateDirectory + templateLocation, engineName, VersionString);
         }
 

diff --git a/...BallDesktopFnaTemplate/FlatRedBallDesktopFnaTemplate/FlatRedBallDesktopFnaTemplate.csproj b/...BallDesktopFnaTemplate/FlatRedBallDesktopFnaTemplate/FlatRedBallDesktopFnaTemplate.csproj
@@ -29,18 +29,13 @@
     <EmbeddedResource Include="Icon.bmp" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="FlatRedBall.FNA" Version="2024.4.4.693" />
     <PackageReference Include="SkiaSharp" Version="2.88.6" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FlatRedBall.FNA">
-      <HintPath>Libraries\FNA\Debug\FlatRedBall.FNA.dll</HintPath>
-    </Reference>
     <Reference Include="FlatRedBall.Forms.FNA">
       <HintPath>Libraries\FNA\Debug\FlatRedBall.Forms.FNA.dll</HintPath>
     </Reference>
-    <Reference Include="FNA">
-      <HintPath>Libraries\FNA\Debug\FNA.dll</HintPath>
-    </Reference>
     <Reference Include="GumCore.FNA">
       <HintPath>Libraries\FNA\Debug\GumCore.FNA.dll</HintPath>
     </Reference>