diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index 7871d7f0..3ce829f4 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
@@ -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:
@@ -152,7 +164,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 +217,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_android.yml b/.github/workflows/pullrequest_android.yml
index f5185673..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.*
+ dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true
- uses: actions/setup-java@v2
diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml
index 3db5c786..20df7389 100644
--- a/.github/workflows/pullrequest_ios.yml
+++ b/.github/workflows/pullrequest_ios.yml
@@ -19,10 +19,14 @@ jobs:
- 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:
- 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..ea3c4051 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.*
+ 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: |
@@ -37,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
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 @@
-
+
-
-
+
+
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 @@
-
-
+
+
-
+