Skip to content

Commit bf11c6e

Browse files
jupsterjupster
authored
Hotfix/Code clean, .Net8 , Workflow, (#243)
* Drop to .NET 8 and bump version to 1.9.7.2 * Clean code * Changed target framework from net9.0-windows to net8.0-windows in both FASTER and FASTERTests projects. Updated version to 1.9.7.2 in project and version files to reflect the framework change. *Added <EnableWindowsTargeting>true</EnableWindowsTargeting> to make Actions happy even though it isn't needed for net8 :shurg: *Changed the checkout step in the CodeQL workflow to use 'submodules: recursive' and added a token for authentication. This ensures all nested submodules are checked out and authenticated properly. * The SDK version specified in global.json has been changed from 9.0.0 to 8.0.0, to ensure compatibility with projects or tooling that require .NET 8.0.0.
1 parent ebdb2c5 commit bf11c6e

6 files changed

Lines changed: 68 additions & 62 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,22 @@ jobs:
3333
- name: Checkout repository
3434
uses: actions/checkout@v4
3535
with:
36-
submodules: true
36+
submodules: recursive
37+
token: ${{ secrets.GITHUB_TOKEN }}
38+
39+
- name: Init & update submodules
40+
run: git submodule update --init --recursive
3741

3842
- name: Initialize CodeQL
3943
uses: github/codeql-action/init@v3
4044
with:
4145
languages: ${{ matrix.language }}
42-
46+
4347
- name: Setup .NET Core SDK
4448
uses: actions/setup-dotnet@v4.0.0
4549
with:
4650
dotnet-version: ${{env.DOTNET_VERSION}}
47-
51+
4852
- name: Restore Solution
4953
run: dotnet restore ./FASTER.sln
5054

‎FASTER/FASTER - Backup.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net6.0-windows</TargetFramework>
5+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
56
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>
67
<PublishReadyToRun>true</PublishReadyToRun>
78
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

‎FASTER/FASTER.csproj‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net9.0-windows</TargetFramework>
5-
<EnableWindowsTargeting>true</EnableWindowsTargeting>
6-
<Nullable>enable</Nullable>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<UseWPF>true</UseWPF>
9-
<ApplicationIcon>Resources\FASTER.ico</ApplicationIcon>
10-
<ApplicationManifest>Properties\FASTER.manifest</ApplicationManifest>
11-
<SignAssembly>True</SignAssembly>
12-
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
13-
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
14-
<Version>1.9.7.1</Version>
15-
<Company>FoxliCorp.</Company>
16-
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
17-
<Copyright>Copyright © 2019</Copyright>
18-
<PackageProjectUrl>https://github.com/Foxlider/FASTER</PackageProjectUrl>
19-
<PackageReadmeFile>README.md</PackageReadmeFile>
20-
<RepositoryUrl>https://github.com/Foxlider/FASTER</RepositoryUrl>
21-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22-
23-
<PublishReadyToRun>true</PublishReadyToRun>
24-
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
25-
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
26-
<PublishReadyToRunComposite>false</PublishReadyToRunComposite>
27-
</PropertyGroup>
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<TargetFramework>net8.0-windows</TargetFramework>
5+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<UseWPF>true</UseWPF>
9+
<ApplicationIcon>Resources\FASTER.ico</ApplicationIcon>
10+
<ApplicationManifest>Properties\FASTER.manifest</ApplicationManifest>
11+
<SignAssembly>True</SignAssembly>
12+
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
13+
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
14+
<Version>1.9.7.2</Version>
15+
<Company>FoxliCorp.</Company>
16+
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
17+
<Copyright>Copyright © 2019</Copyright>
18+
<PackageProjectUrl>https://github.com/Foxlider/FASTER</PackageProjectUrl>
19+
<PackageReadmeFile>README.md</PackageReadmeFile>
20+
<RepositoryUrl>https://github.com/Foxlider/FASTER</RepositoryUrl>
21+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2822

23+
<PublishReadyToRun>true</PublishReadyToRun>
24+
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
25+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
26+
<PublishReadyToRunComposite>false</PublishReadyToRunComposite>
27+
</PropertyGroup>
2928

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

35-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
36-
<DebugType>none</DebugType>
37-
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
38-
</PropertyGroup>
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
31+
<DebugType>portable</DebugType>
32+
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
33+
</PropertyGroup>
3934

40-
<ItemGroup>
41-
<Resource Include="Resources\FASTER.ico">
42-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43-
</Resource>
44-
</ItemGroup>
45-
<ItemGroup>
46-
<SplashScreen Include="Resources\FasterSplash.png" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Compile Update="Properties\Settings.Designer.cs">
50-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
51-
<AutoGen>True</AutoGen>
52-
<DependentUpon>Settings.settings</DependentUpon>
53-
</Compile>
54-
</ItemGroup>
55-
<ItemGroup>
56-
<None Update="Properties\Settings.settings">
57-
<Generator>SettingsSingleFileGenerator</Generator>
58-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
59-
</None>
60-
</ItemGroup>
61-
<ItemGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
36+
<DebugType>none</DebugType>
37+
<NoWarn>1701;1702;NU1701;CS8002;CS8618;CS8622</NoWarn>
38+
</PropertyGroup>
39+
40+
<ItemGroup>
41+
<Resource Include="Resources\FASTER.ico">
42+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
</Resource>
44+
</ItemGroup>
45+
<ItemGroup>
46+
<SplashScreen Include="Resources\FasterSplash.png" />
47+
</ItemGroup>
48+
<ItemGroup>
49+
<Compile Update="Properties\Settings.Designer.cs">
50+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
51+
<AutoGen>True</AutoGen>
52+
<DependentUpon>Settings.settings</DependentUpon>
53+
</Compile>
54+
</ItemGroup>
55+
<ItemGroup>
56+
<None Update="Properties\Settings.settings">
57+
<Generator>SettingsSingleFileGenerator</Generator>
58+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
59+
</None>
60+
</ItemGroup>
61+
<ItemGroup>
6262
<None Remove="Resources\FASTER.ico" />
6363
<None Remove="Resources\FasterSplash.png" />
6464
</ItemGroup>

‎FASTERTests/FASTERTests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-windows</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
4+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
45
<IsPackable>false</IsPackable>
56
</PropertyGroup>
67
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎FASTER_Version.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<item>
3-
<version>1.9.7.1</version>
3+
<version>1.9.7.2</version>
44
<url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
55
<changelog>https://github.com/Foxlider/FASTER/releases</changelog>
66
<mandatory>true</mandatory>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "9.0.0"
4+
"version": "8.0.0"
55
}
66
}

0 commit comments

Comments
 (0)