Skip to content

Commit

Permalink
Merge pull request #62 from ScottyMac52/feature/sm-VariousFixes
Browse files Browse the repository at this point in the history 
Downgraded to .NET Framework 4.5.2
  • Loading branch information
@ScottyMac52
ScottyMac52 authored Aug 27, 2019
2 parents 329377a + 7a43db7 commit 4220c5b
Show file tree
Hide file tree
Showing 24 changed files with 704 additions and 804 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,6 @@
/CustomActions/bin/Debug
/CustomActions/obj/Debug
/Output
/CustomActions/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
/CustomActions/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
/CustomActions/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
3 changes: 2 additions & 1 deletion CustomActions/CustomActions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CustomActions</RootNamespace>
<AssemblyName>CustomActions</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
4 changes: 2 additions & 2 deletions CustomActions/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
1 change: 1 addition & 0 deletions CustomActions/obj/Release/CustomActions.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
634243085ea5700a2caf5634ff50fab8ab9b3b58
6 changes: 6 additions & 0 deletions CustomActions/obj/Release/CustomActions.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
C:\Users\Scott\Source\Repos\MFDisplay\Output\CustomActions.dll
C:\Users\Scott\Source\Repos\MFDisplay\Output\CustomActions.pdb
C:\Users\Scott\Source\Repos\MFDisplay\CustomActions\obj\Release\CustomActions.csprojAssemblyReference.cache
C:\Users\Scott\Source\Repos\MFDisplay\CustomActions\obj\Release\CustomActions.csproj.CoreCompileInputs.cache
C:\Users\Scott\Source\Repos\MFDisplay\CustomActions\obj\Release\CustomActions.dll
C:\Users\Scott\Source\Repos\MFDisplay\CustomActions\obj\Release\CustomActions.pdb
Binary file added CustomActions/obj/Release/CustomActions.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file added CustomActions/obj/Release/CustomActions.dll
View file
Binary file not shown.
Binary file added CustomActions/obj/Release/CustomActions.pdb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion MFDSettingsManager/Configuration/Collections/ConfigurationSectionCollectionBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected override bool OnDeserializeUnrecognizedAttribute(string name, string v
/// <returns></returns>
protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader)
{
Logger?.Error($"Unrecognized element named: {elementName} location: {ElementInformation.Source}");
Logger?.Warn($"Unrecognized element named: {elementName} location: {ElementInformation.Source} line number: {ElementInformation.LineNumber}");
return base.OnDeserializeUnrecognizedElement(elementName, reader);
}

Expand Down
3 changes: 2 additions & 1 deletion MFDSettingsManager/MFDSettingsManager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MFDSettingsManager</RootNamespace>
<AssemblyName>MFDSettingsManager</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
4 changes: 2 additions & 2 deletions MFDSettingsManager/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,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("2.6.2.0")]
[assembly: AssemblyFileVersion("2.6.2.0")]
[assembly: AssemblyVersion("2.6.3.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
4 changes: 2 additions & 2 deletions MFDisplay/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section name="MFDSettings" type="MFDSettingsManager.Configuration.MFDConfigurationSection, MFDSettingsManager" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>

<log4net>
Expand All @@ -19,7 +19,7 @@

<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
<file value="${APPDATA}\Vyper Industries\MFD4CTS\status.log" />
<threshold value="Info" />
<threshold value="Warn" />
<appendToFile value="true" />
<maximumFileSize value="100MB" />
<maxSizeRollBackups value="10" />
Expand Down
2 changes: 1 addition & 1 deletion MFDisplay/AuxWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:MFDisplay"
mc:Ignorable="d"
Title="MFD" Name="auxWindow" BorderThickness="0" Topmost="True" Loaded="Window_Loaded" Closed="Window_Closed" ResizeMode="NoResize" WindowStyle="None" ShowInTaskbar="False" Opacity="0" AllowsTransparency="True">
Title="MFD" Name="auxWindow" BorderThickness="0" Topmost="True" Loaded="Window_Loaded" Closing="AuxWindow_Closing" Closed="Window_Closed" ResizeMode="NoResize" WindowStyle="None" ShowInTaskbar="False" Opacity="0" AllowsTransparency="True">
<Grid>
<Image x:Name="imgMain" StretchDirection="Both" Stretch="Fill" />
<Image x:Name="imgInsert" />
Expand Down
5 changes: 5 additions & 0 deletions MFDisplay/AuxWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,10 @@ private void Window_Closed(object sender, EventArgs e)
{
Logger?.Info($"Window Is Closed -> {Configuration.Name}.");
}

private void AuxWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
imgMain = null;
}
}
}
10 changes: 5 additions & 5 deletions MFDisplay/MFDisplay.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>MFDisplay</RootNamespace>
<AssemblyName>MFD4CTS</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -88,7 +88,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.4.0.0.1\lib\PresentationCore.dll</HintPath>
Expand Down Expand Up @@ -308,6 +308,7 @@
<None Include="MFDisplay_TemporaryKey.pfx" />
<Content Include="mfdsettings.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<None Include="packages.config">
<SubType>Designer</SubType>
Expand All @@ -318,10 +319,9 @@
</None>
</ItemGroup>
<ItemGroup>
<Content Include="App.config">
<None Include="App.config">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</None>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
Expand Down
2 changes: 1 addition & 1 deletion MFDisplay/MFDisplay.csproj.user
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<EnableSecurityDebugging>false</EnableSecurityDebugging>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>-mod F-14R -submod SPL</StartArguments>
<StartArguments>-mod F-14RHV -submod TGT</StartArguments>
</PropertyGroup>
</Project>
20 changes: 15 additions & 5 deletions MFDisplay/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,28 @@ private void ClearCache_Click(object sender, RoutedEventArgs e)
DestroyWindows();
var cacheFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), $"Vyper Industries\\MFD4CTS\\cache\\");
var cacheParent = new DirectoryInfo(cacheFolder);
var fileList = cacheParent.EnumerateFiles("*.png", SearchOption.AllDirectories).ToList();
fileList.ForEach((file) =>
var fileList = cacheParent?.EnumerateFiles("*.png", SearchOption.AllDirectories).ToList();
fileList?.ForEach((file) =>
{
try
{
File.Delete(file.FullName);
file?.Delete();
}
catch (Exception)
catch (Exception ex)
{
Logger.Warn($"Unable to delete cache file: {file.FullName}");
Logger.Error($"Unable to delete cache file: {file.FullName}", ex);
}
});
try
{
cacheParent?.Delete(true);

}
catch (Exception dex)
{

Logger.Error($"Unable to delete cache directory: {cacheFolder}", dex);
}
CreateWindows();
}
}
Expand Down
6 changes: 4 additions & 2 deletions MFDisplay/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
// 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.6.2.0")]
[assembly: AssemblyFileVersion("2.6.2.0")]
[assembly: AssemblyVersion("2.6.3.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: Guid("FE237DCB-D0D2-477C-BCC0-6004B30B0D9E")]

34 changes: 19 additions & 15 deletions MFDisplay/mfdsettings.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath
</add>
<add moduleName="F-86" displayName="F-86F Sabre" filename="F-86\DCS F86 MFD.jpg">
<Configurations>
<add name="WHKEY" filename="F-86\DCS F86 WH.jpg" />
<add name="WHKEY" filename="F-86\DCS F-86 WH.jpg" />
</Configurations>
</add>
<add moduleName="F-86HV" displayName="F-86F Sabre Hi Viz" filename="_High Contrast MFDs\DCS F86 MFD HiVis.jpg">
<Configurations>
<add name="WHKEY" filename="F86\DCS F86 WH.jpg" />
<add name="WHKEY" filename="F-86\DCS F-86 WH.jpg" />
</Configurations>
</add>
<add moduleName="F-14P" displayName="F-14 Tomcat (Pilot)" filename="F-14\DCS F14Plt MFD.jpg">
Expand All @@ -177,12 +177,12 @@ xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath
<Configurations>
<add name="LMFD">
<SubConfigurations>
<add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="448" />
<add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="448" />
<add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="448" />
<add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="448" />
<add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="448" />
<add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="448" />
<add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="430" />
<add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="430" />
<add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="430" />
<add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="430" />
<add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="430" />
<add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="430" />
</SubConfigurations>
</add>
<add name="WHKEY" filename="F-14\DCS F14RIO WH.jpg"/>
Expand All @@ -198,12 +198,12 @@ xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath
<add name="WHKEY" filename="F-14\DCS F14RIO WH.jpg" />
<add name="LMFD">
<SubConfigurations>
<add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="448" />
<add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="448" />
<add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="448" />
<add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="448" />
<add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="448" />
<add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="448" />
<add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="430" />
<add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="430" />
<add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="430" />
<add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="430" />
<add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="430" />
<add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="430" />
</SubConfigurations>
</add>
</Configurations>
Expand Down Expand Up @@ -431,5 +431,9 @@ xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath
<add name="WHJOYSTICK" opacity=".8" width="750" height="600" left="3310" top="0" xOffsetStart="0" xOffsetFinish="1051" yOffsetStart="0" yOffsetFinish="743" filename="BMSFalcon-F-16\FalconBMS_Warthog_Joystick_V2.png" />
</Configurations>
</add>
</Modules>
<add moduleName="IL-2_BoS" displayName="IL-2 Sturmovik: Battle of Stalingrad" filename="IL-2\IL2GB MFD.jpg">
<Configurations>
<add name="WHKEY" filename="IL-2\IL2GB WH.jpg" />
</Configurations>
</add> </Modules>
</MFDSettings>
Loading

0 comments on commit 4220c5b

Please sign in to comment.