Updated Firespitter dll

Renamed DLL for CKAN compatibility Added AssemblyFileVersion Updated version file for 1.12
linuxgurugamer · Aug 3, 2021 · 920a494 · 920a494
1 parent 14c8b39
commit 920a494
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 18 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -268,4 +268,10 @@ ChangeLog
 	user @ncanceill
 
 0.3.29.6
-    Updated for 1.12
+    Updated for 1.12
+
+0.3.29.7
+	Updated Firespitter dll
+	Renamed DLL for CKAN compatibility
+	Added AssemblyFileVersion
+	Updated version file for 1.12
diff --git a/GameData/Firespitter/Plugins/Firespitter.dll b/GameData/Firespitter/Plugins/Firespitter.dll
diff --git 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
@@ -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
@@ -8,9 +8,10 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ModuleBounce</RootNamespace>
-    <AssemblyName>ModuleBounce</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AssemblyName>SXTContinued</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,17 +63,33 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
-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)
-)</PostBuildEvent>
+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)
+
+)
+</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>
-set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2017\Community\Common7\IDE\texttransform.exe"
-
-%25textTemplatingPath%25 "$(ProjectDir)AssemblyVersion.tt"
+    <PreBuildEvent>"$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt"
+
 </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/ModuleBounce/Properties/AssemblyInfo.cs b/ModuleBounce/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SXTContinued.version b/SXTContinued.version
@@ -10,7 +10,12 @@
     "MAJOR": 0,
     "MINOR": 3,
     "PATCH": 29,
-    "BUILD": 6
+    "BUILD": 7
+  },
+  "KSP_VERSION": {
+    "MAJOR": 1,
+    "MINOR": 12,
+    "PATCH": 0
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git 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
@@ -12,11 +12,14 @@ set GAMEDIR=SXT
 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%"
 
-xcopy /y /s /I %GAMEDATA%\Firespitter "%H%\GameData\Firespitter"
-xcopy /y /s /I %GAMEDATA%\RetractableLiftingSurface "%H%\GameData\RetractableLiftingSurface"
-
+pause
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,3 +98,4 @@
		using System.Reflection;

		[assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
		[assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]