diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml new file mode 100644 index 00000000..77d1c350 --- /dev/null +++ b/.github/workflows/createrelease.yml @@ -0,0 +1,179 @@ +name: Release + +on: + release: + types: [published] + +env: + DOTNET_NOLOGO: true # Disable the .NET logo + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience + DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry + +jobs: + release_android: + runs-on: windows-2022 + name: "Android Release" + env: + ASPNETCORE_ENVIRONMENT: "Production" + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + msbuild-architecture: x64 + + - name: Setup .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.* + include-prerelease: true + + - uses: actions/setup-java@v2 + with: + distribution: 'microsoft' + java-version: '11' + + - name: Install MAUI Workloads + run: | + dotnet workload install android --ignore-failed-sources + dotnet workload install maui --ignore-failed-sources + + - name: Restore Dependencies + run: dotnet restore TransactionMobile.Maui.sln + + - name: Build Code + run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-android --no-restore + + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + + - name: Upload Android Artifact + uses: actions/upload-artifact@v2.3.1 + with: + name: android-ci-build + path: TransactionMobile.Maui/bin/Release/net6.0-android/*Signed.a* + + release_windows: + runs-on: windows-2022 + name: "Windows Release" + env: + ASPNETCORE_ENVIRONMENT: "Production" + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + msbuild-architecture: x64 + + - name: Setup .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.* + include-prerelease: true + + - uses: actions/setup-java@v2 + with: + distribution: 'microsoft' + java-version: '11' + + - name: Install MAUI Workloads + run: | + dotnet workload install maui --ignore-failed-sources + + - name: Restore Dependencies + run: dotnet restore TransactionMobile.Maui.sln + + - name: Build Code + run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true + + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + + - name: Upload Windows Artifact + uses: actions/upload-artifact@v2.3.1 + with: + name: windows-ci-build + path: | + TransactionMobile.Maui/bin/Release/net6.0-windows*/**/TransactionMobile.Maui*.msix + + released-mac: + runs-on: macos-11 + name: MacCatalyst Release + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup .NET 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + include-prerelease: true + + - name: Install MAUI Workloads + run: | + dotnet workload install maccatalyst --ignore-failed-sources + dotnet workload install maui --ignore-failed-sources + + - name: Restore Dependencies + run: dotnet restore TransactionMobile.Maui.sln + + - name: Build Code + run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-maccatalyst --no-restore + + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + + - name: Upload MacCatalyst Artifact + uses: actions/upload-artifact@v2.3.1 + with: + name: macos-ci-build + path: TransactionMobile.Maui/bin/Release/net6.0-maccatalyst/**/*.app/ + + release-ios: + runs-on: macos-11 + name: iOS Release + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.* + include-prerelease: true + + - name: Install MAUI Workloads + run: | + dotnet workload install ios --ignore-failed-sources + dotnet workload install maui --ignore-failed-sources + + - name: Restore Dependencies + run: dotnet restore TransactionMobile.Maui.sln + + - name: Build Code + run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore + + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + + - name: Upload iOS Artifact + uses: actions/upload-artifact@v2.3.1 + with: + name: ios-ci-build + path: TransactionMobile.Maui/bin/Release/net6.0-ios/**/*.app/ diff --git a/.github/workflows/createrelease_android.yml b/.github/workflows/createrelease_android.yml deleted file mode 100644 index c05ccf72..00000000 --- a/.github/workflows/createrelease_android.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Release - Android - -on: - release: - types: [published] - -env: - DOTNET_NOLOGO: true # Disable the .NET logo - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience - DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry - -jobs: - # MAUI Android Build - release-android: - runs-on: windows-2022 - name: Android Release - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 - with: - vs-prerelease: true - msbuild-architecture: x64 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true - - - uses: actions/setup-java@v2 - with: - distribution: 'microsoft' - java-version: '11' - - - name: Install MAUI Workloads - run: | - dotnet workload install maui --ignore-failed-sources - dotnet workload install maui-android --ignore-failed-sources - dotnet workload install maui-desktop --ignore-failed-sources - dotnet workload install maui-ios --ignore-failed-sources - dotnet workload install maui-mobile --ignore-failed-sources - dotnet workload install maui-windows --ignore-failed-sources - - - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json - - - name: Build Code - run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-android --no-restore - - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - - name: Upload Android Artifact - uses: actions/upload-artifact@v2.3.1 - with: - name: android-ci-build - path: TransactionMobile.Maui/bin/Release/net6.0-android/*Signed.a* diff --git a/.github/workflows/createrelease_ios.yml b/.github/workflows/createrelease_ios.yml deleted file mode 100644 index d961618b..00000000 --- a/.github/workflows/createrelease_ios.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Release - iOS - -on: - release: - types: [published] - -env: - DOTNET_NOLOGO: true # Disable the .NET logo - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience - DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry - -jobs: -# MAUI iOS Build - release-ios: - runs-on: macos-11 - name: iOS Release - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.x - include-prerelease: true - - - name: Install MAUI Workloads - run: | - dotnet workload install ios --ignore-failed-sources - dotnet workload install maui --ignore-failed-sources - - - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json - - - name: Build Code - run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore - - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - - name: Upload iOS Artifact - uses: actions/upload-artifact@v2.3.1 - with: - name: ios-ci-build - path: TransactionMobile.Maui/bin/Release/net6.0-ios/**/*.app/ diff --git a/.github/workflows/createrelease_maccatalyst.yml b/.github/workflows/createrelease_maccatalyst.yml deleted file mode 100644 index 3a914272..00000000 --- a/.github/workflows/createrelease_maccatalyst.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Release - MacCatalyst - -on: - release: - types: [published] - -env: - DOTNET_NOLOGO: true # Disable the .NET logo - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience - DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry - -jobs: - # MAUI MacCatalyst Build - release-mac: - runs-on: macos-11 - name: MacCatalyst Release - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.x - include-prerelease: true - - #- run: dotnet tool update -g dotnet-vs - - - name: Install MAUI Workloads - run: | - dotnet workload install maccatalyst --ignore-failed-sources - dotnet workload install maui --ignore-failed-sources - - - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json - - - name: Build Code - run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-maccatalyst --no-restore - - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - - name: Upload MacCatalyst Artifact - uses: actions/upload-artifact@v2.3.1 - with: - name: macos-ci-build - path: TransactionMobile.Maui/bin/Release/net6.0-maccatalyst/**/*.app/ - diff --git a/.github/workflows/createrelease_windows.yml b/.github/workflows/createrelease_windows.yml deleted file mode 100644 index f12cb27f..00000000 --- a/.github/workflows/createrelease_windows.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Release - Windows - -on: - release: - types: [published] - -env: - DOTNET_NOLOGO: true # Disable the .NET logo - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience - DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - -jobs: - release-windows: - runs-on: windows-2022 - name: Windows Release - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v2 - with: - dotnet-version: 6.0.* - include-prerelease: true - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 - with: - vs-prerelease: true - - - name: Install MAUI Workloads - run: | - dotnet workload install maui --ignore-failed-sources - - - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json - - - name: Build Code - run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=true -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true /p:RestoreSources=https://api.nuget.org/v3/index.json /p:RestoreSources=https://www.myget.org/F/transactionprocessing/api/v3/index.json /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json - - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - - name: Upload Windows Artifact - uses: actions/upload-artifact@v2.3.1 - with: - name: windows-ci-build - path: | - *.msix diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml index d9b97781..f5185673 100644 --- a/.github/workflows/pullrequest_android.yml +++ b/.github/workflows/pullrequest_android.yml @@ -1,4 +1,4 @@ -name: Build & Test Pull Requests +name: Build & Test Pull Requests - Android on: pull_request: @@ -17,7 +17,7 @@ jobs: name: Android Build steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 @@ -26,9 +26,9 @@ jobs: msbuild-architecture: x64 - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.200-preview.22055.15 + dotnet-version: 6.0.* include-prerelease: true - uses: actions/setup-java@v2 @@ -38,12 +38,8 @@ jobs: - name: Install MAUI Workloads run: | - dotnet workload install maui --ignore-failed-sources - dotnet workload install maui-android --ignore-failed-sources - dotnet workload install maui-desktop --ignore-failed-sources - dotnet workload install maui-ios --ignore-failed-sources - dotnet workload install maui-mobile --ignore-failed-sources - dotnet workload install maui-windows --ignore-failed-sources + dotnet workload install android --ignore-failed-sources + dotnet workload install maui --ignore-failed-sources - name: Restore Dependencies run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index b1b19c6e..3db5c786 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -1,4 +1,4 @@ -name: Build & Test Pull Requests +name: Build & Test Pull Requests - iOS on: pull_request: @@ -17,19 +17,13 @@ jobs: name: iOS Build steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.* + include-prerelease: true - name: Install MAUI Workloads run: | @@ -37,7 +31,7 @@ jobs: dotnet workload install maui --ignore-failed-sources - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json + run: dotnet restore TransactionMobile.Maui.sln - name: Build Code run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore @@ -45,8 +39,8 @@ jobs: - name: Run Unit Tests run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj -# #- name: Upload iOS Artifact -# # uses: actions/upload-artifact@v2.3.1 -# # with: -# # name: ios-ci-build -# # path: src/MauiBeach/bin/Release/net6.0-ios/**/*.app/ + #- name: Upload iOS Artifact + # uses: actions/upload-artifact@v2.3.1 + # with: + # name: ios-ci-build + # path: src/TransactionMobile.Maui/bin/Release/net6.0-ios/**/*.app/ diff --git a/.github/workflows/pullrequest_maccatalyst.yml b/.github/workflows/pullrequest_maccatalyst.yml index 376c565d..1c034769 100644 --- a/.github/workflows/pullrequest_maccatalyst.yml +++ b/.github/workflows/pullrequest_maccatalyst.yml @@ -1,4 +1,4 @@ -name: Build & Test Pull Requests +name: Build & Test Pull Requests - MacCatalyst on: pull_request: @@ -17,29 +17,21 @@ jobs: name: MacCatalyst Build steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true + uses: actions/checkout@v3 - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: dotnet-version: 6.0.x include-prerelease: true - - #- run: dotnet tool update -g dotnet-vs - + - name: Install MAUI Workloads run: | dotnet workload install maccatalyst --ignore-failed-sources dotnet workload install maui --ignore-failed-sources - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json + run: dotnet restore TransactionMobile.Maui.sln - name: Build Code run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-maccatalyst --no-restore diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 2bb53242..f17ddcb5 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -1,4 +1,4 @@ -name: Build & Test Pull Requests +name: Build & Test Pull Requests - Windows on: pull_request: @@ -17,42 +17,35 @@ jobs: name: Windows Build steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 + - name: Setup .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.* + include-prerelease: true + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 with: vs-prerelease: true - msbuild-architecture: x64 - - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.200-preview.22055.15 - include-prerelease: true - - - run: dotnet tool update -g dotnet-vs - - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - + - name: Install MAUI Workloads run: | dotnet workload install maui --ignore-failed-sources - dotnet workload install maui-desktop --ignore-failed-sources - dotnet workload install maui-mobile --ignore-failed-sources - dotnet workload install maui-windows --ignore-failed-sources - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json + run: dotnet restore TransactionMobile.Maui.sln - name: Build Code - run: | - "C:/Program Files/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=true -p:TargetFramework=net6.0-windows10.0.19041 /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" + run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true - name: Run Unit Tests run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - # #- name: Upload Windows Artifact - # # uses: actions/upload-artifact@v2.3.1 - # # with: - # # name: windows-ci-build - # # path: src/MauiBeach/bin/Release/net6.0-windows*/**/MauiBeach*.msix + + - name: Upload Windows Artifact + uses: actions/upload-artifact@v2.3.1 + with: + name: windows-ci-build + path: | + TransactionMobile.Maui/bin/Release/net6.0-windows*/**/TransactionMobile.Maui*.msix diff --git a/Nuget.config b/Nuget.config new file mode 100644 index 00000000..37d08ff0 --- /dev/null +++ b/Nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/TransactionMobile.Maui.Database/DatabaseContext.cs b/TransactionMobile.Maui.BusinessLogic/Database/DatabaseContext.cs similarity index 100% rename from TransactionMobile.Maui.Database/DatabaseContext.cs rename to TransactionMobile.Maui.BusinessLogic/Database/DatabaseContext.cs diff --git a/TransactionMobile.Maui.Database/IDatabaseContext.cs b/TransactionMobile.Maui.BusinessLogic/Database/IDatabaseContext.cs similarity index 100% rename from TransactionMobile.Maui.Database/IDatabaseContext.cs rename to TransactionMobile.Maui.BusinessLogic/Database/IDatabaseContext.cs diff --git a/TransactionMobile.Maui.Database/LogMessage.cs b/TransactionMobile.Maui.BusinessLogic/Database/LogMessage.cs similarity index 100% rename from TransactionMobile.Maui.Database/LogMessage.cs rename to TransactionMobile.Maui.BusinessLogic/Database/LogMessage.cs diff --git a/TransactionMobile.Maui.Database/TransactionRecord.cs b/TransactionMobile.Maui.BusinessLogic/Database/TransactionRecord.cs similarity index 100% rename from TransactionMobile.Maui.Database/TransactionRecord.cs rename to TransactionMobile.Maui.BusinessLogic/Database/TransactionRecord.cs diff --git a/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj b/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj index 7c2fc753..eafdbbfd 100644 --- a/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj +++ b/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj @@ -1,4 +1,4 @@ - + net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst @@ -23,9 +23,10 @@ - - - - + + + + + diff --git a/TransactionMobile.Maui.Database/TransactionMobile.Maui.Database.csproj b/TransactionMobile.Maui.Database/TransactionMobile.Maui.Database.csproj deleted file mode 100644 index 1003f9ad..00000000 --- a/TransactionMobile.Maui.Database/TransactionMobile.Maui.Database.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - - - diff --git a/TransactionMobile.Maui.sln b/TransactionMobile.Maui.sln index d4c164e4..5a1818ea 100644 --- a/TransactionMobile.Maui.sln +++ b/TransactionMobile.Maui.sln @@ -13,7 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionMobile.Maui.Busi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionMobile.Maui.BusinessLogic", "TransactionMobile.Maui.BusinessLogic\TransactionMobile.Maui.BusinessLogic.csproj", "{902D54CF-CD5F-4932-B1DC-01A3937AC054}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransactionMobile.Maui.Database", "TransactionMobile.Maui.Database\TransactionMobile.Maui.Database.csproj", "{692DD081-BA36-4289-9A81-96C9F604E864}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{354A147A-375C-4002-9019-215F84AC389C}" + ProjectSection(SolutionItems) = preProject + Nuget.config = Nuget.config + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -35,10 +38,6 @@ Global {902D54CF-CD5F-4932-B1DC-01A3937AC054}.Debug|Any CPU.Build.0 = Debug|Any CPU {902D54CF-CD5F-4932-B1DC-01A3937AC054}.Release|Any CPU.ActiveCfg = Release|Any CPU {902D54CF-CD5F-4932-B1DC-01A3937AC054}.Release|Any CPU.Build.0 = Release|Any CPU - {692DD081-BA36-4289-9A81-96C9F604E864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {692DD081-BA36-4289-9A81-96C9F604E864}.Debug|Any CPU.Build.0 = Debug|Any CPU - {692DD081-BA36-4289-9A81-96C9F604E864}.Release|Any CPU.ActiveCfg = Release|Any CPU - {692DD081-BA36-4289-9A81-96C9F604E864}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -47,7 +46,6 @@ Global {73668181-7A26-435D-83E3-CF141AC8FD0B} = {1CBEF4C1-7D90-4A78-AA55-D81F1447A70E} {0894F054-5C4D-4DDD-A8E9-636416189234} = {AB312EE3-CBA4-469A-8694-67C5466298C5} {902D54CF-CD5F-4932-B1DC-01A3937AC054} = {1CBEF4C1-7D90-4A78-AA55-D81F1447A70E} - {692DD081-BA36-4289-9A81-96C9F604E864} = {1CBEF4C1-7D90-4A78-AA55-D81F1447A70E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {61F7FB11-1E47-470C-91E2-47F8143E1572} diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj index 9b36d9af..c9047353 100644 --- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj +++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj @@ -192,7 +192,7 @@ false - ios-arm64 + true