Switched to .NET 6 for Xbox

Added UpdateInfo tag
Aragas · Dec 23, 2023 · 94382b4 · 94382b4
1 parent 974d4e8
commit 94382b4
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 15 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------------------------------
 Version: 5.9.2
-Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.5
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.7
+* Switched to .NET 6 for Xbox
 * Updated Chinese Simplified localization
 ---------------------------------------------------------------------------------------------------
 Version: 5.9.1

diff --git a/src/MCM.Abstractions/SettingType.cs b/src/MCM.Abstractions/SettingType.cs
@@ -2,21 +2,49 @@
 
 namespace MCM.Abstractions
 {
-#if !BANNERLORDMCM_PUBLIC
-    internal
-#else
-    public
-# endif
+    /// <summary>
+    /// Defines the different types of settings that can be used.
+    /// </summary>
+    #if !BANNERLORDMCM_PUBLIC
+        internal
+    #else
+        public
+    # endif
     enum SettingType
     {
-        [SuppressMessage("CodeQuality", "IDE0079:Remove unnecessary suppression", Justification = "For ReSharper")]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        /// <summary>
+        /// A default value indicating no setting type.
+        /// </summary>
         NONE = -1,
+
+        /// <summary>
+        /// A boolean setting with true/false values.
+        /// </summary>
         Bool,
+
+        /// <summary>
+        /// An integer number setting.
+        /// </summary>
         Int,
+
+        /// <summary>
+        /// A floating point number setting. 
+        /// </summary>
         Float,
+
+        /// <summary>
+        /// A text string setting.
+        /// </summary>
         String,
+
+        /// <summary>
+        /// A dropdown list setting.
+        /// </summary>
         Dropdown,
-        Button
+
+        /// <summary>
+        /// A button that can trigger some action.
+        /// </summary>
+        Button,
     }
 }
diff --git a/src/MCM.Publish/MCM.Publish.csproj b/src/MCM.Publish/MCM.Publish.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <Authors>Aragas</Authors>
     <ModuleId>Bannerlord.MBOptionScreen</ModuleId>
     <ModuleName>Mod Configuration Menu v5</ModuleName>
@@ -16,8 +16,8 @@
   <PropertyGroup Condition="$(TargetFramework) == 'net472'">
     <BuildForWindows>true</BuildForWindows>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
     <BuildForWindowsStore>true</BuildForWindowsStore>
+  <PropertyGroup Condition="$(TargetFramework) == 'net6'">
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>

diff --git a/src/MCM.Publish/_Module/SubModule.xml b/src/MCM.Publish/_Module/SubModule.xml
@@ -8,6 +8,7 @@
   <ModuleCategory value="Singleplayer" />
   <ModuleType value="Community" />
   <Url value="https://www.nexusmods.com/mountandblade2bannerlord/mods/612" />
+  <UpdateInfo value="NexusMods:612" />
   <DependedModules>
     <DependedModule Id="Bannerlord.Harmony" DependentVersion="v$harmonyversion$" />
     <DependedModule Id="Bannerlord.ButterLib" DependentVersion="v$butterlibversion$" />
@@ -41,27 +42,31 @@
       <Name value="MCMv5" />
       <DLLName value="MCMv5.dll" />
       <SubModuleClassType value="MCM.MCMSubModule" />
+      <Assemblies/>
       <Tags />
     </SubModule>
     <!--Builtin SubModule -->
     <SubModule>
       <Name value="MCMv5 Basic Implementation" />
       <DLLName value="MCMv5.dll" />
       <SubModuleClassType value="MCM.Internal.MCMImplementationSubModule" />
+      <Assemblies/>
       <Tags />
     </SubModule>
     <!--MCMv5 Wrapper Support SubModule -->
     <SubModule>
       <Name value="MCMv5 Wrapper Support" />
       <DLLName value="MCM.UI.Adapter.MCMv5.dll" />
       <SubModuleClassType value="MCM.UI.Adapter.MCMv5.SubModule" />
+      <Assemblies/>
       <Tags />
     </SubModule>
     <!--UI SubModule -->
     <SubModule>
       <Name value="MCMv5 UI" />
       <DLLName value="MCMv5.UI.dll" />
       <SubModuleClassType value="MCM.UI.MCMUISubModule" />
+      <Assemblies/>
       <Tags />
     </SubModule>
   </SubModules>

diff --git a/src/MCM.UI/MCM.UI.csproj b/src/MCM.UI/MCM.UI.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <Authors>Aragas, mipen</Authors>
     <AssemblyName>MCMv5.UI</AssemblyName>
     <RootNamespace>MCM.UI</RootNamespace>
@@ -46,7 +46,7 @@
     <PackageReference Include="System.IO.Compression" Version="4.0.0" />
     <Reference Include="System.Windows.Forms" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
+  <ItemGroup Condition="$(TargetFramework) == 'net6'">
     <FrameworkReference Include="Microsoft.WindowsDesktop.App" PrivateAssets="all" />
   </ItemGroup>
   <!--Windows Forms-->

diff --git a/tests/MCM.Tests/MCM.Tests.csproj b/tests/MCM.Tests/MCM.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <Configurations>Stable_Debug;Beta_Debug;Stable_Release;Beta_Release</Configurations>
 
     <IsPackable>false</IsPackable>

diff --git a/tests/MCMv5.Tests/MCMv5.Tests.csproj b/tests/MCMv5.Tests/MCMv5.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <Configurations>Stable_Debug;Beta_Debug;Stable_Release;Beta_Release</Configurations>
     <DefineConstants>$(DefineConstants)</DefineConstants>