Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

124 localization system support #129

Merged
merged 5 commits into from
Sep 8, 2024
+871 −3,352
Merged

124 localization system support #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
858a562
#124 localization system added.
gonultasmf Sep 8, 2024
ea470ba
fixes.
gonultasmf Sep 8, 2024
fdaa231
workflows fixes.
gonultasmf Sep 8, 2024
a4635d1
fixes sample project
gonultasmf Sep 8, 2024
cfbb64f
fix.
gonultasmf Sep 8, 2024
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
18 changes: 14 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- develop

env:
SOLUTION_PATH: './FmgLib.MauiMarkup.sln'
PROJECT_PATH: 'src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj'
PACKAGE_OUTPUT_DIRECTORY: ${{ github.workspace }}\output

Expand All @@ -24,8 +25,17 @@ jobs:
with:
dotnet-version: '8.0.x'

- name: 'Restore package'
run: dotnet restore ${{ env.PROJECT_PATH }}
- name: Install MAUI workload
run: dotnet workload install maui

- name: 'Build project'
run: dotnet build ${{ env.PROJECT_PATH }} --no-restore --configuration Release
- name: Clean output directory
run: dotnet clean ${{ env.SOLUTION_PATH }} -c Release

- name: Build the solution
run: dotnet build ${{ env.SOLUTION_PATH }} -c Release

# - name: 'Restore package'
# run: dotnet restore ${{ env.PROJECT_PATH }}

# - name: 'Build project'
# run: dotnet build ${{ env.PROJECT_PATH }} --no-restore --configuration Release
18 changes: 9 additions & 9 deletions FmgLib.MauiMarkup.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8E033618
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyOrderApp", "sample\MyOrderApp\MyOrderApp.csproj", "{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyFinance", "sample\MyFinance\MyFinance.csproj", "{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9F405AEA-B646-47DD-A094-B4DA5F087273}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup", "src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj", "{D2A04B78-1200-47E4-8DD4-F36BBB31B323}"
Expand All @@ -27,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup.Generator
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FmgLib.MauiMarkup.Generator.Test", "tests\FmgLib.MauiMarkup.Generator.Test\FmgLib.MauiMarkup.Generator.Test.csproj", "{DAC53472-0370-4B41-8A21-ECB0B8BD660C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyMauiMarkupApp", "sample\MyMauiMarkupApp\MyMauiMarkupApp.csproj", "{830B4B22-FECA-43A5-A445-AE439DE88762}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -43,12 +43,6 @@ Global
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Release|Any CPU.Build.0 = Release|Any CPU
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.Build.0 = Release|Any CPU
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2A04B78-1200-47E4-8DD4-F36BBB31B323}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -61,17 +55,23 @@ Global
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAC53472-0370-4B41-8A21-ECB0B8BD660C}.Release|Any CPU.Build.0 = Release|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Debug|Any CPU.Build.0 = Debug|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Release|Any CPU.ActiveCfg = Release|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Release|Any CPU.Build.0 = Release|Any CPU
{830B4B22-FECA-43A5-A445-AE439DE88762}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{61CFBCD6-A21C-46CA-8264-5F21A0467F18} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{ACC42464-7EAF-446F-8CD9-3D64C97ADA1A} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{0F20FD8E-1997-4953-8B28-FC2AB893CF4F} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
{D2A04B78-1200-47E4-8DD4-F36BBB31B323} = {9F405AEA-B646-47DD-A094-B4DA5F087273}
{A0F9BAC1-D4D6-4ADB-9CA5-F536FCA0F06D} = {9F405AEA-B646-47DD-A094-B4DA5F087273}
{DAC53472-0370-4B41-8A21-ECB0B8BD660C} = {8E033618-BADE-4A6C-AC14-56EF722D8F61}
{830B4B22-FECA-43A5-A445-AE439DE88762} = {A4956394-4BE4-4C5A-BDD3-59F439A1FD98}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2698E1E7-D253-457B-AF1B-6754123E0A11}
Expand Down
4 changes: 2 additions & 2 deletions sample/GeneratedExam/GeneratedExam.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FmgLib.MauiMarkup" Version="8.5.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.20" />
<PackageReference Include="FmgLib.MauiMarkup" Version="8.8.1" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
<PackageReference Include="SkiaSharp.Extended.UI.Maui" Version="2.0.0" />
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4.0" />
</ItemGroup>
Expand Down
12 changes: 0 additions & 12 deletions sample/MyFinance/App.cs
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions sample/MyFinance/AppShell.cs
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions sample/MyFinance/Context/MyFinanceContext.cs
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions sample/MyFinance/Controls/GeneralPopup.cs
View file
Open in desktop

This file was deleted.

96 changes: 0 additions & 96 deletions sample/MyFinance/Controls/OperationPopup.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions sample/MyFinance/DTOs/LoginDTO.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions sample/MyFinance/Enums/ChartType.cs
View file
Open in desktop

This file was deleted.

Loading