diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 227268964..65c0a8205 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -105,7 +105,7 @@ appropriate test suites. To validate your changes, run "msbuild /m /nr:false Win2D.proj" from a Visual Studio Developer Command Prompt. This will: -- Build all flavors of all projects (debug, release, x86, x64, ARM, and ARM64) +- Build all flavors of all projects (debug, release, x86, x64, and ARM64) - Run all automated tests - Generate updated reference documentation - Make sure all source files include the correct MIT copyright header diff --git a/Win2D.proj b/Win2D.proj index 6f1cb2962..c4b8f072a 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -12,7 +12,7 @@ - Win32;x64;ARM;ARM64;AnyCPU + Win32;x64;ARM64;AnyCPU Debug;Release true true @@ -28,7 +28,7 @@ - Win32;x64;ARM;ARM64 + Win32;x64;ARM64 UAP @@ -62,7 +62,7 @@ - Win32;x64;ARM + Win32;x64 store false @@ -99,54 +99,21 @@ - - - - - - - - - - - - - - - - - - + + + Properties="IncludeVersionInfo=true" /> @@ -268,11 +235,8 @@ <_VsTestPathUnderCommonTools>..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe - <_VsTest Condition="Exists('$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools) - <_VsTest Condition="Exists('$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools) - <_VsTest Condition="Exists('$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools) - <_VsTest Condition="Exists('$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools) <_VsTest Condition="Exists('$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools) + <_VsTest Condition="Exists('$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools) "$([System.IO.Path]::GetFullPath('$(_VsTest)'))" @@ -296,7 +260,7 @@ - + x86 %(ProjectsToBuild.Platform) @@ -332,7 +296,7 @@ %(BuildConfiguration.Identity) - + %(BuildPlatform.Identity) diff --git a/Win2D.uap.sln b/Win2D.uap.sln index c63cb3dda..be9562dca 100644 --- a/Win2D.uap.sln +++ b/Win2D.uap.sln @@ -68,95 +68,72 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "winrt.projection", "winrt\p EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|ARM.ActiveCfg = Debug|ARM - {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|ARM.Build.0 = Debug|ARM {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|ARM64.ActiveCfg = Debug|ARM64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|ARM64.Build.0 = Debug|ARM64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|Win32.ActiveCfg = Debug|Win32 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|Win32.Build.0 = Debug|Win32 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|x64.ActiveCfg = Debug|x64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Debug|x64.Build.0 = Debug|x64 - {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|ARM.ActiveCfg = Release|ARM - {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|ARM.Build.0 = Release|ARM {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|ARM64.ActiveCfg = Release|ARM64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|ARM64.Build.0 = Release|ARM64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|Win32.ActiveCfg = Release|Win32 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|Win32.Build.0 = Release|Win32 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|x64.ActiveCfg = Release|x64 {26B85B6E-3520-42B5-ADB6-971010CC99FA}.Release|x64.Build.0 = Release|x64 - {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|ARM.ActiveCfg = Debug|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|ARM64.ActiveCfg = Debug|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|Win32.ActiveCfg = Debug|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|Win32.Build.0 = Debug|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|x64.ActiveCfg = Debug|x64 {063AB629-AADF-4749-B259-AB815B1AEB01}.Debug|x64.Build.0 = Debug|x64 - {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|ARM.ActiveCfg = Release|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|ARM64.ActiveCfg = Release|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|Win32.ActiveCfg = Release|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|Win32.Build.0 = Release|Win32 {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|x64.ActiveCfg = Release|x64 {063AB629-AADF-4749-B259-AB815B1AEB01}.Release|x64.Build.0 = Release|x64 - {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|ARM.ActiveCfg = Debug|ARM - {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|ARM.Build.0 = Debug|ARM {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|ARM64.Build.0 = Debug|ARM64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|Win32.ActiveCfg = Debug|Win32 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|Win32.Build.0 = Debug|Win32 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|x64.ActiveCfg = Debug|x64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Debug|x64.Build.0 = Debug|x64 - {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|ARM.ActiveCfg = Release|ARM - {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|ARM.Build.0 = Release|ARM {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|ARM64.ActiveCfg = Release|ARM64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|ARM64.Build.0 = Release|ARM64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|Win32.ActiveCfg = Release|Win32 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|Win32.Build.0 = Release|Win32 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|x64.ActiveCfg = Release|x64 {8CF21E5D-E0A2-4FE7-8E2B-A025CF52DCFB}.Release|x64.Build.0 = Release|x64 - {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|ARM.ActiveCfg = Debug|ARM - {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|ARM.Build.0 = Debug|ARM {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|ARM64.ActiveCfg = Debug|ARM64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|ARM64.Build.0 = Debug|ARM64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|Win32.ActiveCfg = Debug|Win32 {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|Win32.Build.0 = Debug|Win32 {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|x64.ActiveCfg = Debug|x64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Debug|x64.Build.0 = Debug|x64 - {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|ARM.ActiveCfg = Release|ARM - {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|ARM.Build.0 = Release|ARM {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|ARM64.ActiveCfg = Release|ARM64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|ARM64.Build.0 = Release|ARM64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|Win32.ActiveCfg = Release|Win32 {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|Win32.Build.0 = Release|Win32 {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|x64.ActiveCfg = Release|x64 {2B157B97-CBF7-4014-8655-1456F2807F43}.Release|x64.Build.0 = Release|x64 - {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|ARM.ActiveCfg = Debug|ARM - {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|ARM.Build.0 = Debug|ARM {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|ARM64.ActiveCfg = Debug|ARM64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|ARM64.Build.0 = Debug|ARM64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|Win32.ActiveCfg = Debug|Win32 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|Win32.Build.0 = Debug|Win32 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|x64.ActiveCfg = Debug|x64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Debug|x64.Build.0 = Debug|x64 - {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|ARM.ActiveCfg = Release|ARM - {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|ARM.Build.0 = Release|ARM {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|ARM64.ActiveCfg = Release|ARM64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|ARM64.Build.0 = Release|ARM64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|Win32.ActiveCfg = Release|Win32 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|Win32.Build.0 = Release|Win32 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|x64.ActiveCfg = Release|x64 {9936FFEF-2686-4DF6-8D64-2BFA78B1222A}.Release|x64.Build.0 = Release|x64 - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM.ActiveCfg = Debug|ARM - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM.Build.0 = Debug|ARM - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM.Deploy.0 = Debug|ARM {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.ActiveCfg = Debug|ARM64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.Build.0 = Debug|ARM64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -166,9 +143,6 @@ Global {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.ActiveCfg = Debug|x64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.Build.0 = Debug|x64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Debug|x64.Deploy.0 = Debug|x64 - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM.ActiveCfg = Release|ARM - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM.Build.0 = Release|ARM - {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM.Deploy.0 = Release|ARM {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.ActiveCfg = Release|ARM64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.Build.0 = Release|ARM64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -178,9 +152,6 @@ Global {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.ActiveCfg = Release|x64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.Build.0 = Release|x64 {16DE7EC1-EDB4-4C29-9598-487A0D211D99}.Release|x64.Deploy.0 = Release|x64 - {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM.ActiveCfg = Debug|ARM - {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM.Build.0 = Debug|ARM - {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM.Deploy.0 = Debug|ARM {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM64.ActiveCfg = Debug|ARM64 {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM64.Build.0 = Debug|ARM64 {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -190,9 +161,6 @@ Global {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|x64.ActiveCfg = Debug|x64 {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|x64.Build.0 = Debug|x64 {60836F00-A727-402B-AFD7-2779675B29A2}.Debug|x64.Deploy.0 = Debug|x64 - {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM.ActiveCfg = Release|ARM - {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM.Build.0 = Release|ARM - {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM.Deploy.0 = Release|ARM {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM64.ActiveCfg = Release|ARM64 {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM64.Build.0 = Release|ARM64 {60836F00-A727-402B-AFD7-2779675B29A2}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -202,9 +170,6 @@ Global {60836F00-A727-402B-AFD7-2779675B29A2}.Release|x64.ActiveCfg = Release|x64 {60836F00-A727-402B-AFD7-2779675B29A2}.Release|x64.Build.0 = Release|x64 {60836F00-A727-402B-AFD7-2779675B29A2}.Release|x64.Deploy.0 = Release|x64 - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM.ActiveCfg = Debug|ARM - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM.Build.0 = Debug|ARM - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM.Deploy.0 = Debug|ARM {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM64.ActiveCfg = Debug|ARM64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM64.Build.0 = Debug|ARM64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -214,9 +179,6 @@ Global {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|x64.ActiveCfg = Debug|x64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|x64.Build.0 = Debug|x64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Debug|x64.Deploy.0 = Debug|x64 - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM.ActiveCfg = Release|ARM - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM.Build.0 = Release|ARM - {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM.Deploy.0 = Release|ARM {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM64.ActiveCfg = Release|ARM64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM64.Build.0 = Release|ARM64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -226,9 +188,6 @@ Global {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|x64.ActiveCfg = Release|x64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|x64.Build.0 = Release|x64 {3AA4FCFF-99F7-4746-957F-79303E9A8952}.Release|x64.Deploy.0 = Release|x64 - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM.ActiveCfg = Debug|ARM - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM.Build.0 = Debug|ARM - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM.Deploy.0 = Debug|ARM {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM64.ActiveCfg = Debug|ARM64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM64.Build.0 = Debug|ARM64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -238,9 +197,6 @@ Global {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|x64.ActiveCfg = Debug|x64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|x64.Build.0 = Debug|x64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Debug|x64.Deploy.0 = Debug|x64 - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM.ActiveCfg = Release|ARM - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM.Build.0 = Release|ARM - {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM.Deploy.0 = Release|ARM {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM64.ActiveCfg = Release|ARM64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM64.Build.0 = Release|ARM64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -250,41 +206,30 @@ Global {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|x64.ActiveCfg = Release|x64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|x64.Build.0 = Release|x64 {F6867923-3A6E-4102-B546-E3A6A5F8EC36}.Release|x64.Deploy.0 = Release|x64 - {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|ARM.ActiveCfg = Debug|ARM - {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|ARM.Build.0 = Debug|ARM {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|ARM64.ActiveCfg = Debug|ARM64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|ARM64.Build.0 = Debug|ARM64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|Win32.ActiveCfg = Debug|Win32 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|Win32.Build.0 = Debug|Win32 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|x64.ActiveCfg = Debug|x64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Debug|x64.Build.0 = Debug|x64 - {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|ARM.ActiveCfg = Release|ARM - {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|ARM.Build.0 = Release|ARM {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|ARM64.ActiveCfg = Release|ARM64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|ARM64.Build.0 = Release|ARM64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|Win32.ActiveCfg = Release|Win32 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|Win32.Build.0 = Release|Win32 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|x64.ActiveCfg = Release|x64 {D77EB5BE-C840-4ADE-B4F6-1BA9512C4768}.Release|x64.Build.0 = Release|x64 - {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|ARM.ActiveCfg = Debug|ARM - {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|ARM.Build.0 = Debug|ARM {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|ARM64.Build.0 = Debug|ARM64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|Win32.ActiveCfg = Debug|Win32 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|Win32.Build.0 = Debug|Win32 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|x64.ActiveCfg = Debug|x64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Debug|x64.Build.0 = Debug|x64 - {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|ARM.ActiveCfg = Release|ARM - {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|ARM.Build.0 = Release|ARM {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|ARM64.ActiveCfg = Release|ARM64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|ARM64.Build.0 = Release|ARM64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|Win32.ActiveCfg = Release|Win32 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|Win32.Build.0 = Release|Win32 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|x64.ActiveCfg = Release|x64 {A81F96D0-4924-40E3-A463-3CB9EE55AA93}.Release|x64.Build.0 = Release|x64 - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM.ActiveCfg = Debug|ARM - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM.Build.0 = Debug|ARM - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM.Deploy.0 = Debug|ARM {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM64.ActiveCfg = Debug|ARM64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM64.Build.0 = Debug|ARM64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -294,9 +239,6 @@ Global {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|x64.ActiveCfg = Debug|x64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|x64.Build.0 = Debug|x64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Debug|x64.Deploy.0 = Debug|x64 - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM.ActiveCfg = Release|ARM - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM.Build.0 = Release|ARM - {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM.Deploy.0 = Release|ARM {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM64.ActiveCfg = Release|ARM64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM64.Build.0 = Release|ARM64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -306,9 +248,6 @@ Global {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|x64.ActiveCfg = Release|x64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|x64.Build.0 = Release|x64 {70FB7B71-D56C-4BF1-9282-27AA58043CC0}.Release|x64.Deploy.0 = Release|x64 - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM.ActiveCfg = Debug|ARM - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM.Build.0 = Debug|ARM - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM.Deploy.0 = Debug|ARM {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM64.ActiveCfg = Debug|ARM64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM64.Build.0 = Debug|ARM64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -318,9 +257,6 @@ Global {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|x64.ActiveCfg = Debug|x64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|x64.Build.0 = Debug|x64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Debug|x64.Deploy.0 = Debug|x64 - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM.ActiveCfg = Release|ARM - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM.Build.0 = Release|ARM - {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM.Deploy.0 = Release|ARM {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM64.ActiveCfg = Release|ARM64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM64.Build.0 = Release|ARM64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|ARM64.Deploy.0 = Release|ARM64 @@ -330,16 +266,12 @@ Global {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|x64.ActiveCfg = Release|x64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|x64.Build.0 = Release|x64 {F33C7CB9-5ECA-47B7-9393-81E6E8F0BD34}.Release|x64.Deploy.0 = Release|x64 - {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|ARM.ActiveCfg = Debug|Any CPU - {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|ARM.Build.0 = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|ARM64.ActiveCfg = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|ARM64.Build.0 = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|Win32.ActiveCfg = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|Win32.Build.0 = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|x64.ActiveCfg = Debug|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Debug|x64.Build.0 = Debug|Any CPU - {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Release|ARM.ActiveCfg = Release|Any CPU - {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Release|ARM.Build.0 = Release|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Release|ARM64.ActiveCfg = Release|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Release|ARM64.Build.0 = Release|Any CPU {D9C8EEAE-6BA6-4146-BDED-ECC0FCF8C308}.Release|Win32.ActiveCfg = Release|Any CPU diff --git a/build/Assets/Logo.scale-200.png b/build/Assets/Logo.scale-200.png new file mode 100644 index 000000000..076b3a389 Binary files /dev/null and b/build/Assets/Logo.scale-200.png differ diff --git a/build/Assets/SmallLogo.scale-200.png b/build/Assets/SmallLogo.scale-200.png new file mode 100644 index 000000000..fe2cf3f5a Binary files /dev/null and b/build/Assets/SmallLogo.scale-200.png differ diff --git a/build/Assets/SplashScreen.scale-200.png b/build/Assets/SplashScreen.scale-200.png new file mode 100644 index 000000000..d6f68949e Binary files /dev/null and b/build/Assets/SplashScreen.scale-200.png differ diff --git a/build/Assets/StoreLogo.scale-200.png b/build/Assets/StoreLogo.scale-200.png new file mode 100644 index 000000000..95c982750 Binary files /dev/null and b/build/Assets/StoreLogo.scale-200.png differ diff --git a/build/AzurePipelinesTemplates/Win2D-BuildNupkg.yml b/build/AzurePipelinesTemplates/Win2D-BuildNupkg.yml index 9d8cb9dda..c1837c2d3 100644 --- a/build/AzurePipelinesTemplates/Win2D-BuildNupkg.yml +++ b/build/AzurePipelinesTemplates/Win2D-BuildNupkg.yml @@ -15,10 +15,6 @@ steps: inputs: artifactName: 'build_output_Win32;AnyCPU' targetPath: $(Build.SourcesDirectory) -- task: DownloadPipelineArtifact@2 - inputs: - artifactName: 'build_output_ARM' - targetPath: $(Build.SourcesDirectory) - task: DownloadPipelineArtifact@2 inputs: artifactName: 'build_output_ARM64' diff --git a/build/AzurePipelinesTemplates/Win2D-Stages.yml b/build/AzurePipelinesTemplates/Win2D-Stages.yml index d14963fa8..a7a23ad08 100644 --- a/build/AzurePipelinesTemplates/Win2D-Stages.yml +++ b/build/AzurePipelinesTemplates/Win2D-Stages.yml @@ -31,10 +31,6 @@ stages: architecture: "x64" archDirectory: "uapx64" buildConfiguration: "Release" - ARM: - architecture: "ARM" - archDirectory: "uaparm" - buildConfiguration: "Release" ARM64: architecture: "ARM64" archDirectory: "uaparm64" diff --git a/build/Win2D.cpp.props b/build/Win2D.cpp.props index 8b371d6a2..b66f7e05a 100644 --- a/build/Win2D.cpp.props +++ b/build/Win2D.cpp.props @@ -14,10 +14,6 @@ - - Debug - ARM - Debug ARM64 @@ -30,10 +26,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -49,18 +41,12 @@ - v143 + v145 - 10.0.19041.0 - - - 10.0.10240.0 - 10.0.10240.0 - - - 10.0.16299.0 + 10.0.26100.0 + 10.0.16299.0 @@ -172,12 +158,6 @@ - - - WIN32;_ARM_;%(PreprocessorDefinitions) - - - WIN32;_ARM64_;%(PreprocessorDefinitions) diff --git a/build/Win2D.cs.props b/build/Win2D.cs.props index 9016091c0..64f08b86a 100644 --- a/build/Win2D.cs.props +++ b/build/Win2D.cs.props @@ -16,12 +16,7 @@ 4 true - 10.0.19041.0 - - - 10.0.10240.0 - - + 10.0.26100.0 10.0.16299.0 diff --git a/build/midlrt.targets b/build/midlrt.targets index 8cf59d073..26938770a 100644 --- a/build/midlrt.targets +++ b/build/midlrt.targets @@ -12,14 +12,12 @@ - - - win32 win32 1 diff --git a/build/nuget-restore.targets b/build/nuget-restore.targets index 7635ac45d..f76592693 100644 --- a/build/nuget-restore.targets +++ b/build/nuget-restore.targets @@ -51,11 +51,7 @@ - - - - - - + + diff --git a/build/nuget/Win2D.uwp-cswinrt.targets b/build/nuget/Win2D.uwp-cswinrt.targets index b6e2de75c..923cc5601 100644 --- a/build/nuget/Win2D.uwp-cswinrt.targets +++ b/build/nuget/Win2D.uwp-cswinrt.targets @@ -6,7 +6,6 @@ x64 x86 arm64 - arm diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec index fcef9bf44..d82cbd328 100644 --- a/build/nuget/Win2D.uwp.nuspec +++ b/build/nuget/Win2D.uwp.nuspec @@ -16,11 +16,11 @@ - + - + @@ -33,13 +33,13 @@ - - + + - - + + @@ -49,11 +49,10 @@ - - + + - diff --git a/nuget.config b/nuget.config index aa5e9f4cc..200b6a0ad 100644 --- a/nuget.config +++ b/nuget.config @@ -1,8 +1,6 @@ - - diff --git a/release-nuget.config b/release-nuget.config index 59f2bbfdb..200b6a0ad 100644 --- a/release-nuget.config +++ b/release-nuget.config @@ -1,8 +1,6 @@ - - diff --git a/samples/CompositionExample/CompositionExample.csproj b/samples/CompositionExample/CompositionExample.csproj index faae767ae..0069cb540 100644 --- a/samples/CompositionExample/CompositionExample.csproj +++ b/samples/CompositionExample/CompositionExample.csproj @@ -41,27 +41,6 @@ true true - - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP @@ -112,7 +91,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 7e995ce5d..79c321f96 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -1,6 +1,6 @@ - + Win2D Composition Example diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index fdeee44b3..fd8420fab 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/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"> - + Win2D CoreWindow Example diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.csproj b/samples/CoreWindowExample/CoreWindowExample.uap.csproj index 8d8472e75..032fce0fa 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.csproj +++ b/samples/CoreWindowExample/CoreWindowExample.uap.csproj @@ -41,27 +41,6 @@ true true - - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP @@ -112,7 +91,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj index 5e4428ee2..e5b620d65 100644 --- a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj +++ b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj @@ -37,26 +37,6 @@ prompt true - - ARM - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - true - - - ARM - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - true - x64 true @@ -110,7 +90,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj index 9a97f5889..abf814fc7 100644 --- a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj +++ b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj @@ -1,6 +1,6 @@  - + @@ -46,15 +46,15 @@ - + 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}. - + \ No newline at end of file diff --git a/samples/ExampleGallery/Direct3DInterop/packages.config b/samples/ExampleGallery/Direct3DInterop/packages.config index e39c18ce5..7be7b7792 100644 --- a/samples/ExampleGallery/Direct3DInterop/packages.config +++ b/samples/ExampleGallery/Direct3DInterop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj index 3aa8411b1..aa5416400 100644 --- a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj +++ b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj @@ -36,26 +36,6 @@ prompt true - - ARM - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - true - - - ARM - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - true - x64 true @@ -109,7 +89,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index 2428606cc..040c4c04b 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/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"> - + Win2D Example Gallery diff --git a/samples/ExampleGallery/ExampleGallery.uap.csproj b/samples/ExampleGallery/ExampleGallery.uap.csproj index c65aeacec..b929e7677 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.csproj +++ b/samples/ExampleGallery/ExampleGallery.uap.csproj @@ -22,27 +22,6 @@ $(AssetDir)TemporaryKey.pfx - - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP @@ -127,7 +106,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 9fc67a86f..646bdaf21 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -7,7 +7,7 @@ diff --git a/samples/SimpleSample/SimpleSample.uap.csproj b/samples/SimpleSample/SimpleSample.uap.csproj index f1477f658..54418f006 100644 --- a/samples/SimpleSample/SimpleSample.uap.csproj +++ b/samples/SimpleSample/SimpleSample.uap.csproj @@ -20,27 +20,6 @@ $(AssetDir)TemporaryKey.pfx - - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP @@ -146,7 +125,7 @@ - 6.2.9 + 6.2.14 diff --git a/tools/codegen/exe/Settings.xml b/tools/codegen/exe/Settings.xml index aaba3b564..893d264f3 100644 --- a/tools/codegen/exe/Settings.xml +++ b/tools/codegen/exe/Settings.xml @@ -97,7 +97,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license - + @@ -246,64 +246,64 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license - - + + - + - + - + - - + + - + - - + + - - - - + + + + - + - - + + - + - + - - - + + + - + diff --git a/tools/docs/BuildDocs.proj b/tools/docs/BuildDocs.proj index 2b0b874b7..9adf42077 100644 --- a/tools/docs/BuildDocs.proj +++ b/tools/docs/BuildDocs.proj @@ -62,7 +62,7 @@ - + $(MSBuildThisFileDirectory)..\..\packages\System.Runtime.4.0.20\ref\dotnet @@ -126,7 +126,7 @@ - + diff --git a/tools/docs/BuildDocs.shfbproj b/tools/docs/BuildDocs.shfbproj index 705a702c1..1006f7d83 100644 --- a/tools/docs/BuildDocs.shfbproj +++ b/tools/docs/BuildDocs.shfbproj @@ -4,6 +4,7 @@ $(MSBuildThisFileDirectory)..\..\packages\EWSoftware.SHFB.2016.9.17.0\Tools\ + true 2.0 {ec5bd60b-d070-432b-bf14-ab50cfc1d7f8} 1.9.9.0 diff --git a/winrt/lib/effects/generated/EffectMakers.cpp b/winrt/lib/effects/generated/EffectMakers.cpp index 2343d33eb..27ebfdc46 100644 --- a/winrt/lib/effects/generated/EffectMakers.cpp +++ b/winrt/lib/effects/generated/EffectMakers.cpp @@ -6,130 +6,130 @@ #include "pch.h" +#include "AlphaMaskEffect.h" #include "ArithmeticCompositeEffect.h" #include "AtlasEffect.h" #include "BlendEffect.h" #include "BorderEffect.h" #include "BrightnessEffect.h" +#include "ChromaKeyEffect.h" #include "ColorManagementEffect.h" #include "ColorMatrixEffect.h" #include "ColorSourceEffect.h" #include "CompositeEffect.h" +#include "ContrastEffect.h" #include "ConvolveMatrixEffect.h" #include "CropEffect.h" +#include "CrossFadeEffect.h" #include "DirectionalBlurEffect.h" #include "DiscreteTransferEffect.h" #include "DisplacementMapEffect.h" #include "DistantDiffuseEffect.h" #include "DistantSpecularEffect.h" #include "DpiCompensationEffect.h" +#include "EdgeDetectionEffect.h" +#include "EmbossEffect.h" +#include "ExposureEffect.h" #include "GammaTransferEffect.h" #include "GaussianBlurEffect.h" +#include "GrayscaleEffect.h" +#include "HdrToneMapEffect.h" +#include "HighlightsAndShadowsEffect.h" #include "HueRotationEffect.h" +#include "HueToRgbEffect.h" +#include "InvertEffect.h" #include "LinearTransferEffect.h" #include "LuminanceToAlphaEffect.h" #include "MorphologyEffect.h" +#include "OpacityEffect.h" #include "OpacityMetadataEffect.h" #include "PointDiffuseEffect.h" #include "PointSpecularEffect.h" +#include "PosterizeEffect.h" #include "PremultiplyEffect.h" +#include "RgbToHueEffect.h" #include "SaturationEffect.h" #include "ScaleEffect.h" +#include "SepiaEffect.h" #include "ShadowEffect.h" +#include "SharpenEffect.h" #include "SpotDiffuseEffect.h" #include "SpotSpecularEffect.h" +#include "StraightenEffect.h" +#include "TableTransfer3DEffect.h" #include "TableTransferEffect.h" +#include "TemperatureAndTintEffect.h" #include "TileEffect.h" +#include "TintEffect.h" #include "Transform2DEffect.h" #include "Transform3DEffect.h" #include "TurbulenceEffect.h" #include "UnPremultiplyEffect.h" -#include "AlphaMaskEffect.h" -#include "ChromaKeyEffect.h" -#include "ContrastEffect.h" -#include "CrossFadeEffect.h" -#include "EdgeDetectionEffect.h" -#include "EmbossEffect.h" -#include "ExposureEffect.h" -#include "GrayscaleEffect.h" -#include "HdrToneMapEffect.h" -#include "HighlightsAndShadowsEffect.h" -#include "HueToRgbEffect.h" -#include "InvertEffect.h" -#include "OpacityEffect.h" -#include "PosterizeEffect.h" -#include "RgbToHueEffect.h" -#include "SepiaEffect.h" -#include "SharpenEffect.h" -#include "StraightenEffect.h" -#include "TableTransfer3DEffect.h" -#include "TemperatureAndTintEffect.h" -#include "TintEffect.h" #include "VignetteEffect.h" #include "WhiteLevelAdjustmentEffect.h" std::pair CanvasEffect::m_effectMakers[] = { + { AlphaMaskEffect::EffectId(), MakeEffect }, { ArithmeticCompositeEffect::EffectId(), MakeEffect }, { AtlasEffect::EffectId(), MakeEffect }, { BlendEffect::EffectId(), MakeEffect }, { BorderEffect::EffectId(), MakeEffect }, { BrightnessEffect::EffectId(), MakeEffect }, + { ChromaKeyEffect::EffectId(), MakeEffect }, { ColorManagementEffect::EffectId(), MakeEffect }, { ColorMatrixEffect::EffectId(), MakeEffect }, { ColorSourceEffect::EffectId(), MakeEffect }, { CompositeEffect::EffectId(), MakeEffect }, + { ContrastEffect::EffectId(), MakeEffect }, { ConvolveMatrixEffect::EffectId(), MakeEffect }, { CropEffect::EffectId(), MakeEffect }, + { CrossFadeEffect::EffectId(), MakeEffect }, { DirectionalBlurEffect::EffectId(), MakeEffect }, { DiscreteTransferEffect::EffectId(), MakeEffect }, { DisplacementMapEffect::EffectId(), MakeEffect }, { DistantDiffuseEffect::EffectId(), MakeEffect }, { DistantSpecularEffect::EffectId(), MakeEffect }, { DpiCompensationEffect::EffectId(), MakeEffect }, + { EdgeDetectionEffect::EffectId(), MakeEffect }, + { EmbossEffect::EffectId(), MakeEffect }, + { ExposureEffect::EffectId(), MakeEffect }, { GammaTransferEffect::EffectId(), MakeEffect }, { GaussianBlurEffect::EffectId(), MakeEffect }, + { GrayscaleEffect::EffectId(), MakeEffect }, + { HdrToneMapEffect::EffectId(), MakeEffect }, + { HighlightsAndShadowsEffect::EffectId(), MakeEffect }, { HueRotationEffect::EffectId(), MakeEffect }, + { HueToRgbEffect::EffectId(), MakeEffect }, + { InvertEffect::EffectId(), MakeEffect }, { LinearTransferEffect::EffectId(), MakeEffect }, { LuminanceToAlphaEffect::EffectId(), MakeEffect }, { MorphologyEffect::EffectId(), MakeEffect }, + { OpacityEffect::EffectId(), MakeEffect }, { OpacityMetadataEffect::EffectId(), MakeEffect }, { PointDiffuseEffect::EffectId(), MakeEffect }, { PointSpecularEffect::EffectId(), MakeEffect }, + { PosterizeEffect::EffectId(), MakeEffect }, { PremultiplyEffect::EffectId(), MakeEffect }, + { RgbToHueEffect::EffectId(), MakeEffect }, { SaturationEffect::EffectId(), MakeEffect }, { ScaleEffect::EffectId(), MakeEffect }, + { SepiaEffect::EffectId(), MakeEffect }, { ShadowEffect::EffectId(), MakeEffect }, + { SharpenEffect::EffectId(), MakeEffect }, { SpotDiffuseEffect::EffectId(), MakeEffect }, { SpotSpecularEffect::EffectId(), MakeEffect }, + { StraightenEffect::EffectId(), MakeEffect }, + { TableTransfer3DEffect::EffectId(), MakeEffect }, { TableTransferEffect::EffectId(), MakeEffect }, + { TemperatureAndTintEffect::EffectId(), MakeEffect }, { TileEffect::EffectId(), MakeEffect }, + { TintEffect::EffectId(), MakeEffect }, { Transform2DEffect::EffectId(), MakeEffect }, { Transform3DEffect::EffectId(), MakeEffect }, { TurbulenceEffect::EffectId(), MakeEffect }, { UnPremultiplyEffect::EffectId(), MakeEffect }, - { AlphaMaskEffect::EffectId(), MakeEffect }, - { ChromaKeyEffect::EffectId(), MakeEffect }, - { ContrastEffect::EffectId(), MakeEffect }, - { CrossFadeEffect::EffectId(), MakeEffect }, - { EdgeDetectionEffect::EffectId(), MakeEffect }, - { EmbossEffect::EffectId(), MakeEffect }, - { ExposureEffect::EffectId(), MakeEffect }, - { GrayscaleEffect::EffectId(), MakeEffect }, - { HdrToneMapEffect::EffectId(), MakeEffect }, - { HighlightsAndShadowsEffect::EffectId(), MakeEffect }, - { HueToRgbEffect::EffectId(), MakeEffect }, - { InvertEffect::EffectId(), MakeEffect }, - { OpacityEffect::EffectId(), MakeEffect }, - { PosterizeEffect::EffectId(), MakeEffect }, - { RgbToHueEffect::EffectId(), MakeEffect }, - { SepiaEffect::EffectId(), MakeEffect }, - { SharpenEffect::EffectId(), MakeEffect }, - { StraightenEffect::EffectId(), MakeEffect }, - { TableTransfer3DEffect::EffectId(), MakeEffect }, - { TemperatureAndTintEffect::EffectId(), MakeEffect }, - { TintEffect::EffectId(), MakeEffect }, { VignetteEffect::EffectId(), MakeEffect }, { WhiteLevelAdjustmentEffect::EffectId(), MakeEffect }, diff --git a/winrt/lib/winrt.lib.uap.vcxproj b/winrt/lib/winrt.lib.uap.vcxproj index 4938803e9..7c5ec5425 100644 --- a/winrt/lib/winrt.lib.uap.vcxproj +++ b/winrt/lib/winrt.lib.uap.vcxproj @@ -55,7 +55,7 @@ - + diff --git a/winrt/projection/winrt.projection.csproj b/winrt/projection/winrt.projection.csproj index 969606d5a..503a0b895 100644 --- a/winrt/projection/winrt.projection.csproj +++ b/winrt/projection/winrt.projection.csproj @@ -52,7 +52,7 @@ - 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).54 + 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).57 Microsoft.Graphics.Canvas; @@ -68,7 +68,6 @@ - - + diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index c28de4983..2b6276eec 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -6,7 +6,7 @@ IgnorableNamespaces="uap mp"> diff --git a/winrt/test.internal/winrt.test.internal.uap.vcxproj b/winrt/test.internal/winrt.test.internal.uap.vcxproj index bd388933f..41db2bb7f 100644 --- a/winrt/test.internal/winrt.test.internal.uap.vcxproj +++ b/winrt/test.internal/winrt.test.internal.uap.vcxproj @@ -12,7 +12,7 @@ - v143 + v145 winrt.test.internal.uap DynamicLibrary false diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 9f862bf29..cda59c799 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/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"> diff --git a/winrt/test.managed/winrt.test.managed.uap.csproj b/winrt/test.managed/winrt.test.managed.uap.csproj index 16ccc4978..5df150ecf 100644 --- a/winrt/test.managed/winrt.test.managed.uap.csproj +++ b/winrt/test.managed/winrt.test.managed.uap.csproj @@ -14,11 +14,12 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 16.0 + 17.0 true true true true + Never @@ -64,26 +65,6 @@ prompt true - - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - @@ -95,6 +76,18 @@ + + Assets\Logo.scale-200.png + + + Assets\SmallLogo.scale-200.png + + + Assets\SplashScreen.scale-200.png + + + Assets\StoreLogo.scale-200.png + Assets\Logo.scale-240.png @@ -152,16 +145,16 @@ - 16.2.0 + 17.3.3 - 6.2.9 + 6.2.14 - 2.0.0 + 3.7.0 - 2.0.0 + 3.7.0