From f42f8379b4e4b126df9b96c304fb56460fdca259 Mon Sep 17 00:00:00 2001 From: Jonathan Bayer Date: Fri, 6 Aug 2021 15:11:55 -0400 Subject: [PATCH] Renamed DLL for CKAN compatibility Added AssemblyFileVersion Updated version file for 1.12 --- ChangeLog.txt | 5 +++++ IXSWarpShipOS.version | 9 +++++++-- Source/AssemblyVersion.cs | 3 ++- Source/AssemblyVersion.tt | 1 + Source/WarpShip.csproj | 11 +++++------ buildRelease.bat | 1 - deploy.bat | 8 ++++++++ 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7e4b314..b4afa70 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ Changelog +0.5.1.2 + Renamed DLL for CKAN compatibility + Added AssemblyFileVersion + Updated version file for 1.12 + 0.5.1.1 Changed crew capacity of the command module to 5 diff --git a/IXSWarpShipOS.version b/IXSWarpShipOS.version index 4456d9f..c6272ea 100644 --- a/IXSWarpShipOS.version +++ b/IXSWarpShipOS.version @@ -10,11 +10,16 @@ "MAJOR": 0, "MINOR": 5, "PATCH": 1, - "BUILD": 1 + "BUILD": 2 + }, + "KSP_VERSION": { + "MAJOR": 1, + "MINOR": 12, + "PATCH": 0 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 8, + "MINOR": 12, "PATCH": 0 } } diff --git a/Source/AssemblyVersion.cs b/Source/AssemblyVersion.cs index eb43743..52a8292 100644 --- a/Source/AssemblyVersion.cs +++ b/Source/AssemblyVersion.cs @@ -5,4 +5,5 @@ using System.Reflection; - [assembly: AssemblyVersion("0.5.0.2")] + [assembly: AssemblyVersion("0.5.1.2")] + [assembly: AssemblyFileVersion("0.5.1.2")] diff --git a/Source/AssemblyVersion.tt b/Source/AssemblyVersion.tt index 132a02d..5a7426a 100644 --- a/Source/AssemblyVersion.tt +++ b/Source/AssemblyVersion.tt @@ -98,3 +98,4 @@ using System.Reflection; [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] + [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] diff --git a/Source/WarpShip.csproj b/Source/WarpShip.csproj index dceacda..2e482cc 100644 --- a/Source/WarpShip.csproj +++ b/Source/WarpShip.csproj @@ -1,13 +1,13 @@  - + Debug AnyCPU {597B17DB-4F27-4DFA-9A17-06D2E879637A} Library WarpShip - WarpShip - v4.5 + IXSWarpshipOS + v4.7.2 12.0.0 2.0 @@ -102,14 +102,13 @@ IF "%25KSPDIR%25"=="" ( ) -start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) +start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) $(TargetName) if $(ConfigurationName) == Release ( - start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) + start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName) ) - diff --git a/buildRelease.bat b/buildRelease.bat index 44b052c..16c073b 100644 --- a/buildRelease.bat +++ b/buildRelease.bat @@ -36,7 +36,6 @@ rem Copy files to GameData locations copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins" copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR% -copy /Y ..\MiniAVC.dll %GAMEDATA%\%GAMEDIR% if "%LICENSE%" NEQ "" copy /y %LICENSE% %GAMEDATA%\%GAMEDIR% if "%README%" NEQ "" copy /Y %README% %GAMEDATA%\%GAMEDIR% diff --git a/deploy.bat b/deploy.bat index 446eafd..07250a3 100644 --- a/deploy.bat +++ b/deploy.bat @@ -12,7 +12,15 @@ set GAMEDIR=IXSWarpShipOS set GAMEDATA="GameData" set VERSIONFILE=%GAMEDIR%.version +set DP0=r:\dp0\kspdev + copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins" +copy /Y "%1%3".pdb "%GAMEDATA%\%GAMEDIR%\Plugins" + copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR% xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%H%\GameData\%GAMEDIR%" +xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%DP0%\GameData\%GAMEDIR%" + +pause +