Skip to content

Commit

Permalink
Merge pull request #11 from eklynx/Packaging
Browse files Browse the repository at this point in the history
Installer works.  Couple bug fixes.
  • Loading branch information
eklynx authored Sep 19, 2020
2 parents b66ed37 + 7ef377c commit 855b37a
Show file tree
Hide file tree
Showing 6 changed files with 1,092 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## Ignore Visual Studio temporary files, build results, and
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
Expand Down Expand Up @@ -220,7 +221,7 @@ ClientBin/
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
**/*.pfx
*.publishsettings
orleans.codegen.cs

Expand Down
52 changes: 52 additions & 0 deletions SimForeflightLink.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,72 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimForeflightLink", "SimFor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimForeflightLinkTests", "SimForeflightLinkTests\SimForeflightLinkTests.csproj", "{90036646-0416-4B79-8062-2A3CA802119D}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "SimForeflightLink_Setup", "SimForeflightLink_Setup\SimForeflightLink_Setup.vdproj", "{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|ARM.Build.0 = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|ARM64.Build.0 = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|x64.ActiveCfg = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|x64.Build.0 = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|x86.ActiveCfg = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Debug|x86.Build.0 = Debug|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|Any CPU.Build.0 = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|ARM.ActiveCfg = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|ARM.Build.0 = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|ARM64.ActiveCfg = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|ARM64.Build.0 = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|x64.ActiveCfg = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|x64.Build.0 = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|x86.ActiveCfg = Release|Any CPU
{4B08BE4D-9885-422A-8E4F-5BA32F3E403B}.Release|x86.Build.0 = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|ARM.Build.0 = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|ARM64.Build.0 = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|x64.ActiveCfg = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|x64.Build.0 = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|x86.ActiveCfg = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Debug|x86.Build.0 = Debug|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|Any CPU.Build.0 = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|ARM.ActiveCfg = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|ARM.Build.0 = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|ARM64.ActiveCfg = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|ARM64.Build.0 = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|x64.ActiveCfg = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|x64.Build.0 = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|x86.ActiveCfg = Release|Any CPU
{90036646-0416-4B79-8062-2A3CA802119D}.Release|x86.Build.0 = Release|Any CPU
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Debug|Any CPU.ActiveCfg = Debug
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Debug|ARM.ActiveCfg = Debug
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Debug|ARM64.ActiveCfg = Debug
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Debug|x64.ActiveCfg = Debug
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Debug|x86.ActiveCfg = Debug
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Release|Any CPU.ActiveCfg = Release
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Release|ARM.ActiveCfg = Release
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Release|ARM64.ActiveCfg = Release
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Release|x64.ActiveCfg = Release
{F5B07FBD-6270-4569-B2B7-90EB812F4F5C}.Release|x86.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
70 changes: 70 additions & 0 deletions SimForeflightLink/Properties/app.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
<applicationRequestMinimum>
<defaultAssemblyRequest permissionSetReference="Custom" />
<PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
</applicationRequestMinimum>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
-->
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>
5 changes: 4 additions & 1 deletion SimForeflightLink/SimForeflightLink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ private void RefreshNetworkList()
);
}
tbForeflightIP.Enabled = savedFFNetworkType == NetworkTypes.DirectIPv4;
tbForeflightIP.Visible = savedFFNetworkType == NetworkTypes.DirectIPv4;

cbForeflightConnectType.SelectedIndex = selectedOption == -1 ? 0 : selectedOption;
cbForeflightConnectType.Invalidate();

Expand Down Expand Up @@ -104,13 +106,13 @@ protected override void OnLoad(EventArgs e)

private void Setttings_SettingsLoaded(object sender, SettingsLoadedEventArgs e)
{
RefreshNetworkList();
if (settings.AutostartSimConnect)
buttonSimConnect_Click(sender, new EventArgs());
if (settings.AutostartForeFlight)
buttonForeflight_Click(sender, new EventArgs());
if (!String.IsNullOrWhiteSpace(settings?.ForeFlightLastIPv4BroadcastIp))
loadedNetworkAddress = IPAddress.Parse(settings.ForeFlightLastIPv4BroadcastIp);
RefreshNetworkList();
}


Expand Down Expand Up @@ -230,6 +232,7 @@ private void cbForeflightConnectType_SelectedIndexChanged(object sender, EventAr
selectedOption.Address.ToString()
: settings.ForeFlightLastIPv4BroadcastIp = "";
tbForeflightIP.Enabled = selectedOption.NetworkType == NetworkTypes.DirectIPv4;
tbForeflightIP.Visible = selectedOption.NetworkType == NetworkTypes.DirectIPv4;
}

private void buttonForeflight_Click(object sender, EventArgs e)
Expand Down
37 changes: 30 additions & 7 deletions SimForeflightLink/SimForeflightLink.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<PublishUrl>publish\</PublishUrl>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>..\publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
Expand All @@ -22,10 +23,10 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -49,6 +50,24 @@
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>6BE9BDD9B73DBC211325628FD0A1878B0199EBE5</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>SimForeflightLink_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.FlightSimulator.SimConnect, Version=11.0.62651.3, Culture=neutral, PublicKeyToken=baf445ffb3a06b5c, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -100,6 +119,7 @@
<DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -110,6 +130,7 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="SimConnect.cfg" />
<None Include="SimForeflightLink_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand All @@ -127,10 +148,12 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Icon.ico" />
<Content Include="lib\Microsoft.FlightSimulator.SimConnect.dll" />
<Content Include="lib\PLACE DLLs HERE.txt" />
<Content Include="lib\SimConnect.dll" />
<Content Include="Icon.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="lib\Microsoft.FlightSimulator.SimConnect.dll" />
<None Include="lib\PLACE DLLs HERE.txt" />
<None Include="lib\SimConnect.dll" />
<Content Include="SimConnect.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Loading

0 comments on commit 855b37a

Please sign in to comment.