TransactionProcessing · StuartFerguson · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022
diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml
@@ -33,14 +33,14 @@ jobs:
       #  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: 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=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true  /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json 
+      - name: Build Code
+        run: msbuild TransactionMobile.Maui.sln  -restore -p:Configuration=Release  -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.Tests/TransactionMobile.Maui.Tests.csproj
+      - 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

diff --git a/TransactionMobile.Maui.BusinessLogic/AssemblyInfo.cs b/TransactionMobile.Maui.BusinessLogic/AssemblyInfo.cs
diff --git a/TransactionMobile.Maui.BusinessLogic/Platforms/Android/PlatformClass1.cs b/TransactionMobile.Maui.BusinessLogic/Platforms/Android/PlatformClass1.cs
@@ -0,0 +1,7 @@
+namespace TransactionMobile.Maui.BusinessLogic2
+{
+    // All the code in this file is only included on Android.
+    public class PlatformClass1
+    {
+    }
+}
diff --git a/TransactionMobile.Maui.BusinessLogic/Platforms/MacCatalyst/PlatformClass1.cs b/TransactionMobile.Maui.BusinessLogic/Platforms/MacCatalyst/PlatformClass1.cs
@@ -0,0 +1,7 @@
+namespace TransactionMobile.Maui.BusinessLogic2
+{
+    // All the code in this file is only included on Mac Catalyst.
+    public class PlatformClass1
+    {
+    }
+}
diff --git a/TransactionMobile.Maui.BusinessLogic/Platforms/Windows/PlatformClass1.cs b/TransactionMobile.Maui.BusinessLogic/Platforms/Windows/PlatformClass1.cs
@@ -0,0 +1,7 @@
+namespace TransactionMobile.Maui.BusinessLogic2
+{
+    // All the code in this file is only included on Windows.
+    public class PlatformClass1
+    {
+    }
+}
diff --git a/TransactionMobile.Maui.BusinessLogic/Platforms/iOS/PlatformClass1.cs b/TransactionMobile.Maui.BusinessLogic/Platforms/iOS/PlatformClass1.cs
@@ -0,0 +1,7 @@
+namespace TransactionMobile.Maui.BusinessLogic2
+{
+    // All the code in this file is only included on iOS.
+    public class PlatformClass1
+    {
+    }
+}
diff --git a/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj b/TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj
@@ -1,11 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-	<UseMaui>true</UseMaui>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="MediatR" Version="10.0.1" />

diff --git a/TransactionMobile.Maui.sln b/TransactionMobile.Maui.sln
@@ -9,10 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1CBEF4C1-7D9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AB312EE3-CBA4-469A-8694-67C5466298C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TransactionMobile.Maui.BusinessLogic", "TransactionMobile.Maui.BusinessLogic\TransactionMobile.Maui.BusinessLogic.csproj", "{CC820A65-AC8B-4E42-8BB1-21F5EB348995}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransactionMobile.Maui.BusinessLogic.Tests", "TransactionMobile.Maui.BusinessLogic.Tests\TransactionMobile.Maui.BusinessLogic.Tests.csproj", "{0894F054-5C4D-4DDD-A8E9-636416189234}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransactionMobile.Maui.BusinessLogic", "TransactionMobile.Maui.BusinessLogic\TransactionMobile.Maui.BusinessLogic.csproj", "{902D54CF-CD5F-4932-B1DC-01A3937AC054}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,22 +25,22 @@ Global
 		{73668181-7A26-435D-83E3-CF141AC8FD0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73668181-7A26-435D-83E3-CF141AC8FD0B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73668181-7A26-435D-83E3-CF141AC8FD0B}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{CC820A65-AC8B-4E42-8BB1-21F5EB348995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC820A65-AC8B-4E42-8BB1-21F5EB348995}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC820A65-AC8B-4E42-8BB1-21F5EB348995}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC820A65-AC8B-4E42-8BB1-21F5EB348995}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0894F054-5C4D-4DDD-A8E9-636416189234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0894F054-5C4D-4DDD-A8E9-636416189234}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0894F054-5C4D-4DDD-A8E9-636416189234}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0894F054-5C4D-4DDD-A8E9-636416189234}.Release|Any CPU.Build.0 = Release|Any CPU
+		{902D54CF-CD5F-4932-B1DC-01A3937AC054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{73668181-7A26-435D-83E3-CF141AC8FD0B} = {1CBEF4C1-7D90-4A78-AA55-D81F1447A70E}
-		{CC820A65-AC8B-4E42-8BB1-21F5EB348995} = {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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {61F7FB11-1E47-470C-91E2-47F8143E1572}

diff --git a/TransactionMobile.Maui/Pages/LoginPage.xaml b/TransactionMobile.Maui/Pages/LoginPage.xaml
@@ -5,8 +5,6 @@
              Title="LoginPage"
              Shell.NavBarIsVisible="False"
              Shell.FlyoutItemIsVisible="False"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/viewmodels"
-             x:DataType="viewmodels:LoginPageViewModel"
              BackgroundColor="White">
     <ContentPage.Content>
         <StackLayout>

diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml
@@ -2,8 +2,6 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.MobileTopupFailedPage"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:MobileTopupFailedPageViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
     <StackLayout>

diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml
@@ -2,8 +2,6 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.MobileTopupPerformTopupPage"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:MobileTopupPerformTopupPageViewModel"
              xmlns:behaviors="clr-namespace:CommunityToolkit.Maui.Behaviors;assembly=CommunityToolkit.Maui"
              Title="{Binding Title}"
              BackgroundColor="White">

diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml
@@ -2,8 +2,6 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.MobileTopupSelectOperatorPage"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:MobileTopupSelectOperatorPageViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
     <StackLayout>

diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml
@@ -2,8 +2,6 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.MobileTopupSelectProductPage"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:MobileTopupSelectProductPageViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
     <StackLayout>

diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml
@@ -2,8 +2,6 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.MobileTopupSuccessPage"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:MobileTopupSuccessPageViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
     <StackLayout>

diff --git a/TransactionMobile.Maui/Pages/Transactions/TransactionsPage.xaml b/TransactionMobile.Maui/Pages/Transactions/TransactionsPage.xaml
@@ -3,8 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TransactionMobile.Maui.Pages.Transactions.TransactionsPage"
              Shell.NavBarIsVisible="True"
-             xmlns:viewmodels="http://transactionmobile.maui.com/schemas/transactionsviewmodels"
-             x:DataType="viewmodels:TransactionsPageViewModel"
              Title="{Binding Title}"
              BackgroundColor="White">
     <StackLayout>

diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj
@@ -53,7 +53,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="1.0.0-pre6" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="1.0.0-pre7" />
 		<PackageReference Include="MediatR" Version="10.0.1" />
 		<PackageReference Include="Refractored.MvvmHelpers" Version="1.6.2" />
 	</ItemGroup>