WinUI 3 - Reunion 0.5.6.

Author: azchohfi

CommunityToolkit.WinUI.SampleApp.Package/CommunityToolkit.WinUI.SampleApp.Package.wapproj

@@ -126,10 +126,10 @@
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.0]">
+    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.6]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.0]">
+    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.6]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
   </ItemGroup>

CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj

@@ -43,10 +43,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.ProjectReunion" Version="$(MicrosoftProjectReunionVersion)" />
   </ItemGroup>
-  <ItemGroup>
-    <!-- Temporary fix for https://github.com/microsoft/microsoft-ui-xaml/issues/4414 -->
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.16" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="landingPageLinks.json" />
     <Content Include="Assets\mtns.csv" />

Directory.Build.props

@@ -21,7 +21,7 @@
     <TargetPlatformRevision>18362</TargetPlatformRevision>
     <TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
     <SupportedOSPlatformVersion>10.0.$(TargetPlatformMinRevision).0</SupportedOSPlatformVersion>
-    <MicrosoftProjectReunionVersion>0.5.0</MicrosoftProjectReunionVersion>
+    <MicrosoftProjectReunionVersion>0.5.6</MicrosoftProjectReunionVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
     <!-- Remove after https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3285 is merged, as this is already in our .editorconfig -->
     <NoWarn>SA1101;SA1633;SA1202;SA1600;SA1413;SA1611;SA1629;SA1201;SA1309;SA1310;SA1602</NoWarn>

UITests/UITests.App.Package/UITests.App.Package.wapproj

@@ -84,10 +84,10 @@
     <AppxPlatform Condition="'$(AppxPlatform)' == ''">$(Platform)</AppxPlatform>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.0]">
+    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.6]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.0]">
+    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.6]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
   </ItemGroup>

UITests/UITests.App/UITests.App.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.Internal.MUXAppTestHelpers.WinUI">
       <Version>3.0.0-zmain.210407.3-CI</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.0" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Grpc" Version="2.36.4" />
     <PackageReference Include="Google.Protobuf" Version="3.15.7" />

UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj

@@ -40,13 +40,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.NET.Ref" Version="10.0.19041.16" GeneratePathProperty="true">
-      <NoWarn>
-        NU1701; <!-- Package 'x' was restored using 'y' instead of the project target framework 'z'. This package may not be fully compatible with your project. -->
-      </NoWarn>
-      <ExcludeAssets>all</ExcludeAssets>
-    </PackageReference>
-    
     <PackageReference Include="Microsoft.Internal.MUXTestInfra.TAEF" Version="3.0.0-zmain.210407.3-CI" />
     <PackageReference Include="TAEF.Redist.Wlk" Version="10.57.200928001" GeneratePathProperty="true" />
     <PackageReference Include="Grpc.Tools" Version="2.36.4" />

UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj

@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.2" />
-    <PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0" />
+    <PackageReference Include="Microsoft.ProjectReunion" Version="0.5.6" />
   </ItemGroup>
 
   <ItemGroup>

build/Windows.Toolkit.Uwp.Build.targets

@@ -11,6 +11,8 @@
       </PropertyGroup>
       <ItemGroup Condition="'$(IsWinUIProject)' == 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'">
         <PackageReference Include="Microsoft.ProjectReunion" Version="$(MicrosoftProjectReunionVersion)" />
+        <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.$(TargetPlatformRevision).16" />
+        <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.$(TargetPlatformRevision).16" />
       </ItemGroup>
     </When>
   </Choose>