Correctness fix

BUTR · Jul 18, 2023 · 10a6d5d · 10a6d5d
1 parent 3740416
commit 10a6d5d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/Bannerlord.Module.CSharp/.template.config/template.json b/src/Bannerlord.Module.CSharp/.template.config/template.json
@@ -29,15 +29,13 @@
       "type": "parameter",
       "datatype": "bool",
       "description": "Target the Steam/GOG/Epic version of the game",
-      "defaultValue": "true",
-      "replaces": "$(ProjectBuildForWindows)"
+      "defaultValue": "true"
     },
     "gameWindowsStore": {
       "type": "parameter",
       "datatype": "bool",
       "description": "Target the Windows Game Pass PC version of the game",
-      "defaultValue": "true",
-      "replaces": "$(ProjectBuildForWindowsStore)"
+      "defaultValue": "true"
     },
 
     "gameFolder": {

diff --git a/src/Bannerlord.Module.CSharp/BLNamespace.csproj b/src/Bannerlord.Module.CSharp/BLNamespace.csproj
@@ -12,8 +12,8 @@
     <Platforms>x64</Platforms>
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
     <Nullable Condition="'$(nullable)' != ''">enable</Nullable>
-    <BuildForWindows>$(ProjectBuildForWindows)</BuildForWindows>
-    <BuildForWindowsStore>$(ProjectBuildForWindowsStore)</BuildForWindowsStore>
+    <BuildForWindows>false</BuildForWindows>
+    <BuildForWindowsStore>false</BuildForWindowsStore>
     <ModuleId>$(ProjectModuleId)</ModuleId>
     <ModuleName>$(ProjectModuleName)</ModuleName>
     <ModuleUrl>$(ProjectModuleUrl)</ModuleUrl>

diff --git a/src/Bannerlord.Module.Sdk.CSharp/.template.config/template.json b/src/Bannerlord.Module.Sdk.CSharp/.template.config/template.json
@@ -29,15 +29,13 @@
       "type": "parameter",
       "datatype": "bool",
       "description": "Target the Steam/GOG/Epic version of the game",
-      "defaultValue": "true",
-      "replaces": "$(ProjectBuildForWindows)"
+      "defaultValue": "true"
     },
     "gameWindowsStore": {
       "type": "parameter",
       "datatype": "bool",
       "description": "Target the Windows Game Pass PC version of the game",
-      "defaultValue": "true",
-      "replaces": "$(ProjectBuildForWindowsStore)"
+      "defaultValue": "true"
     },
 
     "gameFolder": {

diff --git a/src/Bannerlord.Module.Sdk.CSharp/BLNamespace.csproj b/src/Bannerlord.Module.Sdk.CSharp/BLNamespace.csproj
@@ -13,10 +13,8 @@
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
     <Nullable Condition="'$(nullable)' != ''">enable</Nullable>
 
-    <!-- Steam/GOG/Epic versions of the game -->
-    <BuildForWindows>$(ProjectBuildForWindows)</BuildForWindows>
-    <!-- Xbox Game Pass PC version of the game -->
-    <BuildForWindowsStore>$(ProjectBuildForWindowsStore)</BuildForWindowsStore>
+    <BuildForWindows>false</BuildForWindows>
+    <BuildForWindowsStore>false</BuildForWindowsStore>
 
     <ModuleId>$(ProjectModuleId)</ModuleId>
     <ModuleName>$(ProjectModuleName)</ModuleName>
@@ -28,11 +26,13 @@
 
 <!--#if (gameWindows) -->
   <PropertyGroup Condition="$(TargetFramework) == 'net472'">
+    <!-- Steam/GOG/Epic versions of the game -->
     <BuildForWindows>true</BuildForWindows>
   </PropertyGroup>
 <!--#endif -->
 <!--#if (gameWindowsStore) -->
   <PropertyGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
+    <!-- Xbox Game Pass PC version of the game -->
     <BuildForWindowsStore>false</BuildForWindowsStore>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>