Skip to content

Feature/update 1.9 #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jupster merged 5 commits into from
Jul 25, 2025
Merged

Feature/update 1.9 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f42fbb
Merge pull request #199 from Foxlider/master
jupster Sep 30, 2024
b3ca43e
Merge branch 'master' into feature/Update-1.9
jupster Jul 17, 2025
64cdfbe
Update version and clarify menu labels (#234)
jupster Jul 17, 2025
ebdb2c5
Update MainWindow.xaml (#227)
Prodigyfly Jul 17, 2025
bf11c6e
Hotfix/Code clean, .Net8 , Workflow, (#243)
jupster Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,22 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: true
submodules: recursive
token: ${{ secrets.GITHUB_TOKEN }}

- name: Init & update submodules
run: git submodule update --init --recursive

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4.0.0
with:
dotnet-version: ${{env.DOTNET_VERSION}}

- name: Restore Solution
run: dotnet restore ./FASTER.sln

Expand Down
1 change: 1 addition & 0 deletions FASTER/FASTER - Backup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
Expand Down
112 changes: 56 additions & 56 deletions FASTER/FASTER.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\FASTER.ico</ApplicationIcon>
<ApplicationManifest>Properties\FASTER.manifest</ApplicationManifest>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
<Version>1.9.7.1</Version>
<Company>FoxliCorp.</Company>
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
<Copyright>Copyright © 2019</Copyright>
<PackageProjectUrl>https://github.com/Foxlider/FASTER</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/Foxlider/FASTER</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>

<PublishReadyToRun>true</PublishReadyToRun>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<PublishReadyToRunComposite>false</PublishReadyToRunComposite>
</PropertyGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\FASTER.ico</ApplicationIcon>
<ApplicationManifest>Properties\FASTER.manifest</ApplicationManifest>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
<Version>1.9.7.2</Version>
<Company>FoxliCorp.</Company>
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
<Copyright>Copyright © 2019</Copyright>
<PackageProjectUrl>https://github.com/Foxlider/FASTER</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/Foxlider/FASTER</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>

<PublishReadyToRun>true</PublishReadyToRun>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<PublishReadyToRunComposite>false</PublishReadyToRunComposite>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>portable</DebugType>
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>portable</DebugType>
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
</PropertyGroup>

<ItemGroup>
<Resource Include="Resources\FASTER.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<SplashScreen Include="Resources\FasterSplash.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
</PropertyGroup>

<ItemGroup>
<Resource Include="Resources\FASTER.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<SplashScreen Include="Resources\FasterSplash.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Remove="Resources\FASTER.ico" />
<None Remove="Resources\FasterSplash.png" />
</ItemGroup>
Expand Down
30 changes: 14 additions & 16 deletions FASTER/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mah:MetroWindow
<mah:MetroWindow
x:Class="FASTER.MainWindow"

xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down Expand Up @@ -42,17 +42,17 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"/>
Copy link
Collaborator Author

@jupster jupster Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will Fix this but not a priority check 227 for why i want it changed

<RowDefinition/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

<!--Menu Column - Main Items-->
<StackPanel Grid.Row="0" TextElement.FontSize="13">
<StackPanel.Effect>
<DropShadowEffect BlurRadius="5" RenderingBias="Performance" ShadowDepth="0"/>
</StackPanel.Effect>
<Label Content="Main" Margin="10,10,0,0" FontWeight="Bold"/>
<Label Content="Main" Margin="10,10,0,0" FontWeight="Bold"/>
<ListBox Name="IMainMenuItems" HorizontalAlignment="Stretch">
<ToggleButton Name="navSteamUpdater" Style="{StaticResource MahApps.Styles.ToggleButton.WindowCommands}" Click="ToggleButton_Click">
<DockPanel Width="180">
Expand Down Expand Up @@ -82,17 +82,16 @@
</StackPanel>

<!--Menu Column - Server Profiles-->
<StackPanel Grid.Row="1">
<StackPanel.Effect>
<DropShadowEffect BlurRadius="5" RenderingBias="Performance" ShadowDepth="0"/>
</StackPanel.Effect>
<Separator />
<!--<ListBoxItem Margin="2,5" Style="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuSeparator}"/>-->
<DockPanel>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="0">
<Label Content="Server Profiles" DockPanel.Dock="Left" Margin="10,5" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<Button HorizontalAlignment="Right" Margin="10,0" Click="INewServerProfileButton_Click" Content="{iconPacks:Modern Kind=Add}" Name="INewServerProfileButton" Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0" Height="25" Width="25" VerticalAlignment="Center" Padding="0"/>
</DockPanel>
<ListBox Name="IServerProfilesMenu" HorizontalAlignment="Stretch" Margin="0,0,0,2" ScrollViewer.VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
<ListBox Grid.Row="1" Name="IServerProfilesMenu" HorizontalAlignment="Stretch" Margin="0,0,0,2" ScrollViewer.VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
<ListBox.Resources>
<ContextMenu x:Key="ProfileContextMenu">
<MenuItem Header="Clone" Click="MenuItemClone_Click">
Expand All @@ -115,15 +114,14 @@
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</StackPanel>
</Grid>

<!--Menu Column - Other Items-->
<StackPanel Grid.Row="2" TextElement.FontSize="13">
<StackPanel.Effect>
<DropShadowEffect BlurRadius="5" RenderingBias="Performance" ShadowDepth="0"/>
</StackPanel.Effect>
<Separator/>
<!--<ListBoxItem Margin="2,5" Style="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuSeparator}"/>-->
<Label Content="Other" Margin="10,5" FontWeight="Bold"/>
<ListBox Name="IOtherMenuItems" HorizontalAlignment="Stretch" Margin="0,1">
<ToggleButton Name="navSettings" Style="{StaticResource MahApps.Styles.ToggleButton.WindowCommands}" Click="ToggleButton_Click">
Expand Down Expand Up @@ -240,4 +238,4 @@
<Label Name="IFlyoutMessage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Content="TEXT"/>
</mah:Flyout>
</Grid>
</mah:MetroWindow>
</mah:MetroWindow>
12 changes: 6 additions & 6 deletions FASTER/Views/Profile.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<iconPacks:PackIconModern Kind="CheckmarkUncrossed" Margin="5"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="Server Only" Header="Copy From Client" Click="CopyFromClient">
<MenuItem Tag="Server Only" Header="Copy From Server + Client" Click="CopyFromClient">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy" Margin="5"/>
</MenuItem.Icon>
Expand All @@ -170,7 +170,7 @@
<iconPacks:PackIconModern Kind="CheckmarkUncrossed"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="Server + Client" Header="Copy From Server" Click="CopyFromServer">
<MenuItem Tag="Server + Client" Header="Copy From Server Only" Click="CopyFromServer">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy"/>
</MenuItem.Icon>
Expand All @@ -197,12 +197,12 @@
<iconPacks:PackIconModern Kind="CheckmarkUncrossed"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="HC" Header="Copy From Server" Click="CopyFromServer">
<MenuItem Tag="HC" Header="Copy From Server Only" Click="CopyFromServer">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="HC" Header="Copy From Client" Click="CopyFromClient">
<MenuItem Tag="HC" Header="Copy From Server + Client" Click="CopyFromClient">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy"/>
</MenuItem.Icon>
Expand All @@ -224,12 +224,12 @@
<iconPacks:PackIconModern Kind="CheckmarkUncrossed"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="Opt" Header="Copy From Server" Click="CopyFromServer">
<MenuItem Tag="Opt" Header="Copy From Server Only" Click="CopyFromServer">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Tag="Opt" Header="Copy From Client" Click="CopyFromClient">
<MenuItem Tag="Opt" Header="Copy From Server + Client" Click="CopyFromClient">
<MenuItem.Icon>
<iconPacks:PackIconModern Kind="PageCopy"/>
</MenuItem.Icon>
Expand Down
3 changes: 2 additions & 1 deletion FASTERTests/FASTERTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion FASTER_Version.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.9.7.1</version>
<version>1.9.7.2</version>
<url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
<changelog>https://github.com/Foxlider/FASTER/releases</changelog>
<mandatory>true</mandatory>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "9.0.0"
"version": "8.0.0"
}
}
Loading