diff --git a/Changelog.txt b/Changelog.txt index a1543945..abf6a1f3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -268,4 +268,10 @@ ChangeLog user @ncanceill 0.3.29.6 - Updated for 1.12 \ No newline at end of file + Updated for 1.12 + +0.3.29.7 + Updated Firespitter dll + Renamed DLL for CKAN compatibility + Added AssemblyFileVersion + Updated version file for 1.12 \ No newline at end of file diff --git a/GameData/Firespitter/Plugins/Firespitter.dll b/GameData/Firespitter/Plugins/Firespitter.dll index c5816b76..0ed62b7a 100644 Binary files a/GameData/Firespitter/Plugins/Firespitter.dll and b/GameData/Firespitter/Plugins/Firespitter.dll differ diff --git a/ModuleBounce/AssemblyVersion.cs b/ModuleBounce/AssemblyVersion.cs index 30dd9fc7..6d4b2c3a 100644 --- a/ModuleBounce/AssemblyVersion.cs +++ b/ModuleBounce/AssemblyVersion.cs @@ -5,4 +5,5 @@ using System.Reflection; - [assembly: AssemblyVersion("0.3.29.0")] + [assembly: AssemblyVersion("0.3.29.7")] + [assembly: AssemblyFileVersion("0.3.29.7")] diff --git a/ModuleBounce/AssemblyVersion.tt b/ModuleBounce/AssemblyVersion.tt index af79774f..393a51b6 100644 --- a/ModuleBounce/AssemblyVersion.tt +++ b/ModuleBounce/AssemblyVersion.tt @@ -98,3 +98,4 @@ using System.Reflection; [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] + [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] diff --git a/ModuleBounce/ModuleBounce.csproj b/ModuleBounce/ModuleBounce.csproj index 3add4fb2..0be9b1de 100644 --- a/ModuleBounce/ModuleBounce.csproj +++ b/ModuleBounce/ModuleBounce.csproj @@ -8,9 +8,10 @@ Library Properties ModuleBounce - ModuleBounce - v4.5 + SXTContinued + v4.7.2 512 + true @@ -62,17 +63,33 @@ -start /D D:\Users\jbb\github\SXTContinued /WAIT deploy.bat $(TargetDir) $(TargetFileName) -if $(ConfigurationName) == Release ( - start /D D:\Users\jbb\github\SXTContinued /WAIT buildRelease.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 + +) + +start /D $(SolutionDir) /WAIT deploy.bat $(TargetDir) $(TargetFileName) $(TargetName) + +if $(ConfigurationName) == Release ( + + start /D $(SolutionDir) /WAIT buildRelease.bat $(TargetDir) $(TargetFileName) $(TargetName) + +) + - -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" +