Fix local build and tests for UWP

Win2D.proj

@@ -99,54 +99,21 @@
   <Target Name="Build"
           DependsOnTargets="BuildProjects; CheckCode; BuildDocs; RunTests" />
 
-
-  <!-- TargetPlatformMinVersion 10.0.16299.0 and 10.0.10240 Platforms must be build separately. -->
-  <Target Name="BuildProjects" DependsOnTargets="BuildProjects10240" />
-
-
-  <!-- Since ARM64 requires a TargetPlatformMinVersion of at least 10.0.16299.0,
-       its NuGet restore and subsequent build need to run separately from the other
-       (10240) platforms.
-
-       In order to minimize refactoring of the existing build, this is done just after
-       the existing Platform targets build. This is done by adding !='ARM64' Conditions
-       to RestoreNuGetPackages and BuildProjects, duplicating them with =='ARM64'
-       Conditions, then stitching them into the target graph just after BuildProjects.
-       -->
   <Target Name="BuildProjectsPrelim" DependsOnTargets="PrepareVersionInfo; ChooseProjectsToBuild; ChooseConfigurationsToRestore" />
-  <!-- Duplicate BuildProjects for just ARM64 -->
-  <Target Name="BuildProjects16299"
-          DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages16299"
-          Inputs="@(ProjectsToBuild)"
-          Outputs="%(PlatformIndependentName)">
-
-    <Message Text="Building TargetPlatformMinVersion 16299 variants of project %(ProjectsToBuild.PlatformIndependentName):"
-             Importance="High" />
-    <Message Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))"
-             Importance="High"
-             Condition="'%(ProjectsToBuild.Platform)'=='ARM64'" />
-
-    <MSBuild Projects="@(ProjectsToBuild)"
-             BuildInParallel="%(ProjectsToBuild.BuildInParallel)"
-             Properties="IncludeVersionInfo=true"
-             Condition="'%(ProjectsToBuild.Platform)'=='ARM64'" />
-  </Target>
-
 
   <!-- Use batching to build each project in turn -->
-  <Target Name="BuildProjects10240"
-          DependsOnTargets="BuildProjectsPrelim; BuildProjects16299; RestoreNuGetPackages10240"
+  <Target Name="BuildProjects"
+          DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages"
           Inputs="@(ProjectsToBuild)"
           Outputs="%(PlatformIndependentName)">
 
-    <Message Importance="High" Text="Building TargetPlatformMinVersion 10240 variants of project %(ProjectsToBuild.PlatformIndependentName):" />
-    <Message Importance="High" Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" Condition="'%(ProjectsToBuild.Platform)'!='ARM64'" />
+    <Message Importance="High" Text="Building all variants of project %(ProjectsToBuild.PlatformIndependentName):" />
+    <Message Importance="High" Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />
 
     <!-- All the variants (platform and configuration) of most projects can be built in parallel -->
     <MSBuild Projects="@(ProjectsToBuild)"
              BuildInParallel="%(ProjectsToBuild.BuildInParallel)"
-             Properties="IncludeVersionInfo=true"
-             Condition="'%(ProjectsToBuild.Platform)'!='ARM64'" />
+             Properties="IncludeVersionInfo=true" />
   </Target>
 
 
@@ -332,7 +299,7 @@
         <Configuration>%(BuildConfiguration.Identity)</Configuration>
       </ConfigToRestore>
 
-      <NuGetRestore Include="@(ConfigToRestore)" Condition="%(BuildPlatform.Identity) != AnyCPU">
+      <NuGetRestore Include="@(ConfigToRestore)">
         <Platform>%(BuildPlatform.Identity)</Platform>
       </NuGetRestore>
 

build/Win2D.cpp.props

@@ -54,13 +54,7 @@
 
   <PropertyGroup>
     <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' != 'ARM64'">
-    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

build/Win2D.cs.props

@@ -17,11 +17,6 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' != 'ARM64'">
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
   </PropertyGroup>
 

build/nuget-restore.targets

@@ -51,11 +51,7 @@
 
 
   <Target Name="RestoreNuGetPackagesPrelim" DependsOnTargets="FindNuGet; CheckNuGetVersion" Condition="'@(NuGetRestore)' != ''" />
-  <Target Name="RestoreNuGetPackages10240" DependsOnTargets="RestoreNuGetPackagesPrelim" Condition="'@(NuGetRestore)' != ''">
-    <Exec Command="(set PLATFORM=%(NuGetRestore.Platform)) &amp; (set CONFIGURATION=%(NuGetRestore.Configuration)) &amp; $(NuGetCommand) restore %(NuGetRestore.Identity) -SolutionDirectory $(MsBuildThisFileDirectory)..\ -Verbosity Detailed -NonInteractive" Condition="'%(NuGetRestore.Platform)'!='ARM64'" />
-  </Target>
-  <!-- Duplicate RestoreNuGetPackages for TargetPlatform 16299 flavors (ARM64); see Win2D.proj for details -->
-  <Target Name="RestoreNuGetPackages16299" DependsOnTargets="RestoreNuGetPackagesPrelim" Condition="'@(NuGetRestore)' != ''">
-    <Exec Command="(set PLATFORM=%(NuGetRestore.Platform)) &amp; (set CONFIGURATION=%(NuGetRestore.Configuration)) &amp; $(NuGetCommand) restore %(NuGetRestore.Identity) -SolutionDirectory $(MsBuildThisFileDirectory)..\ -Verbosity Detailed -NonInteractive" Condition="'%(NuGetRestore.Platform)'=='ARM64'"  />
+  <Target Name="RestoreNuGetPackages" DependsOnTargets="RestoreNuGetPackagesPrelim" Condition="'@(NuGetRestore)' != ''">
+    <Exec Command="(set PLATFORM=%(NuGetRestore.Platform)) &amp; (set CONFIGURATION=%(NuGetRestore.Configuration)) &amp; $(NuGetCommand) restore %(NuGetRestore.Identity) -SolutionDirectory $(MsBuildThisFileDirectory)..\ -Verbosity Detailed -NonInteractive" />
   </Target>
 </Project>

nuget.config

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
-    <add key="Win2D-Dependencies" value="https://pkgs.dev.azure.com/shine-oss/Win2D/_packaging/Win2D-Dependencies/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

release-nuget.config

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
-    <add key="Win2DWinUI" value="https://mscodehub.pkgs.visualstudio.com/Win2D/_packaging/Win2DWinUI/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

samples/CompositionExample/CompositionExample.csproj

@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

samples/CompositionExample/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="Win2DCompositionExample" Publisher="CN=Microsoft Corportation" Version="1.0.0.0" />
+  <Identity Name="Win2DCompositionExample" Publisher="CN=Win2DTemporaryKey" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="b6cfff57-2afa-4919-b308-d3c49d4f7a76" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Win2D Composition Example</DisplayName>

samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest

@@ -4,7 +4,7 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
-  <Identity Name="78d721be-030c-4374-917a-6bed9a1cfcf8" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
+  <Identity Name="78d721be-030c-4374-917a-6bed9a1cfcf8" Publisher="CN=Win2DTemporaryKey" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="AF6ED0F1-45A0-4D6F-812E-86FBF65F5617" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>
     <DisplayName>Win2D CoreWindow Example</DisplayName>

samples/CoreWindowExample/CoreWindowExample.uap.csproj

@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj

@@ -110,7 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.props" Condition="Exists('..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.props')" />
+  <Import Project="..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.props" Condition="Exists('..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.props')" />
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -46,15 +46,15 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\build\Win2D.cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.targets" Condition="Exists('..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.targets')" />
+    <Import Project="..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.targets" Condition="Exists('..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <!-- At some point directxtk_uwp dropped its props file.
-    <Error Condition="!Exists('..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.props'))" />
     -->
-    <Error Condition="!Exists('..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\directxtk_uwp.2019.4.26.1\build\native\directxtk_uwp.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\directxtk_uwp.2023.4.28.1\build\native\directxtk_uwp.targets'))" />
   </Target>
 </Project>

samples/ExampleGallery/Direct3DInterop/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="directxtk_uwp" version="2019.4.26.1" targetFramework="Native" />
+  <package id="directxtk_uwp" version="2023.4.28.1" targetFramework="Native" />
 </packages>

samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj

@@ -109,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

samples/ExampleGallery/ExampleGallery.uap.appxmanifest

@@ -4,7 +4,7 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
-  <Identity Name="Win2DExampleGallery-UAP" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
+  <Identity Name="Win2DExampleGallery-UAP" Publisher="CN=Win2DTemporaryKey" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="AF6ED0F1-45A0-4D6F-812E-86FBF65F5617" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>
     <DisplayName>Win2D Example Gallery</DisplayName>

samples/ExampleGallery/ExampleGallery.uap.csproj

@@ -127,7 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

samples/SimpleSample/SimpleSample.uap.appxmanifest

@@ -7,7 +7,7 @@
 
   <Identity
     Name="41567122-9c27-4c54-b64f-9dcc924450ad"
-    Publisher="CN=Microsoft Corporation"
+    Publisher="CN=Win2DTemporaryKey"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="41567122-9c27-4c54-b64f-9dcc924450ad" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

samples/SimpleSample/SimpleSample.uap.csproj

@@ -146,7 +146,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

tools/docs/BuildDocs.proj

@@ -62,7 +62,7 @@
 
 
   <!-- Compile the generated C# code to create new assemblies -->
-  <Target Name="CompileAPISurface" Condition="!$(IntellisenseOnly)" DependsOnTargets="RestoreNuGetPackages10240">
+  <Target Name="CompileAPISurface" Condition="!$(IntellisenseOnly)" DependsOnTargets="RestoreNuGetPackages">
     <PropertyGroup>
       <FrameworkRoot>$(MSBuildThisFileDirectory)..\..\packages\System.Runtime.4.0.20\ref\dotnet</FrameworkRoot>
     </PropertyGroup>
@@ -126,7 +126,7 @@
 
 
   <!-- Run the Sandcastle tool to create HTML reference documentation -->
-  <Target Name="RunSandcastle" Condition="!$(IntellisenseOnly)" DependsOnTargets="RestoreNuGetPackages10240">
+  <Target Name="RunSandcastle" Condition="!$(IntellisenseOnly)" DependsOnTargets="RestoreNuGetPackages">
     <MSBuild Projects="BuildDocs.shfbproj" />
   </Target>
 

winrt/projection/winrt.projection.csproj

@@ -52,7 +52,7 @@
 
   <!-- CsWinRT related properties for projections generation -->
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).54</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).57</WindowsSdkPackageVersion>
     <CSWinRTIncludes>
         Microsoft.Graphics.Canvas;
     </CSWinRTIncludes>
@@ -68,7 +68,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.6" />
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.2.0" />
   </ItemGroup>
 </Project>

winrt/test.external/winrt.test.external.uap.appxmanifest

@@ -6,7 +6,7 @@
   IgnorableNamespaces="uap mp">
 
   <Identity Name="48618ead-cca9-4d38-9fa8-9e2710f4d459"
-            Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+            Publisher="CN=Win2DTemporaryKey"
             Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="48618ead-cca9-4d38-9fa8-9e2710f4d459" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

winrt/test.managed/winrt.test.managed.uap.appxmanifest

@@ -5,7 +5,7 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
   <Identity Name="E2C40EB9-8CCE-48B1-9A5C-4C8CA4999631"
-            Publisher="CN=Microsoft Corporation"
+            Publisher="CN=Win2DTemporaryKey"
             Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="e2c40eb9-8cce-48b1-9a5c-4c8ca4999631" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>

winrt/test.managed/winrt.test.managed.uap.csproj

@@ -14,11 +14,12 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">16.0</UnitTestPlatformVersion>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">17.0</UnitTestPlatformVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AppxBundle>Never</AppxBundle>
   </PropertyGroup>
   <Import Project="..\..\build\Win2D.cs.props" />
   <PropertyGroup>
@@ -95,6 +96,18 @@
     <None Include="$(AssetDir)TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
+     <Content Include="$(AssetDir)Logo.scale-200.png">
+      <Link>Assets\Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="$(AssetDir)SmallLogo.scale-200.png">
+      <Link>Assets\SmallLogo.scale-200.png</Link>
+    </Content>
+    <Content Include="$(AssetDir)SplashScreen.scale-200.png">
+      <Link>Assets\SplashScreen.scale-200.png</Link>
+    </Content>
+    <Content Include="$(AssetDir)StoreLogo.scale-200.png">
+      <Link>Assets\StoreLogo.scale-200.png</Link>
+    </Content>
     <Content Include="$(AssetDir)Logo.scale-240.png">
       <Link>Assets\Logo.scale-240.png</Link>
     </Content>
@@ -152,16 +165,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>16.2.0</Version>
+      <Version>17.3.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.0.0</Version>
+      <Version>3.7.0</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>2.0.0</Version>
+      <Version>3.7.0</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">