From d66e80f0fb80d8959a72ebfa8c4b4c7cd9e8f73c Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 08:05:00 +0100 Subject: [PATCH 01/10] APK Fix --- TransactionMobile.Maui/MauiProgram.cs | 2 +- TransactionMobile.Maui/TransactionMobile.Maui.csproj | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/TransactionMobile.Maui/MauiProgram.cs b/TransactionMobile.Maui/MauiProgram.cs index 58bb36c7..c8d6597b 100644 --- a/TransactionMobile.Maui/MauiProgram.cs +++ b/TransactionMobile.Maui/MauiProgram.cs @@ -16,7 +16,7 @@ public static class MauiProgram private static MauiAppBuilder Builder; public static MauiApp CreateMauiApp() { -#if ANDROID && DEBUG +#if ANDROID Platforms.Services.DangerousAndroidMessageHandlerEmitter.Register(); Platforms.Services.DangerousTrustProvider.Register(); #endif diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj index 74e60266..7a8a4a51 100644 --- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj +++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj @@ -28,6 +28,7 @@ 21.0 10.0.17763.0 10.0.17763.0 + False @@ -49,12 +50,12 @@ - - + + - + From c1d54c57aeddff9c50123c892eebc9f1071ee7a4 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 08:55:46 +0100 Subject: [PATCH 02/10] Update SQL Lite nugets --- .../TransactionMobile.Maui.BusinessLogic.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj b/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj index eafdbbfd..3501235e 100644 --- a/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj +++ b/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj @@ -24,9 +24,9 @@ - + - - + + From aa58a31fa32e08e4ecd575aa64cf4cf3ff724d59 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 10:02:09 +0100 Subject: [PATCH 03/10] testing --- .github/workflows/pullrequest_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml index f5185673..8fe43d2f 100644 --- a/.github/workflows/pullrequest_android.yml +++ b/.github/workflows/pullrequest_android.yml @@ -28,7 +28,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300 include-prerelease: true - uses: actions/setup-java@v2 From bd9145865c9b9cab4b3220ef2b2b6951b2944440 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 10:04:08 +0100 Subject: [PATCH 04/10] another test --- .github/workflows/pullrequest_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml index 8fe43d2f..ff8e3c61 100644 --- a/.github/workflows/pullrequest_android.yml +++ b/.github/workflows/pullrequest_android.yml @@ -28,7 +28,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.300 + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - uses: actions/setup-java@v2 From 77a4b796adca38bb3c0161459a3d5fe66db104c1 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 10:15:20 +0100 Subject: [PATCH 05/10] Workflow tweaks --- .github/workflows/createrelease.yml | 8 ++++---- .github/workflows/pullrequest_ios.yml | 2 +- .github/workflows/pullrequest_maccatalyst.yml | 2 +- .github/workflows/pullrequest_windows.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index 7871d7f0..6a8177e5 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -34,7 +34,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - uses: actions/setup-java@v2 @@ -95,7 +95,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - uses: actions/setup-java@v2 @@ -152,7 +152,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - name: Install MAUI Workloads @@ -205,7 +205,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - name: Install MAUI Workloads diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 3db5c786..053f9db7 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - name: Install MAUI Workloads diff --git a/.github/workflows/pullrequest_maccatalyst.yml b/.github/workflows/pullrequest_maccatalyst.yml index 1c034769..433d6dbe 100644 --- a/.github/workflows/pullrequest_maccatalyst.yml +++ b/.github/workflows/pullrequest_maccatalyst.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - name: Install MAUI Workloads diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index f17ddcb5..9160fd69 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.* + dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - name: Setup MSBuild From d169659d95d96e519d69c8db4bb40181edaf7f0f Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 12:49:53 +0100 Subject: [PATCH 06/10] .. --- .github/workflows/pullrequest_ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 053f9db7..ddeb8b06 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -13,7 +13,7 @@ env: jobs: # MAUI iOS Build build-ios: - runs-on: macos-11 + runs-on: macos-12 name: iOS Build steps: - name: Checkout From 0e6c0835cc6ebab14801c8629bcd57b9d2a3610f Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 16:49:35 +0100 Subject: [PATCH 07/10] windows pr tweak --- .github/workflows/pullrequest_windows.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 9160fd69..5be2f9d1 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -19,16 +19,19 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.300-preview.22204.3 include-prerelease: true - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 - with: - vs-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: | From 2c0601dccdaa367f240ecbe97b6c20e563db77f1 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 16:50:44 +0100 Subject: [PATCH 08/10] update ios flow --- .github/workflows/pullrequest_ios.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index ddeb8b06..20df7389 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -13,12 +13,16 @@ env: jobs: # MAUI iOS Build build-ios: - runs-on: macos-12 + runs-on: macos-11 name: iOS Build steps: - name: Checkout uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '13.3' + - name: Setup .NET 6 uses: actions/setup-dotnet@v2 with: From e1db3bc103e9a1dbeb13572edb5a099e4cceaceb Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 17:45:54 +0100 Subject: [PATCH 09/10] another windows tweak --- .github/workflows/pullrequest_windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 5be2f9d1..ea3c4051 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -40,8 +40,11 @@ jobs: - 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: 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 + 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" - name: Run Unit Tests run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj From 72e6125b6ce609bd50bd093d2009281ed0d6eff9 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 14 Apr 2022 18:02:57 +0100 Subject: [PATCH 10/10] update release workflow --- .github/workflows/createrelease.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index 6a8177e5..3ce829f4 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -103,6 +103,9 @@ jobs: distribution: 'microsoft' java-version: '11' + - 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 @@ -110,6 +113,15 @@ jobs: - 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: 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" + + - name: Restore Dependencies + run: dotnet restore TransactionMobile.Maui.sln + - name: Set Application Version uses: TransactionProcessing/actions@1.0.0 with: