Skip to content

Commit

Permalink
Merge pull request #50 from #49-isolate-simulator
Browse files Browse the repository at this point in the history
Agent#49 isolate simulator
  • Loading branch information
sushiat authored Feb 2, 2022
2 parents b98b52e + 9a3786a commit ca66332
Show file tree
Hide file tree
Showing 215 changed files with 6,381 additions and 2,883 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ insert_final_newline = false

# Organize usings
dotnet_separate_import_directive_groups = true
file_header_template = --------------------------------------------------------------------------------------------------------------------\n<copyright file="{fileName}" company="OpenSky">\nOpenSky project 2021\n</copyright>\n--------------------------------------------------------------------------------------------------------------------
file_header_template = --------------------------------------------------------------------------------------------------------------------\n<copyright file="{fileName}" company="OpenSky">\nOpenSky project 2021-2022\n</copyright>\n--------------------------------------------------------------------------------------------------------------------

# this. and Me. preferences
dotnet_style_qualification_for_event = true:suggestion
Expand Down
6 changes: 3 additions & 3 deletions Installer/Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>853790e9-5caa-4ebc-b4c3-c563c3242f1d</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>OpenSky.AgentMSFS</OutputName>
<OutputName>OpenSky.Agent</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down Expand Up @@ -58,7 +58,7 @@
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.-->
<Target Name="BeforeBuild">
<GetFileVersionTask AssemblyPath="$(OutDir)..\..\..\OpenSky.AgentMSFS\bin\$(Configuration)\OpenSky.AgentMSFS.exe">
<GetFileVersionTask AssemblyPath="$(OutDir)..\..\..\OpenSky.Agent\bin\$(Configuration)\OpenSky.Agent.exe">
<Output TaskParameter="VersionNumber" PropertyName="VersionNumber" />
</GetFileVersionTask>
<CreateProperty Value="$(OutputName).$(VersionNumber)">
Expand All @@ -84,7 +84,7 @@
</Task>
</UsingTask>
<PropertyGroup>
<PreBuildEvent>"..\..\StellarHeat\DevToolkit.StellarHeat.exe" -dr:INSTALLFOLDER -cg:OpenSky.AgentMSFS.Libraries -dir:"..\..\..\OpenSky.AgentMSFS\bin\$(Configuration)" -out:"..\..\Libraries.wxs"
<PreBuildEvent>"..\..\StellarHeat\DevToolkit.StellarHeat.exe" -dr:INSTALLFOLDER -cg:OpenSky.Agent.Libraries -dir:"..\..\..\OpenSky.Agent\bin\$(Configuration)" -out:"..\..\Libraries.wxs"
"C:\Program Files (x86)\WiX Toolset v3.11\bin\heat.exe" dir "..\..\..\SoundPacks" -o "..\..\SoundPacks.wxs" -cg OpenSky.SoundPacks -sfrag -gg -suid -dr INSTALLFOLDER -var var.SoundPackSourceFolder -v -t ..\..\win64.xslt</PreBuildEvent>
</PropertyGroup>
</Project>
28 changes: 14 additions & 14 deletions Installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="OpenSky Agent for MSFS" Language="1033" Version="!(bind.FileVersion.OpenSkyAgentExeFile)" Manufacturer="OpenSky" UpgradeCode="13497001-3D38-4CC3-B197-03DB857240BC">
<Product Id="*" Name="OpenSky Flight Tracking Agent" Language="1033" Version="!(bind.FileVersion.OpenSkyAgentExeFile)" Manufacturer="OpenSky" UpgradeCode="13497001-3D38-4CC3-B197-03DB857240BC">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
<Icon Id="opensky.ico" SourceFile="..\OpenSky.AgentMSFS\Resources\opensky.ico" />
<Icon Id="opensky.ico" SourceFile="..\OpenSky.Agent\Resources\opensky.ico" />
<Property Id="ARPPRODUCTICON" Value="opensky.ico" />

<PropertyRef Id="WIX_EXT_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />
Expand All @@ -15,20 +15,20 @@
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes" />

<Feature Id="ProductFeature" Title="OpenSky.AgentMSFS" Level="1">
<ComponentGroupRef Id="OpenSky.AgentMSFS" />
<ComponentGroupRef Id="OpenSky.AgentMSFS.Libraries" />
<Feature Id="ProductFeature" Title="OpenSky.Agent" Level="1">
<ComponentGroupRef Id="OpenSky.Agent" />
<ComponentGroupRef Id="OpenSky.Agent.Libraries" />
<ComponentGroupRef Id="OpenSky.SoundPacks" />
</Feature>

<util:CloseApplication Id="CloseOpenSky.AgentMSFS" Target="OpenSky.AgentMSFS.exe" TerminateProcess="1" RebootPrompt="no" PromptToContinue="no" />
<util:CloseApplication Id="CloseOpenSky.Agent" Target="OpenSky.Agent.exe" TerminateProcess="1" RebootPrompt="no" PromptToContinue="no" />
</Product>

<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder">
<Directory Id="OpenSkyFolder" Name="OpenSky">
<Directory Id="INSTALLFOLDER" Name="Agent.MSFS" />
<Directory Id="INSTALLFOLDER" Name="Flight Tracking Agent" />
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
Expand All @@ -39,14 +39,14 @@
</Fragment>

<Fragment>
<ComponentGroup Id="OpenSky.AgentMSFS" Directory="INSTALLFOLDER">
<ComponentGroup Id="OpenSky.Agent" Directory="INSTALLFOLDER">
<Component Guid="{C7192B21-EB14-435E-991E-CA1BD4D6D616}" Win64="yes">
<File Source="..\OpenSky.AgentMSFS\bin\$(var.Configuration)\OpenSky.AgentMSFS.exe" KeyPath="yes" Id="OpenSkyAgentExeFile">
<Shortcut Id="OpenSky.AgentMSFS.Shortcut" Directory="ApplicationProgramsFolder" WorkingDirectory="INSTALLFOLDER" Name="OpenSky Agent for MSFS" Icon="opensky.ico" Advertise="yes" />
<Shortcut Id="OpenSky.AgentMSFS.DeskShortcut" Directory="DesktopFolder" WorkingDirectory="INSTALLFOLDER" Name="OpenSky Agent for MSFS" Icon="opensky.ico" Advertise="yes" />
<File Source="..\OpenSky.Agent\bin\$(var.Configuration)\OpenSky.Agent.exe" KeyPath="yes" Id="OpenSkyAgentExeFile">
<Shortcut Id="OpenSky.Agent.Shortcut" Directory="ApplicationProgramsFolder" WorkingDirectory="INSTALLFOLDER" Name="OpenSky Flight Tracking Agent" Icon="opensky.ico" Advertise="yes" />
<Shortcut Id="OpenSky.Agent.DeskShortcut" Directory="DesktopFolder" WorkingDirectory="INSTALLFOLDER" Name="OpenSky Flight Tracking Agent" Icon="opensky.ico" Advertise="yes" />
</File>
<RegistryKey Root="HKCR" Key="opensky-agent-msfs">
<RegistryValue Type="string" Value="URL:opensky-agent-msfs" />
<RegistryKey Root="HKCR" Key="opensky-agent">
<RegistryValue Type="string" Value="URL:opensky-agent" />
<RegistryValue Type="string" Name="URL Protocol" Value="" />
<RegistryKey Key="shell\open\command">
<RegistryValue Type="string" Value="&quot;[#OpenSkyAgentExeFile]&quot; &quot;%1&quot;" />
Expand All @@ -55,7 +55,7 @@
<RemoveFolder Id="RemoveProgramMenuDir" Directory="ApplicationProgramsFolder" On="uninstall" />
</Component>
<Component Guid="{F58EF8AF-5D4E-4005-8D90-5A83F0D26CFF}" Win64="yes">
<File Source="..\OpenSky.AgentMSFS\bin\$(var.Configuration)\OpenSky.AgentMSFS.exe.config" KeyPath="yes" />
<File Source="..\OpenSky.Agent\bin\$(var.Configuration)\OpenSky.Agent.exe.config" KeyPath="yes" />
</Component>
<Component Guid="{388E5BC7-6F40-4E0A-A64F-32B80F1E14E5}" Win64="yes">
<File Source="..\changelog.txt" KeyPath="yes" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ClientEvents.cs" company="OpenSky">
// OpenSky project 2021
// OpenSky project 2021-2022
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace OpenSky.AgentMSFS.SimConnect.Enums
namespace OpenSky.Agent.SimConnectMSFS.Enums
{
/// -------------------------------------------------------------------------------------------------
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CrashSequence.cs" company="OpenSky">
// OpenSky project 2021
// OpenSky project 2021-2022
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace OpenSky.AgentMSFS.SimConnect.Enums
namespace OpenSky.Agent.SimConnectMSFS.Enums
{
/// -------------------------------------------------------------------------------------------------
/// <summary>
Expand Down
114 changes: 114 additions & 0 deletions OpenSky.Agent.SimConnectMSFS/OpenSky.Agent.SimConnectMSFS.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1F9CBEDE-669D-4510-BCA2-E6AD29D6A498}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenSky.Agent.SimConnectMSFS</RootNamespace>
<AssemblyName>OpenSky.Agent.SimConnectMSFS</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\OpenSky.Agent.SimConnectMSFS.xml</DocumentationFile>
<LangVersion>latest</LangVersion>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\OpenSky.Agent.SimConnectMSFS.xml</DocumentationFile>
<LangVersion>latest</LangVersion>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="CTrue.FsConnect, Version=1.3.3.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\CTrue.FsConnect.1.3.3\lib\net45\CTrue.FsConnect.dll</HintPath>
</Reference>
<Reference Include="JetBrains.Annotations, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\packages\JetBrains.Annotations.2021.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
</Reference>
<Reference Include="Microsoft.FlightSimulator.SimConnect, Version=11.0.62651.3, Culture=neutral, PublicKeyToken=baf445ffb3a06b5c, processorArchitecture=AMD64">
<HintPath>..\packages\CTrue.FsConnect.1.3.3\lib\net45\Microsoft.FlightSimulator.SimConnect.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Maps.MapControl.WPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Maps.MapControl.WPF.1.0.0.3\lib\net40-Client\Microsoft.Maps.MapControl.WPF.dll</HintPath>
</Reference>
<Reference Include="OpenSky.FlightLogXML, Version=0.1.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenSky.FlightLogXML.0.1.5\lib\net48\OpenSky.FlightLogXML.dll</HintPath>
</Reference>
<Reference Include="ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MSFT.ParallelExtensionsExtras.1.2.0\lib\ParallelExtensionsExtras.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Device" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Enums\ClientEvents.cs" />
<Compile Include="Enums\CrashSequence.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SimConnect.cs" />
<Compile Include="Structs\FuelTanks.cs" />
<Compile Include="Structs\LandingAnalysis.cs" />
<Compile Include="Structs\PayloadStations.cs" />
<Compile Include="Structs\AircraftIdentity.cs" />
<Compile Include="Structs\PlaneRegistry.cs" />
<Compile Include="Structs\PrimaryTracking.cs" />
<Compile Include="Structs\SecondaryTracking.cs" />
<Compile Include="Structs\SlewAircraftIntoPosition.cs" />
<Compile Include="Structs\WeightAndBalance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenSky.Agent.Simulator\OpenSky.Agent.Simulator.csproj">
<Project>{30c467e8-2eee-41e5-be01-0142a61ba171}</Project>
<Name>OpenSky.Agent.Simulator</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CTrue.FsConnect.1.3.3\build\CTrue.FsConnect.targets" Condition="Exists('..\packages\CTrue.FsConnect.1.3.3\build\CTrue.FsConnect.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\CTrue.FsConnect.1.3.3\build\CTrue.FsConnect.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CTrue.FsConnect.1.3.3\build\CTrue.FsConnect.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp100</s:String></wpf:ResourceDictionary>
21 changes: 21 additions & 0 deletions OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="OpenSky">
// OpenSky project 2021-2022
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("OpenSky.Agent.SimConnectMSFS")]
[assembly: AssemblyDescription("OpenSky Agent SimConnect Library for MSFS 2020")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("OpenSky")]
[assembly: AssemblyProduct("OpenSky")]
[assembly: AssemblyCopyright("OpenSky project 2021-2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("1f9cbede-669d-4510-bca2-e6ad29d6a498")]
[assembly: AssemblyVersion("0.4.0")]
[assembly: AssemblyFileVersion("0.4.0")]
Loading

0 comments on commit ca66332

Please sign in to comment.