diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c2b1d31..612e270 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 @@ -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/setup-dotnet@v4.0.0 with: - dotnet-version: ${{vars.DOTNET_VERSION}} + dotnet-version: ${{env.DOTNET_VERSION}} - name: Restore Solution run: dotnet restore ./FASTER.sln @@ -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/setup-dotnet@v4.0.0 + # 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 }}" \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fad935..3c7fa9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2ec42d8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "BytexDigital.Steam"] + path = BytexDigital.Steam + url = https://github.com/liamcannon/BytexDigital.Steam.git diff --git a/BytexDigital.Steam b/BytexDigital.Steam new file mode 160000 index 0000000..f7189ce --- /dev/null +++ b/BytexDigital.Steam @@ -0,0 +1 @@ +Subproject commit f7189ce7c2dc4dff0b7c0dd6181f9057c43c859f diff --git a/FASTER.sln b/FASTER.sln index 3b729fd..c858ee9 100644 --- a/FASTER.sln +++ b/FASTER.sln @@ -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 README.md = README.md @@ -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 @@ -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 diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj index 1bda8f1..c79a75a 100644 --- a/FASTER/FASTER.csproj +++ b/FASTER/FASTER.csproj @@ -1,7 +1,8 @@ WinExe - net8.0-windows + net9.0-windows + true enable enable true @@ -10,7 +11,7 @@ True FASTERKey.snk Keelah Fox, Jupster, Canno.n - 1.9.6.2 + 1.9.7.1 FoxliCorp. Fox's Arma Server Tool Extended Rewrite Copyright © 2019 @@ -18,7 +19,7 @@ README.md https://github.com/Foxlider/FASTER LICENSE - + true true true @@ -63,7 +64,6 @@ - @@ -75,4 +75,7 @@ + + + diff --git a/FASTER/ViewModel/ModsViewModel.cs b/FASTER/ViewModel/ModsViewModel.cs index 4070d03..f560b6e 100644 --- a/FASTER/ViewModel/ModsViewModel.cs +++ b/FASTER/ViewModel/ModsViewModel.cs @@ -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; } diff --git a/FASTERTests/FASTERTests.csproj b/FASTERTests/FASTERTests.csproj index e56945d..d5436c0 100644 --- a/FASTERTests/FASTERTests.csproj +++ b/FASTERTests/FASTERTests.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net9.0-windows false diff --git a/FASTER_Version.xml b/FASTER_Version.xml index 32b755b..7fd63a9 100644 --- a/FASTER_Version.xml +++ b/FASTER_Version.xml @@ -1,6 +1,6 @@  - 1.9.6.2 + 1.9.7.1 https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip https://github.com/Foxlider/FASTER/releases true diff --git a/global.json b/global.json new file mode 100644 index 0000000..20c2667 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "rollForward": "latestFeature", + "version": "9.0.0" + } +} \ No newline at end of file