diff --git a/.vs/ThroughTheEyes/v15/sqlite3/storage.ide b/.vs/ThroughTheEyes/v15/sqlite3/storage.ide index 23b8a52..460feb6 100644 Binary files a/.vs/ThroughTheEyes/v15/sqlite3/storage.ide and b/.vs/ThroughTheEyes/v15/sqlite3/storage.ide differ diff --git a/ChangeLog.txt b/ChangeLog.txt index 291a3c0..3b1ac49 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ ChangeLog +2.0.3.1 + Added AssemblyFileVersion + Updated version file for 1.12 + 2.0.3 Added InstallChecker Updated AssemblyVersion diff --git a/GameData/ThroughTheEyes/ThroughTheEyes.version b/GameData/ThroughTheEyes/ThroughTheEyes.version index ff453c0..ed4cad4 100644 --- a/GameData/ThroughTheEyes/ThroughTheEyes.version +++ b/GameData/ThroughTheEyes/ThroughTheEyes.version @@ -10,11 +10,16 @@ "MAJOR": 2, "MINOR": 0, "PATCH": 3, - "BUILD": 0 + "BUILD": 1 + }, + "KSP_VERSION": { + "MAJOR": 1, + "MINOR": 12, + "PATCH": 2 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 8, + "MINOR": 12, "PATCH": 0 } } diff --git a/ThroughTheEyes.version b/ThroughTheEyes.version index ff453c0..ed4cad4 100644 --- a/ThroughTheEyes.version +++ b/ThroughTheEyes.version @@ -10,11 +10,16 @@ "MAJOR": 2, "MINOR": 0, "PATCH": 3, - "BUILD": 0 + "BUILD": 1 + }, + "KSP_VERSION": { + "MAJOR": 1, + "MINOR": 12, + "PATCH": 2 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 8, + "MINOR": 12, "PATCH": 0 } } diff --git a/ThroughTheEyes.version.orig b/ThroughTheEyes.version.orig deleted file mode 100644 index 64ca773..0000000 --- a/ThroughTheEyes.version.orig +++ /dev/null @@ -1,25 +0,0 @@ -{ - "NAME": "ThroughTheEyes", - "URL": "http://ksp.spacetux.net/avc/ThroughTheEyes", - "DOWNLOAD": "https://spacedock.info/mod/1560/", - "GITHUB": { - "USERNAME": "linuxgurugamer", - "REPOSITORY": "Through-The-Eyes" - }, - "VERSION": { - "MAJOR": 2, - "MINOR": 0, - "PATCH": 2, - "BUILD": 5 - }, - "KSP_VERSION": { - "MAJOR": 1, - "MINOR": 4, - "PATCH": 1 - }, - "KSP_VERSION_MIN": { - "MAJOR": 1, - "MINOR": 4, - "PATCH": 1 - } -} diff --git a/ThroughTheEyes/AssemblyVersion.cs b/ThroughTheEyes/AssemblyVersion.cs index 8e06e31..57fb2c3 100644 --- a/ThroughTheEyes/AssemblyVersion.cs +++ b/ThroughTheEyes/AssemblyVersion.cs @@ -10,4 +10,5 @@ using System.Reflection; - [assembly: AssemblyVersion("2.0.3.0")] \ No newline at end of file + [assembly: AssemblyFileVersion("2.0.3.1")] + [assembly: AssemblyVersion("2.0.3.1")] diff --git a/ThroughTheEyes/AssemblyVersion.tt b/ThroughTheEyes/AssemblyVersion.tt index 7700a60..5858d41 100644 --- a/ThroughTheEyes/AssemblyVersion.tt +++ b/ThroughTheEyes/AssemblyVersion.tt @@ -96,4 +96,5 @@ using System.Reflection; - [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] \ No newline at end of file + [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] + [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] diff --git a/ThroughTheEyes/ThroughTheEyes.csproj b/ThroughTheEyes/ThroughTheEyes.csproj index 9363bf1..7ba6744 100644 --- a/ThroughTheEyes/ThroughTheEyes.csproj +++ b/ThroughTheEyes/ThroughTheEyes.csproj @@ -78,18 +78,32 @@ -start /D D:\Users\jbb\github\Through-The-Eyes /WAIT deploy.bat $(TargetDir) $(TargetFileName) +set KSPDIR=$(KSPDIR) -if $(ConfigurationName) == Release ( - start /D D:\Users\jbb\github\Through-The-Eyes /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) -) - - - -set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2017\Community\Common7\IDE \texttransform.exe" +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 +) -%25textTemplatingPath%25 "$(ProjectDir)AssemblyVersion.tt" +start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) $(TargetName) + +if $(ConfigurationName) == Release ( + + start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName) + +) + + + + "$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt" + + \ No newline at end of file diff --git a/buildRelease.bat b/buildRelease.bat index 22b1a92..d8d8b2c 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 62681cd..e461493 100644 --- a/deploy.bat +++ b/deploy.bat @@ -12,7 +12,12 @@ set GAMEDIR=ThroughTheEyes 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%"