WIP

aritchie · Apr 2, 2024 · b3029d9 · b3029d9
1 parent 90957a0
commit b3029d9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
           dotnet-version: '8.0.201'
 
     - name: Add .NET Workloads
-      run: dotnet workload install maui
+      run: dotnet workload install maui macos
 
     - name: Build
       run: dotnet build Build.slnf /restore -m -property:Configuration=Release -property:PublicRelease=true

diff --git a/sample/Sample/Pages/MainPage.xaml b/sample/Sample/Pages/MainPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <TabbedPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-            xmlns:samples="clr-namespace:Samples;"
+            xmlns:samples="clr-namespace:Samples"
             x:Class="Samples.MainPage"
             Title="ACR UserDialogs">
     <TabbedPage.Children>

diff --git a/sample/Sample/Pages/ProgressPage.xaml b/sample/Sample/Pages/ProgressPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace=Samples.ViewModels"
              x:Class="Samples.ProgressPage"
              Title="Progress">
     <ContentPage.Content>

diff --git a/sample/Sample/Pages/SettingsPage.xaml b/sample/Sample/Pages/SettingsPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace=Samples.ViewModels"
              x:Class="Samples.SettingsPage"
              Title="Settings/Themes">
     <ContentPage.Content>

diff --git a/sample/Sample/Pages/SpecificCasesPage.xaml b/sample/Sample/Pages/SpecificCasesPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace=Samples.ViewModels"
              x:Class="Samples.SpecificCasesPage"
              Title="Specific Cases">
     <ContentPage.Content>

diff --git a/sample/Sample/Pages/StandardPage.xaml b/sample/Sample/Pages/StandardPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace=Samples.ViewModels"
              x:Class="Samples.StandardPage"
              Title="Standard Dialogs">
     <ContentPage.Content>

diff --git a/sample/Sample/Pages/ToastsPage.xaml b/sample/Sample/Pages/ToastsPage.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace=Samples.ViewModels"
              x:Class="Samples.ToastsPage"
              Title="Toasts">
     <ContentPage.Content>

diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst;net8.0-macos</TargetFrameworks>
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows</TargetFrameworks>
         <PackageProjectUrl>https://github.com/aritchie/userdialogs</PackageProjectUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <Authors>Allan Ritchie</Authors>
@@ -28,8 +28,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="$(MSBuildThisFileDirectory)nuget.png" Pack="true" PackagePath="icon.png" />
-        <None Include="$(MSBuildThisFileDirectory)nuget.txt" Pack="true" PackagePath="readme.txt" />
+        <None Include="$(SolutionDir)icon.png" Pack="true" PackagePath="icon.png" />
+        <None Include="$(SolutionDir)readme.md" Pack="true" PackagePath="readme.md" />
         <None Include="Platforms\**\*.*" />
         <Compile Remove="Platforms\**\*.*" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
@@ -39,25 +39,25 @@
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.Contains('android')) ">
+    <ItemGroup Condition="$(TargetFramework.Contains('android'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Android\**\*.cs" />
         <PackageReference Include="AndHUD" Version="2.0.1" />
         <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.Contains('ios')) OR $(TargetFramework.Contains('catalyst')) ">
+    <ItemGroup Condition="$(TargetFramework.Contains('ios')) OR $(TargetFramework.Contains('catalyst'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\ios\**\*.cs" />
         <PackageReference Include="BTProgressHUD" Version="2.0.1" />
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('macos')) ">
+    <ItemGroup Condition="$(TargetFramework.StartsWith('macos'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\macOS\**\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('windows')) ">
+    <ItemGroup Condition="$(TargetFramework.StartsWith('windows'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Windows\**\*.cs" />
         <Page Include="Platforms\Windows\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />