:|

Author: StuartFerguson

.github/workflows/windows_navigation_tests.yml

@@ -39,7 +39,7 @@ jobs:
         run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --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  -f net9.0-android -c Release --no-restore
+        run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj  -f net9.0-windows10.0.19041.0 -c Release --no-restore
 
       - name: Decrypt PFX File
         run: |

TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj

@@ -18,8 +18,8 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
+		<!--<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>-->
 		<DebugType>Full</DebugType>
 		<ImplicitUsings>enable</ImplicitUsings>
 
@@ -53,8 +53,13 @@
 		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />
 		<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.11" />
 		<PackageReference Include="MetroLog.Maui" Version="2.1.0" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
 	</ItemGroup>
 
+	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+	</PropertyGroup>
+
 	<ItemGroup Condition="'$(TargetFramework)' != 'net9.0-ios'">
 		<PackageReference Include="Microsoft.AppCenter" Version="5.0.7" />
 		<PackageReference Include="Microsoft.AppCenter.Distribute" Version="5.0.7" />
@@ -84,14 +89,12 @@
 		</PackageReference>
 	</ItemGroup>
 
+	<Target Name="RemoveDuplicatePdbs" AfterTargets="ResolvePublishFiles">
+		<ItemGroup>
+			<ResolvedFileToPublish Remove="@(ResolvedFileToPublish)"
+			                       Condition="'%(ResolvedFileToPublish.RelativePath)' == 'TransactionMobile.Maui.BusinessLogic.pdb'
+      and '%(ResolvedFileToPublish.TargetPath)' == 'TransactionMobile.Maui.BusinessLogic.pdb'" />
+		</ItemGroup>
+	</Target>
 
-	<!--<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
-		<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.14" />
-		<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.14" />
-	</ItemGroup>-->
-
-
-	<ItemGroup>
-	  <PackageReference Update="Microsoft.Maui.Controls" Version="9.0.70" />
-	</ItemGroup>
 </Project>

TransactionMobile.Maui/Platforms/Windows/Package.appxmanifest

@@ -8,7 +8,7 @@
 
   <Identity
     Name="TransactionMobile"
-    Publisher="CN=TransactionProcessing" Version="1.0.0.0"/>
+    Publisher="CN=TransactionProcessing" Version="1.0.5.0"/>
 
   <Properties>
     <DisplayName>TransactionMobile</DisplayName>

TransactionMobile.Maui/TransactionMobile.Maui.csproj

@@ -13,14 +13,10 @@
 		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">
-		<RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>TransactionMobile.Maui</RootNamespace>
-		<UseMaui>true</UseMaui>
+		<!--<UseMaui>true</UseMaui>-->
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PublishReadyToRun>false</PublishReadyToRun>
@@ -39,7 +35,14 @@
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<PackageCertificateThumbprint>376AD93CB29454751B808E6883ED14E377D979F2</PackageCertificateThumbprint>
-		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+		<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+		<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
+		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+		<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+		<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+		<GenerateTestArtifacts>True</GenerateTestArtifacts>
+		<AppInstallerUri>c:\temp</AppInstallerUri>
+		<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -262,9 +265,13 @@
   </ItemGroup>
 
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
-    <RuntimeIdentifiers>maccatalyst-x64</RuntimeIdentifiers>
+	  <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
+	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+	</PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
     <AndroidPackageFormat>apk</AndroidPackageFormat>
   </PropertyGroup>
@@ -294,9 +301,10 @@
     <Optimize>False</Optimize>
   </PropertyGroup>
 
-  <ItemGroup>
-	<Content Remove="**\WindowRootViewStyle.xbf" />
-	<None Remove="**\WindowRootViewStyle.xbf" />
-  </ItemGroup>
+	<Target Name="RemoveWindowRootViewStyleXbf" BeforeTargets="GenerateProjectPriFile">
+		<ItemGroup>
+			<PRIResource Remove="@(PRIResource)" Condition="'%(PRIResource.Identity)' == 'Files/Microsoft.Maui/Platform/Windows/Styles/WindowRootViewStyle.xbf'" />
+		</ItemGroup>
+	</Target>
 
 </Project>