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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Announce Release/Prerelease

on:
release:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: .NET
name: Build Prerelease

on:
push:
Expand Down Expand Up @@ -69,6 +69,6 @@ jobs:
files: FrEee-binary-*.zip
draft: false
prerelease: true
name: Auto-Build Release ${{steps.get_versions.outputs.version}}-${{steps.createReleaseTag.outputs.string}}
name: Auto-Build Prerelease ${{steps.get_versions.outputs.version}}-${{steps.createReleaseTag.outputs.string}}
fail_on_unmatched_files: true
token: ${{ secrets.RELEASE_TOKEN }}
68 changes: 68 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Build Release

on:
push:
branches: [ release/** ]

jobs:
build:

runs-on: windows-latest

steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 10.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
uses: zyborg/dotnet-tests-report@v1.3.0
with:
project_path: FrEee.Tests/FrEee.Tests.csproj
no_restore: true # we already restored above
msbuild_configuration: Release
msbuild_verbosity: normal # q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
report_name: TestReport_${{github.sha}}_$NOW
report_title: Test Report
github_token: ${{ secrets.GITHUB_TOKEN }}
skip_check_run: false
set_check_status_from_test_outcome: false # true = fail the build if tests fail
#trx_xsl_path: # optional
- name: Get assembly version
uses: KageKirin/get-csproj-version@v0
id: get_versions
with:
file: 'FrEee.Assets/CommonProjectProperties.xml'
- name: List files
run: ls -s .\bin\Release\net10.0-windows
- name: Prepare files for zipping
run: |
cd bin/Release
robocopy net10.0 FrEee /E
rem errorlevel less than 8 is not actually an error for robocopy so reset the errorlevel to zero
if not errorlevel 8 (call )
robocopy net10.0-windows FrEee /E
if not errorlevel 8 (call )
rmdir /S /Q net10.0
rmdir /S /Q net10.0-windows
shell: cmd
- name: Zip assets
uses: papeloto/action-zip@v1
with:
files: ./bin/Release
dest: FrEee-binary-${{steps.get_versions.outputs.version}}.zip
- name: Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{steps.get_versions.outputs.version}}
files: FrEee-binary-*.zip
draft: false
prerelease: false
name: Release ${{steps.get_versions.outputs.version}}
fail_on_unmatched_files: true
token: ${{ secrets.RELEASE_TOKEN }}
4 changes: 2 additions & 2 deletions FrEee.Assets/CommonProjectProperties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<PackageProjectUrl>http://edkolis.com/freee</PackageProjectUrl>
<Product>FrEee</Product>
<Version>0.0.9</Version>
<Copyright>Copyright © 2013-2025</Copyright>
<Version>0.1.0</Version>
<Copyright>Copyright © 2013-2026</Copyright>
<ApplicationIcon>../FrEee.Assets/FrEee.ico</ApplicationIcon>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions FrEee.Tests/Utility/SerializerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void LookUpComplexType()
Assert.AreEqual(typeof(Dictionary<AbilityRule, Formula<int>>), st.Type);
}
{
var tname = "System.Collections.Generic.IDictionary`2[[FrEee.Modding.Abilities.AbilityRule, FrEee.Core, Version=0.0.9.0, Culture=neutral, PublicKeyToken=null],[System.Collections.Generic.IDictionary`2[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[FrEee.Modding.Formula`1[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], FrEee.Core, Version=0.0.9.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]";
var tname = "System.Collections.Generic.IDictionary`2[[FrEee.Modding.Abilities.AbilityRule, FrEee.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Collections.Generic.IDictionary`2[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[FrEee.Modding.Formula`1[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], FrEee.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]";
var st = new SafeType(tname);
Assert.AreEqual(typeof(IDictionary<AbilityRule, IDictionary<int, Formula<int>>>), st.Type);
}
Expand All @@ -131,12 +131,12 @@ public void LookUpComplexType()
public void LegacyLookUpComplexType()
{
{
var tname = "System.Collections.Generic.List`1[[FrEee.Modding.Abilities.AbilityRule, FrEee.Core, Version=0.0.9.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
var tname = "System.Collections.Generic.List`1[[FrEee.Modding.Abilities.AbilityRule, FrEee.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
var st = new SafeType(tname);
Assert.AreEqual(typeof(List<AbilityRule>), st.Type);
}
{
var tname = "System.Collections.Generic.List`1[[FrEee.Modding.Formula`1[[System.String, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], FrEee.Core, Version=0.0.9.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
var tname = "System.Collections.Generic.List`1[[FrEee.Modding.Formula`1[[System.String, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], FrEee.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
var st = new SafeType(tname);
Assert.AreEqual(typeof(List<Formula<string>>), st.Type);
}
Expand All @@ -146,7 +146,7 @@ public void LegacyLookUpComplexType()
[Ignore("Script type no longer in existence")]
public void LegacyLookUpArrays()
{
var tname = "FrEee.Modding.Script[], FrEee.Core, Version=0.0.9.0, Culture=neutral, PublicKeyToken=null";
var tname = "FrEee.Modding.Script[], FrEee.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null";
var st = new SafeType(tname);
Assert.AreEqual(typeof(PythonScript[]), st.Type);
}
Expand Down
Loading