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
33 changes: 33 additions & 0 deletions .github/workflows/build-parser.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json

name: build-parser
permissions:
contents: read
on:
workflow_dispatch:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_NOLOGO: true

jobs:
build:
runs-on: windows-2022
steps:
- uses: actions/checkout@v4.2.2
- name: Setup .NET
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: 10.0.x
- name: Install MAUI
run: |
dotnet workload install maui
dotnet restore
working-directory: .\Easy-Logger-Parser
- name: Build parser
run: dotnet build --configuration Release
working-directory: .\Easy-Logger-Parser
12 changes: 5 additions & 7 deletions .github/workflows/publish-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: |
10.0.x
9.0.x
dotnet-version: 10.0.x
- name: Install MAUI
run: dotnet workload install maui
working-directory: .\Easy-Logger-Parser
Expand All @@ -43,10 +41,10 @@ jobs:
run: |
[System.IO.File]::WriteAllBytes('${{ env.TempDirectory }}\opensource.keystore', [System.Convert]::FromBase64String('${{ secrets.ANDROID_KEYSTORE_OPENSOURCE }}'))
- name: Publish
run: dotnet publish -c Release -f net9.0-android -p:AndroidKeyStore=true -p:AndroidSigningKeyStore='${{ env.TempDirectory }}\opensource.keystore' -p:AndroidSigningKeyAlias='${{ secrets.ANDROID_ALIAS_OPENSOURCE }}' -p:AndroidSigningKeyPass='${{ secrets.ANDROID_PASSWORD_OPENSOURCE }}' -p:AndroidSigningStorePass='${{ secrets.ANDROID_PASSWORD_OPENSOURCE }}' -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
run: dotnet publish -c Release -f net10.0-android -p:AndroidKeyStore=true -p:AndroidSigningKeyStore='${{ env.TempDirectory }}\opensource.keystore' -p:AndroidSigningKeyAlias='${{ secrets.ANDROID_ALIAS_OPENSOURCE }}' -p:AndroidSigningKeyPass='${{ secrets.ANDROID_PASSWORD_OPENSOURCE }}' -p:AndroidSigningStorePass='${{ secrets.ANDROID_PASSWORD_OPENSOURCE }}' -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
working-directory: .\Easy-Logger-Parser
- name: Add to Release
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net9.0-android\com.nfsoftwareinc.easyloggerparser-Signed.apk
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net10.0-android\com.nfsoftwareinc.easyloggerparser-Signed.apk
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v4.6.2
Expand All @@ -55,5 +53,5 @@ jobs:
if-no-files-found: error
retention-days: 7
path: |
${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net9.0-android\*Signed.apk
${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net9.0-android\*Signed.aab
${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net10.0-android\*Signed.apk
${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net10.0-android\*Signed.aab
10 changes: 4 additions & 6 deletions .github/workflows/publish-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: |
10.0.x
9.0.x
dotnet-version: 10.0.x
- name: Install MAUI
run: dotnet workload install maui
working-directory: ./Easy-Logger-Parser
Expand All @@ -53,15 +51,15 @@ jobs:
run: |
sudo xcode-select -s /Applications/Xcode_16.2.app
sudo xcode-select -switch /Applications/Xcode_16.2.app/Contents/Developer
dotnet publish -c Release -f net9.0-ios -p:ArchiveOnBuild=true -p:RuntimeIdentifier=ios-arm64 -p:EnableAssemblyILStripping=false -p:CodesignKey="${{ secrets.APPLE_DISTRIBUTION_NAME }}" -p:CodesignProvision="Easy Logger App Store" -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
dotnet publish -c Release -f net10.0-ios -p:ArchiveOnBuild=true -p:RuntimeIdentifier=ios-arm64 -p:EnableAssemblyILStripping=false -p:CodesignKey="${{ secrets.APPLE_DISTRIBUTION_NAME }}" -p:CodesignProvision="Easy Logger App Store" -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
working-directory: ./Easy-Logger-Parser
- name: Add to Release
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net9.0-ios/ios-arm64/publish/Easy-Logger-Parser.ipa
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net10.0-ios/ios-arm64/publish/Easy-Logger-Parser.ipa
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v4.6.2
with:
name: Easy-Logger-Parser-ios
if-no-files-found: error
retention-days: 7
path: ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net9.0-ios/ios-arm64/publish/*.ipa
path: ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net10.0-ios/ios-arm64/publish/*.ipa
10 changes: 4 additions & 6 deletions .github/workflows/publish-mac-catalyst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: |
10.0.x
9.0.x
dotnet-version: 10.0.x
- name: Install MAUI
run: dotnet workload install maui
working-directory: ./Easy-Logger-Parser
Expand All @@ -53,15 +51,15 @@ jobs:
mv '/Users/runner/Library/MobileDevice/Provisioning Profiles/${{ secrets.APPLE_MACOS_PROVISIONING_ID }}.mobileprovision' '/Users/runner/Library/MobileDevice/Provisioning Profiles/${{ secrets.APPLE_MACOS_PROVISIONING_ID }}.provisionprofile'
sudo xcode-select -s /Applications/Xcode_16.2.app
sudo xcode-select -switch /Applications/Xcode_16.2.app/Contents/Developer
dotnet publish -c Release -f net9.0-maccatalyst -p:MtouchLink=SdkOnly -p:CreatePackage=true -p:UseHardenedRuntime=true -p:EnableCodeSigning=true -p:EnablePackageSigning=true -p:CodesignKey="${{ secrets.APPLE_DISTRIBUTION_NAME }}" -p:CodesignProvision="Easy Logger Mac Store" -p:CodesignEntitlements="Platforms/MacCatalyst/Entitlements.plist" -p:PackageSigningKey="${{ secrets.APPLE_DEVELOPER_NAME }}" -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
dotnet publish -c Release -f net10.0-maccatalyst -p:MtouchLink=SdkOnly -p:CreatePackage=true -p:UseHardenedRuntime=true -p:EnableCodeSigning=true -p:EnablePackageSigning=true -p:CodesignKey="${{ secrets.APPLE_DISTRIBUTION_NAME }}" -p:CodesignProvision="Easy Logger Mac Store" -p:CodesignEntitlements="Platforms/MacCatalyst/Entitlements.plist" -p:PackageSigningKey="${{ secrets.APPLE_DEVELOPER_NAME }}" -p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }}
working-directory: ./Easy-Logger-Parser
- name: Add to Release
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net9.0-maccatalyst/publish/Easy-Logger-Parser-${{ inputs.version }}.pkg
run: gh release upload ${{ inputs.version }} ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net10.0-maccatalyst/publish/Easy-Logger-Parser-${{ inputs.version }}.pkg
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v4.6.2
with:
name: Easy-Logger-Parser-maccatalyst
if-no-files-found: error
retention-days: 7
path: ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net9.0-maccatalyst/publish/*.pkg
path: ${{ github.workspace }}/Easy-Logger-Parser/bin/Release/net10.0-maccatalyst/publish/*.pkg
10 changes: 4 additions & 6 deletions .github/workflows/publish-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: |
10.0.x
9.0.x
dotnet-version: 10.0.x
- name: Install MAUI
run: dotnet workload install maui
working-directory: .\Easy-Logger-Parser
Expand All @@ -46,10 +44,10 @@ jobs:
run: |
if ("${{ inputs.architecture }}" -eq "arm64") {
echo "BUILD_ARGUMENTS=-p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }} -p:UseMonoRuntime=false -p:Platform=Arm64" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
echo "PUBLISH_DIRECTORY=${{ github.workspace }}\Easy-Logger-Parser\bin\Arm64\Release\net9.0-windows10.0.19041.0\win-arm64\AppPackages\Easy-Logger-Parser_${{ inputs.version }}.0_Test" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
echo "PUBLISH_DIRECTORY=${{ github.workspace }}\Easy-Logger-Parser\bin\Arm64\Release\net10.0-windows10.0.19041.0\win-arm64\AppPackages\Easy-Logger-Parser_${{ inputs.version }}.0_Test" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
} else {
echo "BUILD_ARGUMENTS=-p:AssemblyVersion=${{ env.PublishVersion }} -p:Version=${{ inputs.version }} -p:FileVersion=${{ env.PublishVersion }} -p:ApplicationVersion=${{ inputs.build }} -p:ApplicationDisplayVersion=${{ inputs.version }} -p:UseMonoRuntime=false" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
echo "PUBLISH_DIRECTORY=${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net9.0-windows10.0.19041.0\win-x64\AppPackages\Easy-Logger-Parser_${{ inputs.version }}.0_Test" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
echo "PUBLISH_DIRECTORY=${{ github.workspace }}\Easy-Logger-Parser\bin\Release\net10.0-windows10.0.19041.0\win-x64\AppPackages\Easy-Logger-Parser_${{ inputs.version }}.0_Test" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
}
- name: Save Certificates
run: |
Expand All @@ -65,7 +63,7 @@ jobs:
$xml.Package.Properties.PublisherDisplayName = $certificate.Subject -replace "(CN=)(.*?),.*", '$2'
$xml.Save('${{ github.workspace }}\Easy-Logger-Parser\Platforms\Windows\Package.appxmanifest')
- name: Publish
run: dotnet publish -c Release -r win-${{ inputs.architecture }} -f net9.0-windows10.0.19041.0 ${{ env.BUILD_ARGUMENTS }}
run: dotnet publish -c Release -r win-${{ inputs.architecture }} -f net10.0-windows10.0.19041.0 ${{ env.BUILD_ARGUMENTS }}
working-directory: .\Easy-Logger-Parser
- name: Sign Package
run: |
Expand Down
14 changes: 7 additions & 7 deletions Easy-Logger-Parser/Easy-Logger-Parser.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>$(MSBuildProjectName.Replace("-", "_"))</RootNamespace>
<UseMaui>true</UseMaui>
Expand All @@ -16,7 +16,7 @@
<AssemblyVersion>2.2.3.0</AssemblyVersion>
<FileVersion>2.2.3.0</FileVersion>
<Version>2.2.3</Version>
<MauiVersion>9.0.81</MauiVersion>
<MauiVersion>10.0.80</MauiVersion>

<!-- Display name -->
<ApplicationTitle>Easy Logger Parser</ApplicationTitle>
Expand All @@ -37,17 +37,17 @@
<DefaultLanguage>en</DefaultLanguage>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0-android|AnyCPU'">
<AndroidPackageFormat>aab</AndroidPackageFormat>
<AndroidUseAapt2>True</AndroidUseAapt2>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-windows10.0.19041.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0-windows10.0.19041.0|AnyCPU'">
<WindowsPackageType>None</WindowsPackageType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-windows10.0.19041.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0-windows10.0.19041.0|AnyCPU'">
<WindowsPackageType>MSIX</WindowsPackageType>
</PropertyGroup>

Expand All @@ -66,7 +66,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Easy.Blazor.Bulma" Version="1.2.*" />
<PackageReference Include="Easy.Blazor.Bulma" Version="10.0.*" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Easy-Logger-Parser/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="_content/Easy.Blazor.Bulma/css/easy-blazor-bulma.min.css" id="easy-blazor-bulma" media="(prefers-color-scheme: light)" />
<link rel="stylesheet" href="_content/Easy.Blazor.Bulma/css/easy-blazor-bulma-dark.min.css" id="easy-blazor-bulma-dark" media="(prefers-color-scheme: dark)" />
<link rel="stylesheet" href="Easy-Logger-Parser.styles.css" />
<link rel="icon" type="image/png" href="favicon.ico" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
</head>

<body>
Expand Down
Loading