Skip to content
Open
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
15 changes: 9 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

version: 2
updates:

# Maintain dependencies for GitHub Actions

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

# Maintain dependencies for nuget
interval: "weekly"
open-pull-requests-limit: 3
- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
open-pull-requests-limit: 5
ignore:
- dependency-name: "*"
versions: ["*-preview*", "*-beta*", "*-alpha*"]
49 changes: 37 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
workflow_dispatch:

env:
CI_REQ_DOTNET_SDK_VER: 6.0.x
CI_REQ_DOTNET_SDK_VER: 9.0.x

jobs:
build:
Expand All @@ -27,37 +27,56 @@ jobs:
shell: pwsh
strategy:
matrix:
platform: [netframework, net6.0-win32, net6.0-win64, net6.0-win-arm, net6.0-win-arm64, net6.0-linux64, net6.0-linux-arm, net6.0-linux-arm64, net6.0-osx64, netcoreapp3.1-win32, netcoreapp3.1-win64, netcoreapp3.1-win-arm, netcoreapp3.1-win-arm64, netcoreapp3.1-linux64, netcoreapp3.1-linux-arm, netcoreapp3.1-linux-arm64, netcoreapp3.1-osx64]
platform: [netframework, net9.0-win32, net9.0-win64, net9.0-win-arm64, net9.0-linux64, net9.0-linux-arm, net9.0-linux-arm64, net9.0-osx64, net6.0-win32, net6.0-win64, net6.0-win-arm, net6.0-win-arm64, net6.0-linux64, net6.0-linux-arm, net6.0-linux-arm64, net6.0-osx64, netcoreapp3.1-win32, netcoreapp3.1-win64, netcoreapp3.1-win-arm, netcoreapp3.1-win-arm64, netcoreapp3.1-linux64, netcoreapp3.1-linux-arm, netcoreapp3.1-linux-arm64, netcoreapp3.1-osx64]
include:
- platform: netframework
build-dir: net48

- platform: net9.0-win32
build-dir: net9.0\win-x86\publish

- platform: net9.0-win64
build-dir: net9.0\win-x64\publish

- platform: net9.0-win-arm64
build-dir: net9.0\win-arm64\publish

- platform: net9.0-linux64
build-dir: net9.0\linux-x64\publish

- platform: net9.0-linux-arm
build-dir: net9.0\linux-arm\publish

- platform: net9.0-linux-arm64
build-dir: net9.0\linux-arm64\publish

- platform: net9.0-osx64
build-dir: net9.0\osx-x64\publish

- platform: net6.0-win32
build-dir: net6.0\win-x86\publish

- platform: net6.0-win64
build-dir: net6.0\win-x64\publish

- platform: net6.0-win-arm
build-dir: net6.0\win-arm\publish

- platform: net6.0-win-arm64
build-dir: net6.0\win-arm64\publish

- platform: net6.0-linux64
build-dir: net6.0\linux-x64\publish

- platform: net6.0-linux-arm
build-dir: net6.0\linux-arm\publish

- platform: net6.0-linux-arm64
build-dir: net6.0\linux-arm64\publish

- platform: net6.0-osx64
build-dir: net6.0\osx-x64\publish



- platform: netcoreapp3.1-win32
build-dir: netcoreapp3.1\win-x86\publish

Expand Down Expand Up @@ -89,15 +108,19 @@ jobs:
submodules: true

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{env.CI_REQ_DOTNET_SDK_VER}}
cache: true
cache-dependency-path: '**/packages.lock.json'

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2

- name: Setup NuGet
uses: NuGet/setup-nuget@v1.2.0
uses: nuget/setup-nuget@v2
with:
nuget-version: 'latest'

- name: Restore NuGet packages for NETReactorSlayer.GUI
run: nuget restore NETReactorSlayer.GUI\NETReactorSlayer.GUI.csproj -PackagesDirectory .\packages\
Expand All @@ -114,17 +137,19 @@ jobs:
run: Copy-Item -Path bin\Release\${{matrix.build-dir}}\* -Destination C:\builtfiles\NETReactorSlayer-${{matrix.platform}} -Recurse

- name: Upload NETReactorSlayer
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ contains(matrix.platform, 'netframework') && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) }}
with:
name: NETReactorSlayer-${{matrix.platform}}
path: C:\builtfiles\NETReactorSlayer-${{matrix.platform}}
if-no-files-found: error
compression-level: 6

- name: Upload NETReactorSlayer.CLI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ !contains(matrix.platform, 'netframework') && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))}}
with:
name: NETReactorSlayer.CLI-${{matrix.platform}}
path: C:\builtfiles\NETReactorSlayer-${{matrix.platform}}
if-no-files-found: error
compression-level: 6
10 changes: 6 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,28 @@ jobs:
fail-fast: false
matrix:
language: [ 'csharp' ]
dotnet-version: [ '6.0.x' ]
dotnet-version: [ '9.0.x' ]

steps:
- name: Checkout repository
uses: actions/checkout@v4

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

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}
cache: true
cache-dependency-path: '**/packages.lock.json'

- name: Build
run: dotnet build NETReactorSlayer.sln

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
35 changes: 20 additions & 15 deletions NETReactorSlayer-x64.CLI/NETReactorSlayer-x64.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,32 @@
<Import Project="..\NETReactorSlayerCommon.props" />

<PropertyGroup>

<Platform>AnyCPU</Platform>
<Platform>x86</Platform>
<OutputPath>..\bin\$(Configuration)\</OutputPath>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net6.0;net7.0;net48;netcoreapp3.1</TargetFrameworks>
<PlatformTarget>x64</PlatformTarget>

</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NETReactorSlayer.Core\NETReactorSlayer.Core.csproj" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(IsDotNet)' == 'true'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net48|AnyCPU'">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>

<Delete Files="$(OutputPath)\$(TargetName).exe" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).exe.config" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).runtimeconfig.dev.json" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).dll" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).pdb" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).runtimeconfig.json" ContinueOnError="WarnAndContinue" />
<Delete Files="$(OutputPath)\$(TargetName).deps.json" ContinueOnError="WarnAndContinue" />
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>

</Target>
<ItemGroup>
<ProjectReference Include="..\NETReactorSlayer.Core\NETReactorSlayer.Core.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions NETReactorSlayer-x64.CLI/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright (C) 2021 CodeStrikers.org
This file is part of NETReactorSlayer.
NETReactorSlayer is free software: you can redistribute it and/or modify
Expand All @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License

using System;

namespace NETReactorSlayerr_x64.CLI
namespace NETReactorSlayer_x64.CLI
{
internal class Program
{
Expand Down
Loading