Helios 1.4.2020.0315 - Mainly installer changes, and some new messagi…

…ng. New powershell script to check that the correct files are being laid down.
BlueFinBima · Mar 15, 2020 · 82c8e93 · 82c8e93
1 parent b9dad44
commit 82c8e93
Show file tree

Hide file tree

Showing 28 changed files with 496 additions and 375 deletions.
diff --git a/Aircraft A-10C/Aircraft A-10C.csproj b/Aircraft A-10C/Aircraft A-10C.csproj
@@ -625,6 +625,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(TargetDir)Templates\*.*" "$(SolutionDir)$(OutDir)Templates\Base\$(TargetName)\"</PostBuildEvent>
+    <PostBuildEvent>echo Post-build for target name:   $(TargetName)
+xcopy /s /y "$(TargetDir)Templates\*.*" "$(SolutionDir)$(OutDir)Templates\Base\$(TargetName)\"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/Aircraft A-10C/Properties/AssemblyInfo.cs b/Aircraft A-10C/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.4.2020.0308")]
-[assembly: AssemblyFileVersion("1.4.2020.0308")]
+[assembly: AssemblyVersion("1.4.2020.0315")]
+[assembly: AssemblyFileVersion("1.4.2020.0315")]
diff --git a/Aircraft A-10C/Templates/RWR Bezel.htpl b/Aircraft A-10C/Templates/RWR Bezel.htpl
@@ -1 +1 @@
-<ControlTemplate><Name>RWR Bezel</Name><Category>A-10 Gauges</Category><TypeIdentifier>Helios.Base.Image</TypeIdentifier><Template><TemplateValues><Image>{Helios}/Interfaces/Falcon/RWR/rwr_bezel.png</Image><Alignment>Stretched</Alignment><CornerRadius>0</CornerRadius><Location>239,144</Location><Size>400,387</Size></TemplateValues></Template></ControlTemplate>
+<ControlTemplate><Name>RWR Bezel</Name><Category>A-10C Gauges</Category><TypeIdentifier>Helios.Base.Image</TypeIdentifier><Template><TemplateValues><Image>{Helios}/Interfaces/Falcon/RWR/rwr_bezel.png</Image><Alignment>Stretched</Alignment><CornerRadius>0</CornerRadius><Location>239,144</Location><Size>400,387</Size></TemplateValues></Template></ControlTemplate>
diff --git a/Aircraft AV-8B/Aircraft AV-8B.csproj b/Aircraft AV-8B/Aircraft AV-8B.csproj
@@ -782,6 +782,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(TargetDir)Templates\*.*" "$(SolutionDir)$(OutDir)Templates\Base\$(TargetName)\"</PostBuildEvent>
+    <PostBuildEvent>echo Post-build for target name:   $(TargetName)
+echo xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"
+xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/Aircraft AV-8B/Properties/AssemblyInfo.cs b/Aircraft AV-8B/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.4.2020.0308")]
-[assembly: AssemblyFileVersion("1.4.2020.0308")]
+[assembly: AssemblyVersion("1.4.2020.0315")]
+[assembly: AssemblyFileVersion("1.4.2020.0315")]
diff --git a/Aircraft FA-18C/Aircraft FA-18C.csproj b/Aircraft FA-18C/Aircraft FA-18C.csproj
@@ -299,6 +299,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(TargetDir)Templates\*.*" "$(SolutionDir)$(OutDir)Templates\Base\$(TargetName)\"</PostBuildEvent>
+    <PostBuildEvent>echo Post-build for target name:   $(TargetName)
+echo xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"
+xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/Aircraft FA-18C/Properties/AssemblyInfo.cs b/Aircraft FA-18C/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.4.2020.0308")]
-[assembly: AssemblyFileVersion("1.4.2020.0308")]
+[assembly: AssemblyVersion("1.4.2020.0315")]
+[assembly: AssemblyFileVersion("1.4.2020.0315")]
diff --git a/Aircraft M2000C/Aircraft M2000C.csproj b/Aircraft M2000C/Aircraft M2000C.csproj
@@ -745,6 +745,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(TargetDir)Templates\*.*" "$(SolutionDir)$(OutDir)Templates\Base\$(TargetName)\"</PostBuildEvent>
+    <PostBuildEvent>echo Post-build for target name:   $(TargetName)
+echo xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"
+xcopy /s /y "$(ProjectDir)Templates\*.*" "$(TargetDir)Templates\base\$(TargetName)\"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/Aircraft M2000C/Properties/AssemblyInfo.cs b/Aircraft M2000C/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.4.2020.0308")]
-[assembly: AssemblyFileVersion("1.4.2020.0308")]
+[assembly: AssemblyVersion("1.4.2020.0315")]
+[assembly: AssemblyFileVersion("1.4.2020.0315")]
diff --git a/Control Center/App.config b/Control Center/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="KeraLua" publicKeyToken="6a194c04b9c89217" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.29.0" newVersion="1.0.29.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Control Center/Properties/AssemblyInfo.cs b/Control Center/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("1.4.2020.0308")]
-[assembly: AssemblyFileVersion("1.4.2020.0308")]
+[assembly: AssemblyVersion("1.4.2020.0315")]
+[assembly: AssemblyFileVersion("1.4.2020.0315")]
diff --git a/Docs/Helios - Notes for creating a Release.md b/Docs/Helios - Notes for creating a Release.md
@@ -26,6 +26,9 @@ Review and change ContributionBlock.text in About.xaml.cs in both Helios and PE
 Review and make necessary changes to SetProjectReleaseMessage() in CC's MainWindow.xaml.cs
 Update the "Helios.Read.Me.txt" file in the Helios project's root folder.
 Update the "ChangeLog.md" file in the Helios project's root folder.
+Check for NuGet updates (don't update commandline.dll)
+Ensure that Lua53.dll is being pulled into the installer.  It should get copied into bin\release\ automatically.
+
 
 Commit the Dev branch
 
@@ -91,6 +94,12 @@ The XML file is also stored more permanently in the HeliosCheckRelease repo http
 is not actually the source which is checked in, but the asset HeliosCurrentVersionV2.xml which is in the "CheckRelease" tag GitHub release.  Longer term,
 this is the only 
 
+## Checking the Program File Contents
+
+This Powershell script Pre-shipInstallationCheck.ps1 can be used to save directory information for comparison.  In order to run this, you need to issues
+```Set-ExecutionPolicy Unrestricted ```
+from an admin Powershell 
+
 ## Information for the Download Site 
 
 https://www.digitalcombatsimulator.com/en/files/3302014/
@@ -130,3 +139,13 @@ Update my EDForums Signature
 
 Create a new entry in the ChangeLog.md file so that new features can be added into this file.
 Clean up and GH Issues that have been resolved in the shipped code. 
+
+
+## General Notes
+Debugging Installer problems can be helped by turning on logging which is done using a registry key
+https://support.microsoft.com/en-gb/help/223300/how-to-enable-windows-installer-logging
+``` 
+Windows Registry Editor Version 5.00
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Installer]
+"Logging"="voicewarmupx"
+```
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<ControlTemplate><Name>RWR Bezel</Name><Category>A-10 Gauges</Category><TypeIdentifier>Helios.Base.Image</TypeIdentifier><Template><TemplateValues><Image>{Helios}/Interfaces/Falcon/RWR/rwr_bezel.png</Image><Alignment>Stretched</Alignment><CornerRadius>0</CornerRadius><Location>239,144</Location><Size>400,387</Size></TemplateValues></Template></ControlTemplate>
		<ControlTemplate><Name>RWR Bezel</Name><Category>A-10C Gauges</Category><TypeIdentifier>Helios.Base.Image</TypeIdentifier><Template><TemplateValues><Image>{Helios}/Interfaces/Falcon/RWR/rwr_bezel.png</Image><Alignment>Stretched</Alignment><CornerRadius>0</CornerRadius><Location>239,144</Location><Size>400,387</Size></TemplateValues></Template></ControlTemplate>