Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
127 changes: 68 additions & 59 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ on:
jobs:
analyzeQL:
name: Analyze with CodeQL
# runs-on: [windows-latest] # may cause Out of Memory errors
runs-on: [self-hosted]
environment: Dev
runs-on: [windows-latest]
# runs-on: [self-hosted]

permissions:
# required for all workflows
Expand All @@ -31,17 +32,18 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: true

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


- name: Setup .NET Core SDK
uses: actions/[email protected]
with:
dotnet-version: ${{vars.DOTNET_VERSION}}
dotnet-version: ${{env.DOTNET_VERSION}}

- name: Restore Solution
run: dotnet restore ./FASTER.sln
Expand All @@ -55,67 +57,74 @@ jobs:
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3

AnalysisSonar:
name: Analyze with SonarCloud
runs-on: windows-latest
permissions:
pull-requests: write # allows SonarCloud to decorate PRs with analysis results
## SONAR is now auto-analysing the project and the PRs
# AnalysisSonar:
# name: Analyze with SonarCloud
# runs-on: windows-latest
# permissions:
# pull-requests: write # allows SonarCloud to decorate PRs with analysis results

# steps: # DOES NOT SCAN FOR SOME REASON ?
# - name: Analyze with SonarCloud
# # steps: # DOES NOT SCAN FOR SOME REASON ?
# # - name: Analyze with SonarCloud

# # You can pin the exact commit or the version.
# uses: SonarSource/sonarcloud-github-action@v3
# env:
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# with:
# # Additional arguments for the SonarScanner CLI
# args:
# -Dsonar.projectKey=Foxlider_FASTER
# -Dsonar.organization=foxlicorp
# projectBaseDir: .
# # # You can pin the exact commit or the version.
# # uses: SonarSource/sonarcloud-github-action@v3
# # env:
# # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# # with:
# # # Additional arguments for the SonarScanner CLI
# # args:
# # -Dsonar.projectKey=Foxlider_FASTER
# # -Dsonar.organization=foxlicorp
# # projectBaseDir: .


steps:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'zulu' # Alternative distribution options are available.

- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
# steps:
# - name: Set up JDK 17
# uses: actions/setup-java@v4
# with:
# java-version: 17
# distribution: 'zulu' # Alternative distribution options are available.

- name: Cache SonarCloud packages
uses: actions/cache@v4
with:
path: ~\sonar\cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
# - uses: actions/checkout@v4
# with:
# submodules: true
# fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

# - name: Setup .NET Core SDK
# uses: actions/[email protected]
# with:
# dotnet-version: ${{env.DOTNET_VERSION}}

# - name: Cache SonarCloud packages
# uses: actions/cache@v4
# with:
# path: ~\sonar\cache
# key: ${{ runner.os }}-sonar
# restore-keys: ${{ runner.os }}-sonar

- name: Cache SonarCloud scanner
id: cache-sonar-scanner
uses: actions/cache@v4
with:
path: .\.sonar\scanner
key: ${{ runner.os }}-sonar-scanner
restore-keys: ${{ runner.os }}-sonar-scanner
# - name: Cache SonarCloud scanner
# id: cache-sonar-scanner
# uses: actions/cache@v4
# with:
# path: .\.sonar\scanner
# key: ${{ runner.os }}-sonar-scanner
# restore-keys: ${{ runner.os }}-sonar-scanner

- name: Install SonarCloud scanner
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
shell: pwsh
run: |
New-Item -Path .\.sonar\scanner -ItemType Directory
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
# - name: Install SonarCloud scanner
# if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
# shell: pwsh
# run: |
# New-Item -Path .\.sonar\scanner -ItemType Directory
# dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner

- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.PR_DECORATION }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
shell: pwsh
run: |
.\.sonar\scanner\dotnet-sonarscanner begin /k:"Foxlider_FASTER" /o:"foxlicorp" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
dotnet build
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
# - name: Build and analyze
# env:
# GITHUB_TOKEN: ${{ secrets.PR_DECORATION }} # Needed to get PR information, if any
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# shell: pwsh
# run: |
# .\.sonar\scanner\dotnet-sonarscanner begin /k:"Foxlider_FASTER" /o:"foxlicorp" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
# dotnet build
# .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{vars.DOTNET_VERSION}}
dotnet-version: ${{env.DOTNET_VERSION}}

# Execute all unit tests in the solution
- name: Execute unit tests
Expand Down Expand Up @@ -91,6 +93,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0 # required for tags history processing

- name: Download x64 artifact
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "BytexDigital.Steam"]
path = BytexDigital.Steam
url = https://github.com/liamcannon/BytexDigital.Steam.git
1 change: 1 addition & 0 deletions BytexDigital.Steam
Submodule BytexDigital.Steam added at f7189c
7 changes: 7 additions & 0 deletions FASTER.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
azure-pipelines.yml = azure-pipelines.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
FASTER_Version.xml = FASTER_Version.xml
global.json = global.json
NuGet.Config = NuGet.Config
.github\workflows\publish.yml = .github\workflows\publish.yml
Copy link
Owner

Choose a reason for hiding this comment

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

WHy removing those from the SLN ?

Copy link
Contributor Author

@liamcannon liamcannon Jul 16, 2025

Choose a reason for hiding this comment

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

bro idk, my vs on my desktop fucks with git all the time.

Copy link
Owner

Choose a reason for hiding this comment

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

No worries, I put it back :p

README.md = README.md
Expand All @@ -22,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FASTERTests", "FASTERTests\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FASTER Maintenance", "FASTER Maintenance\FASTER Maintenance.csproj", "{465FB100-A08C-4E4F-A321-EC85C5C177B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BytexDigital.Steam", "BytexDigital.Steam\BytexDigital.Steam\BytexDigital.Steam.csproj", "{22F5B346-B3B2-302D-9D68-35A2DFCE2081}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -38,6 +41,10 @@ Global
{65FDF864-BF9B-414A-A6E6-3473BCFB62BE}.Release|Any CPU.Build.0 = Release|Any CPU
{465FB100-A08C-4E4F-A321-EC85C5C177B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{465FB100-A08C-4E4F-A321-EC85C5C177B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22F5B346-B3B2-302D-9D68-35A2DFCE2081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22F5B346-B3B2-302D-9D68-35A2DFCE2081}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22F5B346-B3B2-302D-9D68-35A2DFCE2081}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22F5B346-B3B2-302D-9D68-35A2DFCE2081}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
11 changes: 7 additions & 4 deletions FASTER/FASTER.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
Expand All @@ -10,15 +11,15 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
<Version>1.9.6.2</Version>
<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>
Expand Down Expand Up @@ -63,7 +64,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageReference Include="BytexDigital.Steam" Version="0.8.6-preview.1728774783" />
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
Expand All @@ -75,4 +75,7 @@
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BytexDigital.Steam\BytexDigital.Steam\BytexDigital.Steam.csproj" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion FASTER/ViewModel/ModsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ namespace FASTER.ViewModel
public class ModsViewModel
{
public ModsViewModel()
{ ModsCollection = Properties.Settings.Default.armaMods ?? new ArmaModCollection(); }
{
ModsCollection = Properties.Settings.Default.armaMods ?? new ArmaModCollection();
}

public ArmaModCollection ModsCollection { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion FASTERTests/FASTERTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion FASTER_Version.xml
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.6.2</version>
<version>1.9.7.1</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
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "9.0.0"
}
}
Loading