Skip to content
This repository has been archived by the owner on Oct 6, 2024. It is now read-only.

Commit

Permalink
various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdahlblom
jdahlblom committed Feb 27, 2024
1 parent 200e7f2 commit e06c6b6
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# uses a compiled language

- run: |
dotnet build src/BIOSBuddy/BIOSBuddy.csproj /p:EnableWindowsTargeting=true --self-contained false -f net6.0-windows -r win-x64 -c Release /p:DebugType=None /p:DebugSymbols=false
dotnet build src/BIOSBuddy/BIOSBuddy.csproj /p:EnableWindowsTargeting=true --self-contained false -f net8.0-windows -r win-x64 -c Release /p:DebugType=None /p:DebugSymbols=false
# make bootstrap
# make release

Expand Down
2 changes: 1 addition & 1 deletion BIOSBuddy.sln → src/BIOSBuddy.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34607.119
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BIOSBuddy", "src\BIOSBuddy\BIOSBuddy.csproj", "{F13BEB47-88EC-40AF-B71C-6E90EF134656}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BIOSBuddy", "BIOSBuddy\BIOSBuddy.csproj", "{F13BEB47-88EC-40AF-B71C-6E90EF134656}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
158 changes: 80 additions & 78 deletions src/BIOSBuddy/BIOSBuddy.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,82 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Nullable>disable</Nullable>
<UseWPF>true</UseWPF>
<AssemblyName>BIOSBuddy</AssemblyName>
<PackageIcon>FlightPanels01.png</PackageIcon>
<ApplicationIcon>Images\BIOSBuddy.ico</ApplicationIcon>
<PackageProjectUrl>https://github.com/DCS-Skunkworks/BIOSBuddy</PackageProjectUrl>
<Description>DCS-BIOS Buddy</Description>
<Company>DCS-Skunkworks</Company>
<AssemblyVersion>1.15.10</AssemblyVersion>
<StartupObject>BIOSBuddy.App</StartupObject>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<SelfContained>false</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<None Remove="dcs-bios_modules.txt" />
<None Remove="Images\112_RefreshArrow_Green_32x32_72.png" />
<None Remove="Images\arduino_logo_simple.png" />
<None Remove="Images\clear_search_result.png" />
<None Remove="Images\FlightPanels01.png" />
<None Remove="Images\FlightPanels01_128.png" />
<None Remove="Images\flightpanels02_8Rc_icon.ico" />
<None Remove="Images\gear-image.png" />
<None Remove="Images\search_controls.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Images\BIOSBuddy.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.8" />
</ItemGroup>
<ItemGroup>
<Content Include="dcs-bios_modules.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Resource Include="Images\112_RefreshArrow_Green_32x32_72.png" />
<Resource Include="Images\clear_search_result.png" />
<Resource Include="Images\FlightPanels01.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</Resource>
<Resource Include="Images\FlightPanels01_128.png" />
<Resource Include="Images\gear-image.png" />
<Resource Include="Images\search_controls.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="dll\" />
</ItemGroup>
<ItemGroup>
<Reference Include="ClassLibraryCommon">
<HintPath>dll\ClassLibraryCommon.dll</HintPath>
</Reference>
<Reference Include="DCS-BIOS">
<HintPath>dll\DCS-BIOS.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup>
<AssemblyVersion>1.0.3</AssemblyVersion>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<AssemblyName>BIOSBuddy</AssemblyName>
<PackageIcon>FlightPanels01.png</PackageIcon>
<ApplicationIcon>Images\BIOSBuddy.ico</ApplicationIcon>
<PackageProjectUrl>https://github.com/DCS-Skunkworks/BIOSBuddy</PackageProjectUrl>
<Description>DCS-BIOS Buddy</Description>
<Company>DCS-Skunkworks</Company>
<StartupObject>BIOSBuddy.App</StartupObject>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<SelfContained>false</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<NeutralLanguage>en-US</NeutralLanguage>
<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
</PropertyGroup>
<ItemGroup>
<None Remove="dcs-bios_modules.txt" />
<None Remove="Images\112_RefreshArrow_Green_32x32_72.png" />
<None Remove="Images\arduino_logo_simple.png" />
<None Remove="Images\clear_search_result.png" />
<None Remove="Images\FlightPanels01.png" />
<None Remove="Images\FlightPanels01_128.png" />
<None Remove="Images\flightpanels02_8Rc_icon.ico" />
<None Remove="Images\gear-image.png" />
<None Remove="Images\search_controls.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Images\BIOSBuddy.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.8" />
</ItemGroup>
<ItemGroup>
<Content Include="dcs-bios_modules.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Resource Include="Images\112_RefreshArrow_Green_32x32_72.png" />
<Resource Include="Images\clear_search_result.png" />
<Resource Include="Images\FlightPanels01.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</Resource>
<Resource Include="Images\FlightPanels01_128.png" />
<Resource Include="Images\gear-image.png" />
<Resource Include="Images\search_controls.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="dll\" />
</ItemGroup>
<ItemGroup>
<Reference Include="ClassLibraryCommon">
<HintPath>dll\ClassLibraryCommon.dll</HintPath>
</Reference>
<Reference Include="DCS-BIOS">
<HintPath>dll\DCS-BIOS.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion src/BIOSBuddy/Windows/SettingsWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Net;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Navigation;
Expand Down
35 changes: 10 additions & 25 deletions src/PublishReleaseBuddy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@ else
$xml.Project.PropertyGroup.AssemblyVersion = "$avMajor.$avMinor.$avPatch".Trim()
[string]$assemblyVersion = $xml.Project.PropertyGroup.AssemblyVersion
Write-Host "New assembly version is $assemblyVersion" -foregroundcolor "Green"
#Saving project file
$xml.Save($projectFilePath)
Write-Host "Project file updated" -foregroundcolor "Green"
Write-Host "Finished release version management" -foregroundcolor "Green"

#---------------------------------
# Tests execution For DCSFP
# Tests execution For BIOSBuddy
#---------------------------------
Write-Host "Starting tests execution for DCSFP" -foregroundcolor "Green"
<#Write-Host "Starting tests execution for BIOSBuddy" -foregroundcolor "Green"
$testPath = $scriptPath + "\Tests"
Set-Location -Path $testPath
dotnet test
Expand All @@ -64,27 +68,8 @@ if ( 0 -ne $testsLastExitCode ) {
Write-Host "Fatal error. Some unit tests failed." -foregroundcolor "Red"
exit
}
Write-Host "Finished tests execution for DCSFP" -foregroundcolor "Green"

#------------------------------------
# Tests execution For StreamDeckSharp
#------------------------------------
Write-Host "Starting tests execution for StreamDeckSharp" -foregroundcolor "Green"
$testPath = $scriptPath + "\StreamDeckSharp.Tests"
Set-Location -Path $testPath
dotnet test
$testsLastExitCode = $LastExitCode
Write-Host "Tests LastExitCode: $testsLastExitCode" -foregroundcolor "Green"
if ( 0 -ne $testsLastExitCode ) {
Write-Host "Fatal error. Some unit tests failed." -foregroundcolor "Red"
exit
}
Write-Host "Finished tests execution for StreamDeckSharp" -foregroundcolor "Green"

#Saving project file
$xml.Save($projectFilePath)
Write-Host "Project file updated" -foregroundcolor "Green"
Write-Host "Finished release version management" -foregroundcolor "Green"
Write-Host "Finished tests execution for BIOSBuddy" -foregroundcolor "Green"
#>

#---------------------------------
# Publish-Build & Zip
Expand All @@ -101,8 +86,8 @@ Write-Host "Starting Publish" -foregroundcolor "Green"
Set-Location -Path $scriptPath

Write-Host "Starting Publish BIOSBuddy" -foregroundcolor "Green"
dotnet publish BIOSBuddy\BIOSBuddy.csproj --self-contained false -f net6.0-windows -r win-x64 -c Release -o $publishPath /p:DebugType=None /p:DebugSymbols=false
#dotnet publish BIOSBuddy\BIOSBuddy.csproj -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true --self-contained false -f net6.0-windows -r win-x64 -c Release -o $publishPath /p:DebugType=None /p:DebugSymbols=false
dotnet publish BIOSBuddy\BIOSBuddy.csproj --self-contained false -f net8.0-windows -r win-x64 -c Release -o $publishPath /p:DebugType=None /p:DebugSymbols=false

$buildLastExitCode = $LastExitCode

Write-Host "Build ControlRef LastExitCode: $buildLastExitCode" -foregroundcolor "Green"
Expand Down

0 comments on commit e06c6b6

Please sign in to comment.