From 7922164db86f1b3d2582c2c60f4b9b2d5ff30da0 Mon Sep 17 00:00:00 2001 From: Jonathan Bayer Date: Mon, 19 Jul 2021 10:58:37 -0400 Subject: [PATCH] Updated version file for KSP 1.12 Added AssemblyFileVersion --- BAM.version | 7 +++- BAM.version.orig | 20 ----------- ChangeLog.txt | 5 +++ GameData/BAM/BAM.version | 24 +++++--------- GameData/BAM/README.md | 15 --------- KSP-BAM-Master/AssemblyVersion.tt | 3 +- KSP-BAM-master/App.config | 9 +++-- KSP-BAM-master/AssemblyVersion.cs | 3 +- .../KSP-BlastAwesomenessModifier.csproj | 33 +++++++++++++------ KSP-BAM-master/Properties/AssemblyInfo.cs | 2 +- buildRelease.bat | 1 - deploy.bat | 12 +++++-- 12 files changed, 62 insertions(+), 72 deletions(-) delete mode 100644 BAM.version.orig diff --git a/BAM.version b/BAM.version index f7c9314..676869f 100644 --- a/BAM.version +++ b/BAM.version @@ -10,7 +10,12 @@ "MAJOR": 1, "MINOR": 3, "PATCH": 3, - "BUILD": 3 + "BUILD": 4 + }, + "KSP_VERSION": { + "MAJOR": 1, + "MINOR": 12, + "PATCH": 0 }, "KSP_VERSION_MIN": { "MAJOR": 1, diff --git a/BAM.version.orig b/BAM.version.orig deleted file mode 100644 index 6afc017..0000000 --- a/BAM.version.orig +++ /dev/null @@ -1,20 +0,0 @@ -{ - "NAME": "BAM", - "URL": "http://ksp.spacetux.net/avc/BAM", - "DOWNLOAD": "https://github.com/linuxgurugamer/CIT/releases", - "GITHUB": { - "USERNAME": "linuxgurugamer", - "REPOSITORY": "CIT" - }, - "VERSION": { - "MAJOR": 1, - "MINOR": 3, - "PATCH": 2, - "BUILD": 6 - }, - "KSP_VERSION_MIN": { - "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 - } -} diff --git a/ChangeLog.txt b/ChangeLog.txt index e7c4c51..ebbe2ed 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -31,3 +31,8 @@ ChangeLog 1.3.3.3 Really did the MiniAVC update + +1.3.3.4 + Updated version file for KSP 1.12 + Added AssemblyFileVersion + diff --git a/GameData/BAM/BAM.version b/GameData/BAM/BAM.version index cbc2a64..676869f 100644 --- a/GameData/BAM/BAM.version +++ b/GameData/BAM/BAM.version @@ -1,31 +1,25 @@ { "NAME": "BAM", "URL": "http://ksp.spacetux.net/avc/BAM", - "DOWNLOAD" : "https://github.com/linuxgurugamer/CIT/releases", - "GITHUB" : - { - "USERNAME" : "linuxgurugamer", - "REPOSITORY" : "CIT" + "DOWNLOAD": "https://github.com/linuxgurugamer/CIT/releases", + "GITHUB": { + "USERNAME": "linuxgurugamer", + "REPOSITORY": "CIT" }, "VERSION": { "MAJOR": 1, "MINOR": 3, - "PATCH": 2, + "PATCH": 3, "BUILD": 4 }, "KSP_VERSION": { "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 + "MINOR": 12, + "PATCH": 0 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 5, - "PATCH": 1 - }, - "KSP_VERSION_MAX": { - "MAJOR": 1, - "MINOR": 5, - "PATCH": 99 + "MINOR": 8, + "PATCH": 0 } } diff --git a/GameData/BAM/README.md b/GameData/BAM/README.md index 6515794..5871065 100644 --- a/GameData/BAM/README.md +++ b/GameData/BAM/README.md @@ -1,18 +1,3 @@ Revival of Marce's old mods: BAM - -1.3.2.0 - Updted for 1.4.1 - -1.3.2.1 - Fixed config file path - -1.3.2.2 - Updated version info - -1.3.2.3 - Version bump for 1.5 rebuild - -1.3.2.4 - Fixed typo in .version file \ No newline at end of file diff --git a/KSP-BAM-Master/AssemblyVersion.tt b/KSP-BAM-Master/AssemblyVersion.tt index 9012e80..e12c7d2 100644 --- a/KSP-BAM-Master/AssemblyVersion.tt +++ b/KSP-BAM-Master/AssemblyVersion.tt @@ -97,4 +97,5 @@ using System.Reflection; - [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] \ No newline at end of file + [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] + [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] diff --git a/KSP-BAM-master/App.config b/KSP-BAM-master/App.config index 9b3894e..10eb114 100644 --- a/KSP-BAM-master/App.config +++ b/KSP-BAM-master/App.config @@ -1,8 +1,7 @@ - - + - - - \ No newline at end of file + + + diff --git a/KSP-BAM-master/AssemblyVersion.cs b/KSP-BAM-master/AssemblyVersion.cs index 12fb614..59b876b 100644 --- a/KSP-BAM-master/AssemblyVersion.cs +++ b/KSP-BAM-master/AssemblyVersion.cs @@ -5,4 +5,5 @@ using System.Reflection; - [assembly: AssemblyVersion("1.3.2.5")] \ No newline at end of file + [assembly: AssemblyVersion("1.3.3.4")] + [assembly: AssemblyFileVersion("1.3.3.4")] diff --git a/KSP-BAM-master/KSP-BlastAwesomenessModifier.csproj b/KSP-BAM-master/KSP-BlastAwesomenessModifier.csproj index 9fbf772..c8f1579 100644 --- a/KSP-BAM-master/KSP-BlastAwesomenessModifier.csproj +++ b/KSP-BAM-master/KSP-BlastAwesomenessModifier.csproj @@ -8,8 +8,8 @@ Library Properties CIT_BlastAwesomenessModifier - BAM - v4.5 + BAMCont + v4.7.2 512 true @@ -77,18 +77,31 @@ - -set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2017\Community\Common7\IDE \texttransform.exe" - -%25textTemplatingPath%25 "$(ProjectDir)AssemblyVersion.tt" + "$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt" - start /D D:\Users\jbb\github\CIT /WAIT deploy.bat $(TargetDir) $(TargetFileName) + +set KSPDIR=$(KSPDIR) + +IF "%25KSPDIR%25"=="" ( + + ECHO Configuration error - KSPDIR not specified in project. + + ECHO Either set KSPDIR environment variable or edit BetterLoadSaveGame.Common.props + + PAUSE + + GOTO DONE -if $(ConfigurationName) == Release ( - start /D D:\Users\jbb\github\CIT /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) ) - + +start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) $(TargetName) + +if $(ConfigurationName) == Release ( + + start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName) + +)