Some windows fixes

Baseflow · Dec 8, 2022 · 35b27f7 · 35b27f7
1 parent 099c802
commit 35b27f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj
@@ -25,8 +25,10 @@
     <Description>Cross platform Xamarin plugin to play and control Audio and Video</Description>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And '$(OS)' == 'Windows_NT'">
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And $([MSBuild]::IsOSPlatform('windows'))">
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,11 +39,12 @@
     <None Include="readme.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And '$(OS)' == 'Windows_NT'">
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And $([MSBuild]::IsOSPlatform('windows'))">
     <Compile Include="Platforms\Uap\**\*.cs" />
     <Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
     <None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">

diff --git a/MediaManager/Platforms/Uap/Video/VideoView.xaml.cs b/MediaManager/Platforms/Uap/Video/VideoView.xaml.cs
@@ -1,5 +1,6 @@
 using MediaManager.Video;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
+//using Windows.UI.Xaml.Controls;
 
 namespace MediaManager.Platforms.Uap.Video
 {