Release 2.3.0 sync with EDD 15.1.2

EDDiscovery · Aug 22, 2022 · 753336f · 753336f
1 parent e12399e
commit 753336f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/BaseUtilities b/BaseUtilities
diff --git a/EDDLite/EDDLiteForm.cs b/EDDLite/EDDLiteForm.cs
@@ -193,9 +193,10 @@ protected override void OnShown(EventArgs e)
             DLLCallBacks.GetShipLoadout = (s) => { return null; };
 
             string verstring = EDDOptions.Instance.Version;
-            string[] options = new string[] { EDDDLLInterfaces.EDDDLLIF.FLAG_HOSTNAME + "EDLITE",
-                                              EDDDLLInterfaces.EDDDLLIF.FLAG_JOURNALVERSION + "2",
-                                              EDDDLLInterfaces.EDDDLLIF.FLAG_CALLBACKVERSION + "2",
+            string[] options = new string[] { EDDDLLInterfaces.EDDDLLIF.FLAG_HOSTNAME + "EDDLITE",
+                                              EDDDLLInterfaces.EDDDLLIF.FLAG_JOURNALVERSION + EliteDangerousCore.DLL.EDDDLLCallerHE.JournalVersion.ToString(),
+                                              EDDDLLInterfaces.EDDDLLIF.FLAG_CALLBACKVERSION + DLLCallBacks.ver.ToString(),
+                                              EDDDLLInterfaces.EDDDLLIF.FLAG_CALLVERSION + EDDDLLInterfaces.EDDDLLIF.CallBackVersion,
                                             };
 
             string alloweddlls = EDDConfig.Instance.DLLPermissions;

diff --git a/EDDLite/Properties/AssemblyInfo.cs b/EDDLite/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("EDDLite")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyCopyright("Copyright © 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
diff --git a/EliteDangerousCore b/EliteDangerousCore
diff --git a/ExtendedControls b/ExtendedControls
diff --git a/Installer/build.bat b/Installer/build.bat
@@ -4,9 +4,19 @@ set /P vno=Version Number (10.1.2 etc) :
 echo set to %1
 set vno=%1
 )
+
+find "%vno%" ..\eddlite\properties\AssemblyInfo.cs
+if %ERRORLEVEL%==1 goto :error
+
 echo Build %vno%
+
 "\Program Files (x86)\Inno Setup 6\iscc.exe" /DMyAppVersion=%vno% innoscript.iss
 copy ..\EDDLite\bin\Release\EDDLite.Portable.Zip installers\EDDLite.Portable.%vno%.zip
 certutil -hashfile installers\EDDLite-%vno%.exe SHA256 >installers\checksums.%vno%.txt
 certutil -hashfile installers\EDDLite.Portable.%vno%.zip SHA256 >>installers\checksums.%vno%.txt
 
+exit /b
+
+:error
+echo Version %vno% does not correspond to AssemblyInfo.cs
+