Merged PR 2464546: Updates for compatibility with RS5.

Updates for compatibility with RS5.
- Fixed crash when adding a layer on RS5
- Fixed new build warnings from bindings
- Fix release crash due to Native C# toolchain being configured

Demos/MaterialCreator/Dialogs/ThreeButtonDialog.xaml

@@ -10,11 +10,11 @@
 
     <Grid>
         <StackPanel Orientation="Vertical">
-            <TextBlock x:Name="MessageText" Text="{x:Bind Message, Mode=OneWay}" HorizontalAlignment="Stretch"/>
+            <TextBlock x:Name="MessageText" Text="{x:Bind Message, Mode=OneTime}" HorizontalAlignment="Stretch"/>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="0,40,0,0">
-                <Button x:Name="PrimaryButton" Content="{x:Bind FirstButtonText, Mode=OneWay}" Style="{x:Bind PrimaryButtonStyle}" Margin="0,0,5,0" Padding="50,5,50,5" Click="PrimaryButton_Click"></Button>
-                <Button x:Name="SecondaryButton" Content="{x:Bind SecondButtonText, Mode=OneWay}" Style="{x:Bind SecondaryButtonStyle}" Margin="0,0,5,0" Padding="50,5,50,5" Click="SecondaryButton_Click"></Button>
-                <Button x:Name="TernaryButton" Content="{x:Bind ThirdButtonText, Mode=OneWay}" Style="{x:Bind SecondaryButtonStyle}" Margin="0,0,0,0" Padding="50,5,50,5" Click="TernaryButton_Click"></Button>
+                <Button x:Name="PrimaryButton" Content="{x:Bind FirstButtonText, Mode=OneTime}" Style="{x:Bind PrimaryButtonStyle}" Margin="0,0,5,0" Padding="50,5,50,5" Click="PrimaryButton_Click"></Button>
+                <Button x:Name="SecondaryButton" Content="{x:Bind SecondButtonText, Mode=OneTime}" Style="{x:Bind SecondaryButtonStyle}" Margin="0,0,5,0" Padding="50,5,50,5" Click="SecondaryButton_Click"></Button>
+                <Button x:Name="TernaryButton" Content="{x:Bind ThirdButtonText, Mode=OneTime}" Style="{x:Bind SecondaryButtonStyle}" Margin="0,0,0,0" Padding="50,5,50,5" Click="TernaryButton_Click"></Button>
             </StackPanel>
         </StackPanel>
     </Grid>

Demos/MaterialCreator/Dialogs/ViewEffectDialog.xaml

@@ -11,6 +11,6 @@
     PrimaryButtonClick="ContentDialog_PrimaryButtonClick">
 
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-        <TextBox Text="{x:Bind EffectText, Mode=OneWay}" IsReadOnly="True" TextWrapping="Wrap"/>
+        <TextBox Text="{x:Bind EffectText, Mode=OneTime}" IsReadOnly="True" TextWrapping="Wrap"/>
     </ScrollViewer>
 </ContentDialog>

Demos/MaterialCreator/MaterialCreator.csproj

@@ -11,13 +11,12 @@
     <AssemblyName>MaterialCreator</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>MaterialCreator_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -40,7 +39,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -63,7 +62,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -86,7 +85,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -200,10 +199,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.2.3</Version>
+      <Version>6.1.9</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
-      <Version>1.21.0</Version>
+      <Version>1.23.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -219,6 +218,9 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SamplesCommon/SamplesCommon/ImageLoader/TextDrawer.cs

@@ -39,6 +39,7 @@ namespace SamplesCommon
             _backgroundColor = bgColor;
         }
 
+#pragma warning disable 1998
         public async Task Draw(CompositionGraphicsDevice device, Object drawingLock, CompositionDrawingSurface surface, Size size)
         {
             using (var ds = CanvasComposition.CreateDrawingSession(surface))

SamplesCommon/SamplesCommon/SamplesCommon.csproj

@@ -16,6 +16,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\CommonBuild.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -108,7 +109,6 @@
     <None Include="CommonBuild.props">
       <SubType>Designer</SubType>
     </None>
-    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackDrop.cs" />
@@ -156,6 +156,14 @@
       <Name>SamplesNative</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Win2D.uwp">
+      <Version>1.16.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

SamplesCommon/SamplesCommon/project.json

@@ -1,17 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
-    "Win2D.uwp": "1.16.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}