Merge pull request #31 from welles/beta-integrated-develop

Release v1.6.2 - Beta (MCM Integrated)

.github/workflows/build.yml

@@ -0,0 +1,58 @@
+name: Build
+
+on: push
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: 3.1.x
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Setup BUTR GPR
+        uses: actions/setup-dotnet@master
+        with:
+          source-url: https://nuget.pkg.github.com/BUTR/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+#     - name: Set build version
+#       run: ((Get-Content .\Directory.Build.props -Raw) -replace "<Version>(\d+)\.(\d+)\.(\d+)\.0<\/Version>", "<Version>`$1.`$2.`$3.${{github.run_number}}</Version>") | Set-Content .\Directory.Build.props
+
+      - name: Build BannerlordCheats
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\game"
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Get Versions
+        id: versions
+        run: |
+          $ModVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<Version>([\d.]+)<\/Version>" | % { $($_.Matches.Groups[1]).Value }
+          $ModVersion = $ModVersion.TrimEnd(".0")	
+          If ($ModVersion -notcontains ".") { $ModVersion = "$ModVersion.0" }
+          echo "::set-output name=mod_version::$ModVersion"
+          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
+          echo "::set-output name=game_version::$GameVersion"
+          $GameBranch = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameBranch>(.+)<\/GameBranch>" | % { $($_.Matches.Groups[1]).Value }
+          echo "::set-output name=game_branch::$GameBranch"
+
+      - name: Package Mod Files
+        run: 7z a -tzip BannerlordCheats.v${{steps.versions.outputs.mod_version}}.${{steps.versions.outputs.game_branch}}.e${{steps.versions.outputs.game_version}}.zip ./game/*
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BannerlordCheats.v${{steps.versions.outputs.mod_version}}.${{steps.versions.outputs.game_branch}}.e${{steps.versions.outputs.game_version}}
+          path: ./game/*

BannerlordCheats.csproj

@@ -1,223 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BannerlordCheats</RootNamespace>
-    <AssemblyName>BannerlordCheats</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\Program Files %28x86%29\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\Modules\Cheats\bin\Win64_Shipping_Client\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Lib.Harmony.2.0.2\lib\net472\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="Bannerlord.UIExtenderEx, Version=0.0.11.13, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.9\lib\net472\Bannerlord.UIExtenderEx.dll</HintPath>
-    </Reference>
-    <Reference Include="MCMv3, Version=3.1.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.9\lib\net472\MCMv3.dll</HintPath>
-    </Reference>
-    <Reference Include="MCMv3.Implementation.v3.1.9, Version=3.1.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.9\lib\net472\MCMv3.Implementation.v3.1.9.dll</HintPath>
-    </Reference>
-    <Reference Include="MCMv3.UI.v3.1.9, Version=3.1.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.9\lib\net472\MCMv3.UI.v3.1.9.dll</HintPath>
-    </Reference>
-    <Reference Include="SandBox">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\Modules\SandBox\bin\Win64_Shipping_Client\SandBox.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SandBox.GauntletUI">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\Modules\SandBox\bin\Win64_Shipping_Client\SandBox.GauntletUI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="TaleWorlds.CampaignSystem">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.CampaignSystem.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.CampaignSystem.ViewModelCollection">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.CampaignSystem.ViewModelCollection.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.Core">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.DotNet">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.DotNet.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.Engine">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.Engine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.InputSystem">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.InputSystem.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.Library">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.Library.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.Localization">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.Localization.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.MountAndBlade">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.MountAndBlade.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.MountAndBlade.ViewModelCollection">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.MountAndBlade.ViewModelCollection.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="TaleWorlds.ObjectSystem">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\bin\Win64_Shipping_Client\TaleWorlds.ObjectSystem.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Localization\L10N.cs" />
-    <Compile Include="Extensions\Reflection.cs" />
-    <Compile Include="Extensions\Keys.cs" />
-    <Compile Include="Localization\LocalizedSettingProperty.cs" />
-    <Compile Include="Localization\LocalizedSettingPropertyFloatingInteger.cs" />
-    <Compile Include="Localization\LocalizedSettingPropertyPercent.cs" />
-    <Compile Include="Localization\LocalizedSettingPropertyInteger.cs" />
-    <Compile Include="Localization\LocalizedSettingPropertyBool.cs" />
-    <Compile Include="Localization\LocalizedSettingPropertyGroup.cs" />
-    <Compile Include="Patches\Characters\BarterOfferAlwaysAccepted.cs" />
-    <Compile Include="Patches\Characters\ConversationAlwaysSuccessful.cs" />
-    <Compile Include="Patches\Characters\NoBarterCooldown.cs" />
-    <Compile Include="Patches\Characters\PerfectRelationships.cs" />
-    <Compile Include="Patches\Combat\AlwaysCrushThrough.cs" />
-    <Compile Include="Patches\Combat\DamageMultiplier.cs" />
-    <Compile Include="Patches\Combat\DamageTakenPercentage.cs" />
-    <Compile Include="Patches\Combat\EnemiesNoRunningAwayPatch.cs" />
-    <Compile Include="Patches\Combat\EnemyOnlyKnockout.cs" />
-    <Compile Include="Patches\Combat\HealthRegen.cs" />
-    <Compile Include="Patches\Combat\InfiniteAmmo.cs" />
-    <Compile Include="Patches\Combat\NoFriendlyFire.cs" />
-    <Compile Include="Patches\Combat\NoRunningAwayPatch.cs" />
-    <Compile Include="Patches\Combat\PartyDamageMultiplier.cs" />
-    <Compile Include="Patches\Combat\PartyDamageTakenPercentage.cs" />
-    <Compile Include="Patches\Combat\PartyHealthRegen.cs" />
-    <Compile Include="Patches\Combat\PartyInfiniteAmmo.cs" />
-    <Compile Include="Patches\Experience\TroopExperienceMultiplierPatch.cs" />
-    <Compile Include="Patches\Kingdom\ForceKingdomDecisionPatch.cs" />
-    <Compile Include="Patches\Kingdom\NoRelationshipLossOnArmyDisband.cs" />
-    <Compile Include="Patches\Kingdom\NoRelationshipLossOnDecisionPatch.cs" />
-    <Compile Include="Patches\Kingdom\NoRelationshipLossOnExpellingClan.cs" />
-    <Compile Include="Patches\Map\PartyInvisibleOnMap.cs" />
-    <Compile Include="Patches\Map\SlowDownPartiesOnMap.cs" />
-    <Compile Include="Patches\Party\InstantEscape.cs" />
-    <Compile Include="Patches\Settlements\FreeTroopRecruitment.cs" />
-    <Compile Include="Patches\Settlements\GarrisonGrowthPatch.cs" />
-    <Compile Include="Patches\Settlements\GarrisonWagesPatch.cs" />
-    <Compile Include="Patches\Settlements\HearthsPatch.cs" />
-    <Compile Include="Patches\Settlements\LoyaltyPatch.cs" />
-    <Compile Include="Patches\Settlements\MilitiaGrowthPatch.cs" />
-    <Compile Include="Patches\Settlements\ProsperityPatch.cs" />
-    <Compile Include="Patches\Settlements\SecurityPatch.cs" />
-    <Compile Include="Patches\Settlements\SellingPriceMultiplier.cs" />
-    <Compile Include="Patches\Settlements\SettlementFoodStocksPatch.cs" />
-    <Compile Include="Patches\Settlements\TradeCostPercentage.cs" />
-    <Compile Include="Patches\Sieges\EnemySiegeBuildSpeed.cs" />
-    <Compile Include="Patches\Smithing\AllPartsUnlockedPatch.cs" />
-    <Compile Include="Patches\Combat\AlwaysWinBattleSimulationPatch.cs" />
-    <Compile Include="Patches\Army\ArmyCohesionPatch.cs" />
-    <Compile Include="Patches\Combat\BanditHideoutTroopLimitPatch.cs" />
-    <Compile Include="Patches\Combat\BattleInfluenceGainPatch.cs" />
-    <Compile Include="Patches\Combat\BattleRenownGainPatch.cs" />
-    <Compile Include="Patches\Hotkeys\CharacterAttributesCheatPatch.cs" />
-    <Compile Include="Patches\Clan\ClanPartyLimitPatch.cs" />
-    <Compile Include="Patches\Party\CompanionHiringPricePatch.cs" />
-    <Compile Include="Patches\Clan\CompanionLimitPatch.cs" />
-    <Compile Include="Patches\Settlements\DisguiseAlwaysWorksPatch.cs" />
-    <Compile Include="Patches\Party\FreeTroopUpgradesPatch.cs" />
-    <Compile Include="Patches\Army\NoArmyFoodConsumptionPatch.cs" />
-    <Compile Include="Patches\Party\NoFoodConsumptionPatch.cs" />
-    <Compile Include="Patches\Party\NoPrisonerEscapePatch.cs" />
-    <Compile Include="Patches\Smithing\NoSmithingDifficultyPatch.cs" />
-    <Compile Include="Patches\Combat\NoTroopSacrificePatch.cs" />
-    <Compile Include="Patches\Party\NoTroopWagesPatch.cs" />
-    <Compile Include="Patches\Settlements\OneDayConstructionPatch.cs" />
-    <Compile Include="Patches\Party\PartyHealingPatch.cs" />
-    <Compile Include="Patches\Combat\PartyOneHitKillPatch.cs" />
-    <Compile Include="Patches\Combat\PartyInvincibilityCheatPatch.cs" />
-    <Compile Include="Patches\Combat\OneHitKillPatch.cs" />
-    <Compile Include="Patches\Experience\DefaultCharacterDevelopmentModelPatch.cs" />
-    <Compile Include="Patches\Experience\DefaultGenericXpModelPatch.cs" />
-    <Compile Include="Patches\Inventory\DefaultInventoryCapacityModelPatch.cs" />
-    <Compile Include="Patches\Map\DefaultMapVisibilityModelPatch.cs" />
-    <Compile Include="Patches\Sieges\DefaultSiegeEventModelPatch.cs" />
-    <Compile Include="Patches\Party\PartyMemberSizeLimitPatch.cs" />
-    <Compile Include="Patches\Map\DefaultPartySpeedCalculatingModelPatch.cs" />
-    <Compile Include="Patches\Hotkeys\InfluenceCheatPatch.cs" />
-    <Compile Include="Patches\Hotkeys\MoneyCheatPatch.cs" />
-    <Compile Include="Patches\Party\PartyMoralePatch.cs" />
-    <Compile Include="Patches\Combat\PartyOnlyKnockoutPatch.cs" />
-    <Compile Include="Patches\Party\PartyPrisonerSizeLimitPatch.cs" />
-    <Compile Include="Patches\Party\RecruitPrisonersPatch.cs" />
-    <Compile Include="Patches\Smithing\RefiningEnergyCostPatch.cs" />
-    <Compile Include="Patches\Combat\InvincibilityCheatPatch.cs" />
-    <Compile Include="Patches\Smithing\SmeltingEnergyCostPatch.cs" />
-    <Compile Include="Patches\Smithing\SmithingEnergyCostPatch.cs" />
-    <Compile Include="Patches\Smithing\SmithingMaterialsPatch.cs" />
-    <Compile Include="Patches\Combat\TournamentRenownPatch.cs" />
-    <Compile Include="Patches\Hotkeys\TroopCountCheatPatch.cs" />
-    <Compile Include="Patches\Hotkeys\TroopExperienceCheatPatch.cs" />
-    <Compile Include="Patches\Smithing\SmithPerfectWeapons.cs" />
-    <Compile Include="Settings\BannerlordCheatsSettings.cs" />
-    <Compile Include="SubModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="SubModule.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include=".gitignore" />
-    <None Include="LICENSE" />
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="L10N.resx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(ProjectDir)SubModule.xml" "$(TargetDir)..\.." /Y</PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>rmdir  "$(TargetDir)..\.." /Q /S</PreBuildEvent>
-  </PropertyGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <ItemGroup>
+      <PackageReference Include="Bannerlord.MCM.Integrated" Version="$(MCMVersion)" />
+      <PackageReference Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
+      <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Update="SubModule.xml">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+      <None Include="L10N.resx">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
+</Project>

BannerlordCheats.sln

@@ -1,25 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BannerlordCheats", "BannerlordCheats.csproj", "{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BannerlordCheats", "BannerlordCheats.csproj", "{208114A1-295B-45FC-9EA3-B1D8326CF4E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29D8F3D2-EF2F-43A5-86F5-FA4DABF64922}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6182D303-DBB3-4906-858B-9D6410322433}
+		{208114A1-295B-45FC-9EA3-B1D8326CF4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{208114A1-295B-45FC-9EA3-B1D8326CF4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{208114A1-295B-45FC-9EA3-B1D8326CF4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{208114A1-295B-45FC-9EA3-B1D8326CF4E9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Directory.Build.props

@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <Version>1.6.2.0</Version>
+    <GameVersion>1.5.1</GameVersion>
+    <GameBranch>Beta.MCM.Integrated</GameBranch>
+    <HarmonyVersion>2.0.2</HarmonyVersion>
+    <MCMVersion>3.1.9</MCMVersion>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>8.0</LangVersion>
+    <GameFolder>C:\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\Modules</GameFolder>
+  </PropertyGroup>
+</Project>