Allow MonoGameVersion to be overridden

dellis1972 · Oct 14, 2024 · bfc04aa · bfc04aa
1 parent 2a1a664
commit bfc04aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props b/Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props
@@ -7,7 +7,7 @@
     <AutoRestoreMGCBTool Condition="'$(AutoRestoreMGCBTool)' == ''">true</AutoRestoreMGCBTool>
     <MGCBToolDirectory>$(MSBuildThisFileDirectory)dotnet-tools/</MGCBToolDirectory>
     <MGCBCommand Condition="'$(MGCBCommand)' == ''">mgcb</MGCBCommand>
-    <MonoGameVersion>3.8.1.1-develop</MonoGameVersion>
+    <MonoGameVersion Condition="'$(MonoGameVersion)' == ''">3.8.1.1-develop</MonoGameVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/build/BuildToolsTasks/BuildMGCBTask.cs b/build/BuildToolsTasks/BuildMGCBTask.cs
@@ -12,8 +12,8 @@ public override void Run(BuildContext context)
         {
             context.ReplaceRegexInFiles(
                 "Tools/MonoGame.Content.Builder.Task/MonoGame.Content.Builder.Task.props",
-                @"<MonoGameVersion>([^\s]*)<\/MonoGameVersion>",
-                $"<MonoGameVersion>{context.Version}</MonoGameVersion>",
+                @"<MonoGameVersion Condition=""'$(MonoGameVersion)' == ''"">([^\s]*)<\/MonoGameVersion>",
+                $"<MonoGameVersion Condition=""'$(MonoGameVersion)' == ''"">{context.Version}</MonoGameVersion>",
                 RegexOptions.Singleline
             );
         }