添加 C#/WinRT 支持

wherewhere · Jul 30, 2024 · 52c7eb6 · 52c7eb6
1 parent b670500
commit 52c7eb6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/MicaForUWP/Media/BackdropBlurBrush.cs b/MicaForUWP/Media/BackdropBlurBrush.cs
@@ -19,7 +19,7 @@ namespace MicaForUWP.Media
 #if WINRT
     sealed
 #endif
-    public class BackdropBlurBrush : XamlCompositionBrushBase
+    public partial class BackdropBlurBrush : XamlCompositionBrushBase
     {
         private bool _isForce = true;
 

diff --git a/MicaForUWP/Media/BackdropMicaBrush.cs b/MicaForUWP/Media/BackdropMicaBrush.cs
@@ -19,7 +19,7 @@ namespace MicaForUWP.Media
 #if WINRT
     sealed
 #endif
-    public class BackdropMicaBrush : XamlCompositionBrushBase
+    public partial class BackdropMicaBrush : XamlCompositionBrushBase
     {
         private bool _isForce = true;
 

diff --git a/MicaForUWP/MicaForUWP.csproj b/MicaForUWP/MicaForUWP.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <FullTargets Condition="'$(FullTargets)' == ''">true</FullTargets>
+    <AddCSWinRT Condition="'$(AddCSWinRT)' == ''">false</AddCSWinRT>
     <NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
     <Authors>wherewhere</Authors>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <Copyright>Copyright © 2017 - 2024 wherewhere. All Rights Reserved.</Copyright>
-    <CsWinRTIncludes>Microsoft.Graphics.Canvas</CsWinRTIncludes>
     <Deterministic>true</Deterministic>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -22,10 +22,10 @@
 
   <PropertyGroup>
     <ExtrasUwpMetaPackageVersion>6.2.14</ExtrasUwpMetaPackageVersion>
-    <LangVersion Condition="'$(TargetFramework)' != 'net6.0-windows10.0.22000.0'">7.3</LangVersion>
-    <LangVersion Condition="'$(TargetFramework)' == 'net6.0-windows10.0.22000.0'">latest</LangVersion>
-    <TargetFramework Condition="'$(FullTargets)' != 'true'">uap10.0</TargetFramework>
-    <TargetFrameworks Condition="'$(FullTargets)' == 'true'">native;netcoreapp3.1;uap10.0;uap10.0.15138.0</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
+    <TargetFrameworks>uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(FullTargets)' == 'true'">$(TargetFrameworks);native;netcoreapp3.1;uap10.0.15138.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(AddCSWinRT)' == 'true'">$(TargetFrameworks);net6.0-windows10.0.22000.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -46,6 +46,12 @@
     <NuspecProperties>id=$(AssemblyName);version=$(VersionPrefix);title=$(Title);authors=$(Authors);requireLicenseAcceptance=$(PackageRequireLicenseAcceptance);license=$(PackageLicenseExpression);icon=$(PackageIcon);readme=$(PackageReadmeFile);projectUrl=$(PackageProjectUrl);iconUrl=$(PackageIconUrl);description=$(Description);releaseNotes=$(PackageReleaseNotes);copyright=$(Copyright);repositoryType=$(RepositoryType);repositoryUrl=$(PackageProjectUrl);repositoryCommit=$(RepositoryCommit);buildOutput=bin\$(Configuration)</NuspecProperties>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows10.0.17763.0'))">
+    <CsWinRTIncludes>Microsoft.Graphics.Canvas</CsWinRTIncludes>
+    <LangVersion>latest</LangVersion>
+    <WindowsSdkPackageVersion>10.0.22000.37-preview</WindowsSdkPackageVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Win2D.uwp" Version="1.27.1" />
   </ItemGroup>
@@ -58,9 +64,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows10.0.22000.0'">
-    <PackageReference Include="Dongle.Windows.CsWinRT" Version="3.0.0-wux.2" />
-    <PackageReference Include="Dongle.WindowsSDK.NET" Version="10.0.22621.756" />
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows10.0.17763.0'))">
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240722.1" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">