From 8d1d4f86dd49c93c06a0deaf63b81f60acb23f01 Mon Sep 17 00:00:00 2001 From: Damyan Pepper Date: Tue, 23 Apr 2019 08:04:19 -0700 Subject: [PATCH 1/5] Fix link (cee should be se) (#692) --- winrt/docsrc/CanvasPrintDocument.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winrt/docsrc/CanvasPrintDocument.xml b/winrt/docsrc/CanvasPrintDocument.xml index 6fb664be9..9da9bf117 100644 --- a/winrt/docsrc/CanvasPrintDocument.xml +++ b/winrt/docsrc/CanvasPrintDocument.xml @@ -87,7 +87,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license When the user chooses to print the event is raised. The application can then draw each page in turn - using

From 3615f0639160fb351432ae1b07f059bc357f9f8c Mon Sep 17 00:00:00 2001 From: William Kent Date: Tue, 23 Jul 2019 11:43:28 -0400 Subject: [PATCH 2/5] Add support to netcoreapp3.0 projects to NuGet package (#712) This will aid consuming Win2D in projects such as this one: https://github.com/microsoft/Windows.UI.Composition-Win32-Samples/tree/master/dotnet/WinForms/AcrylicEffect --- build/nuget/Win2D.uwp-managed.targets | 36 +++++++++++++++++++++++++++ build/nuget/Win2D.uwp.nuspec | 6 +++++ 2 files changed, 42 insertions(+) create mode 100644 build/nuget/Win2D.uwp-managed.targets diff --git a/build/nuget/Win2D.uwp-managed.targets b/build/nuget/Win2D.uwp-managed.targets new file mode 100644 index 000000000..1200babbb --- /dev/null +++ b/build/nuget/Win2D.uwp-managed.targets @@ -0,0 +1,36 @@ + + + + + x64 + x86 + + + + x86 + $(Platform) + + + + + true + + + + + $(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Graphics.Canvas.winmd + Microsoft.Graphics.Canvas.dll + + + + + + + + + + + diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec index 2af3e7030..6793bc13b 100644 --- a/build/nuget/Win2D.uwp.nuspec +++ b/build/nuget/Win2D.uwp.nuspec @@ -20,6 +20,8 @@ + + @@ -28,6 +30,10 @@ + + + + From a3b2c2e35e87199c72a7211529e2973064a48267 Mon Sep 17 00:00:00 2001 From: Goh Chun Lin Date: Thu, 22 Aug 2019 05:57:31 +0800 Subject: [PATCH 3/5] Corrected the method name. (#718) The method name in XAML is canvas_DrawAnimated but backend code is canvas_AnimatedDraw. This PR is to correct the backend code. --- winrt/docsrc/QuickStart.aml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winrt/docsrc/QuickStart.aml b/winrt/docsrc/QuickStart.aml index 3a11f520f..5e6bf5e19 100644 --- a/winrt/docsrc/QuickStart.aml +++ b/winrt/docsrc/QuickStart.aml @@ -607,11 +607,11 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license - Now you can animate the Gaussian blur. Find the canvas_AnimatedDraw method and add the + Now you can animate the Gaussian blur. Find the canvas_DrawAnimated method and add the following code: - private void canvas_AnimatedDraw( + private void canvas_DrawAnimated( Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args) { From e3ed8a28295b592dbe437516deaa2a02333218c8 Mon Sep 17 00:00:00 2001 From: lindexi Date: Thu, 22 Aug 2019 22:05:51 +0800 Subject: [PATCH 4/5] Fix typo (#719) --- winrt/docsrc/CanvasFontFace.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winrt/docsrc/CanvasFontFace.xml b/winrt/docsrc/CanvasFontFace.xml index 96441de4a..64aedc468 100644 --- a/winrt/docsrc/CanvasFontFace.xml +++ b/winrt/docsrc/CanvasFontFace.xml @@ -155,7 +155,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license

Gets the ascent value of the font face. Ascent is the distance from the top of font character alignment box to the Latin-script baseline. - Gts the cap height value of the font face. Cap height is the distance from the Latin-script baseline to the top of a typical Latin-script capital. Capital "H" is often used as a reference character for the purpose of calculating the cap height value. + Gets the cap height value of the font face. Cap height is the distance from the Latin-script baseline to the top of a typical Latin-script capital. Capital "H" is often used as a reference character for the purpose of calculating the cap height value. Gets the horizontal offset of the caret along the baseline for good appearance. An offset of 0 is returned for perfectly upright fonts (non-italic). From e7c0040e829521349ed45ff9577ab4d4bec353ce Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Fri, 6 Sep 2019 14:11:02 -0700 Subject: [PATCH 5/5] Fix build with Visual Studio 2019 (with tests) (#721) * Use latest installed Windows SDK version * Use VS2019 (v142) C++ toolchain * Use UniversalApiContract version in 18362 SDK * Fix build with VS2019 compiler * Fix Win2DValidatePlatformVersion when the version is 10.0 In later versions of Visual Studio, this means "the highest version out of whatever platform SDKs are installed". * Add VS2019 support to Win2D.proj * Use explicit SDK version * Use PlatformToolset from Win2D.Cpp.props * Update version in solution file header * Port ShaderCompiler fixes from xaml_islands branch * Re-add explicit PlatformToolset * Update code generator to match manual changes * Update README * Update build.cmd * Update TargetPlatformVersion in sample projects * Silence deprecation warning/error * Fix double-definition build error * Fix ambiguous-definition errors * Tests running on VS 2019. --- README.md | 4 +-- Win2D.proj | 9 ++++++- Win2D.uap.sln | 4 +-- build.cmd | 4 +-- build/Win2D.cpp.props | 4 +-- build/Win2D.cs.props | 2 +- build/nuget/Win2D.common.targets | 2 +- .../CompositionExample.csproj | 4 +-- .../CoreWindowExample.uap.csproj | 4 +-- .../ExampleGallery.BackgroundTask.uap.csproj | 4 +-- .../Effects/ExampleGallery.Effects.csproj | 4 +-- .../ExampleGallery/ExampleGallery.uap.csproj | 2 +- samples/SimpleSample/SimpleSample.uap.csproj | 2 +- tools/codegen/exe/OutputEffectType.cs | 2 +- .../generated/ArithmeticCompositeEffect.cpp | 2 +- winrt/lib/effects/generated/AtlasEffect.cpp | 2 +- winrt/lib/effects/generated/BlendEffect.cpp | 2 +- winrt/lib/effects/generated/BorderEffect.cpp | 2 +- .../effects/generated/BrightnessEffect.cpp | 2 +- .../lib/effects/generated/ChromaKeyEffect.cpp | 2 +- .../effects/generated/ColorMatrixEffect.cpp | 2 +- .../effects/generated/ColorSourceEffect.cpp | 2 +- .../lib/effects/generated/CompositeEffect.cpp | 2 +- .../lib/effects/generated/ContrastEffect.cpp | 2 +- .../generated/ConvolveMatrixEffect.cpp | 2 +- winrt/lib/effects/generated/CropEffect.cpp | 2 +- .../generated/DirectionalBlurEffect.cpp | 2 +- .../generated/DiscreteTransferEffect.cpp | 2 +- .../generated/DisplacementMapEffect.cpp | 2 +- .../generated/DistantDiffuseEffect.cpp | 2 +- .../generated/DistantSpecularEffect.cpp | 2 +- .../generated/DpiCompensationEffect.cpp | 2 +- .../effects/generated/EdgeDetectionEffect.cpp | 2 +- winrt/lib/effects/generated/EmbossEffect.cpp | 2 +- .../lib/effects/generated/ExposureEffect.cpp | 2 +- .../effects/generated/GammaTransferEffect.cpp | 2 +- .../effects/generated/GaussianBlurEffect.cpp | 2 +- .../lib/effects/generated/GrayscaleEffect.cpp | 2 +- .../generated/HighlightsAndShadowsEffect.cpp | 2 +- .../effects/generated/HueRotationEffect.cpp | 2 +- .../lib/effects/generated/HueToRgbEffect.cpp | 2 +- winrt/lib/effects/generated/InvertEffect.cpp | 2 +- .../generated/LinearTransferEffect.cpp | 2 +- .../generated/LuminanceToAlphaEffect.cpp | 2 +- .../effects/generated/MorphologyEffect.cpp | 2 +- .../generated/OpacityMetadataEffect.cpp | 2 +- .../effects/generated/PointDiffuseEffect.cpp | 2 +- .../effects/generated/PointSpecularEffect.cpp | 2 +- .../lib/effects/generated/PosterizeEffect.cpp | 2 +- .../effects/generated/PremultiplyEffect.cpp | 2 +- .../lib/effects/generated/RgbToHueEffect.cpp | 2 +- .../effects/generated/SaturationEffect.cpp | 2 +- winrt/lib/effects/generated/ScaleEffect.cpp | 2 +- winrt/lib/effects/generated/SepiaEffect.cpp | 2 +- winrt/lib/effects/generated/ShadowEffect.cpp | 2 +- winrt/lib/effects/generated/SharpenEffect.cpp | 2 +- .../effects/generated/SpotDiffuseEffect.cpp | 2 +- .../effects/generated/SpotSpecularEffect.cpp | 2 +- .../effects/generated/StraightenEffect.cpp | 2 +- .../generated/TableTransfer3DEffect.cpp | 2 +- .../effects/generated/TableTransferEffect.cpp | 2 +- .../generated/TemperatureAndTintEffect.cpp | 2 +- winrt/lib/effects/generated/TileEffect.cpp | 2 +- .../effects/generated/Transform2DEffect.cpp | 2 +- .../effects/generated/Transform3DEffect.cpp | 2 +- .../effects/generated/TurbulenceEffect.cpp | 2 +- .../effects/generated/UnPremultiplyEffect.cpp | 2 +- .../lib/effects/generated/VignetteEffect.cpp | 2 +- winrt/lib/winrt.lib.uap.vcxproj | 2 +- .../winrt.test.external.uap.vcxproj | 2 +- winrt/test.internal/mocks/MockD2DFactory.h | 3 +++ winrt/test.internal/utils/Helpers.h | 2 ++ .../winrt.test.internal.uap.vcxproj | 2 +- .../xaml/BaseControlUnitTests.cpp | 2 +- .../xaml/RecreatableDeviceManagerTests.cpp | 2 +- .../winrt.test.managed.uap.csproj | 26 +++++++------------ winrt/test.nativecomponent/ShaderCompiler.cpp | 11 +++++--- 77 files changed, 110 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 9c2652f31..a30115426 100644 --- a/README.md +++ b/README.md @@ -69,14 +69,14 @@ Studio, add the Win2D NuGet package to your project, and get started using the A ## Building Win2D from source ##### Requirements -- Visual Studio 2017 with Tools for Universal Windows Apps 15.0.27428.01 and Windows SDK 17134 +- Visual Studio 2019 with Tools for Universal Windows Apps 15.0.27428.01 and Windows SDK 18362 ##### Clone Repository - Go to 'View' -> 'Team Explorer' -> 'Local Git Repositories' -> 'Clone' - Add the Win2D repository URL (https://github.com/Microsoft/Win2D.git) and hit 'Clone' ##### Build NuGet Packages -- Launch 'Developer Command Prompt for VS2017' +- Launch 'Developer Command Prompt for VS2019' - Change directory to your cloned Win2D repository and run 'build' ##### Point Visual Studio at the resulting 'bin' directory diff --git a/Win2D.proj b/Win2D.proj index d48a8a7de..81036f90f 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -233,7 +233,8 @@ <_VsTest Condition="Exists('$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools) <_VsTest Condition="Exists('$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools) <_VsTest Condition="Exists('$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools) - "$([System.IO.Path]::GetFullPath('$(_VsTest)'))" + <_VsTest Condition="Exists('$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools) + "$([System.IO.Path]::GetFullPath('$(_VsTest)'))" + + %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe + + + + diff --git a/Win2D.uap.sln b/Win2D.uap.sln index 4f8af85d7..250e28caf 100644 --- a/Win2D.uap.sln +++ b/Win2D.uap.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29020.237 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "winrt", "winrt", "{0F212400-0A8B-4E26-9BA8-CE7165FF8717}" EndProject diff --git a/build.cmd b/build.cmd index 815c11109..8b867d11f 100644 --- a/build.cmd +++ b/build.cmd @@ -2,7 +2,7 @@ SETLOCAL -IF "%VisualStudioVersion%" LSS "15.0" ( +IF "%VisualStudioVersion%" LSS "16.0" ( GOTO WRONG_COMMAND_PROMPT ) @@ -35,7 +35,7 @@ GOTO END :WRONG_COMMAND_PROMPT -ECHO Please run this script from a Developer Command Prompt for VS2017 +ECHO Please run this script from a Developer Command Prompt for VS2019 ECHO. PAUSE GOTO END diff --git a/build/Win2D.cpp.props b/build/Win2D.cpp.props index 3a46c0877..1009ef751 100644 --- a/build/Win2D.cpp.props +++ b/build/Win2D.cpp.props @@ -41,11 +41,11 @@ - v141 + v142 - 10.0.17134.0 + 10.0.18362.0 10.0.10240.0 diff --git a/build/Win2D.cs.props b/build/Win2D.cs.props index ca697fb89..51ab51273 100644 --- a/build/Win2D.cs.props +++ b/build/Win2D.cs.props @@ -15,7 +15,7 @@ 4 true - 10.0.17134.0 + 10.0.18362.0 10.0.10240.0 diff --git a/build/nuget/Win2D.common.targets b/build/nuget/Win2D.common.targets index b7197cd09..5e04d9628 100644 --- a/build/nuget/Win2D.common.targets +++ b/build/nuget/Win2D.common.targets @@ -28,7 +28,7 @@ + Condition="('$(TargetPlatformVersion)' != '' and '$(TargetPlatformVersion)' != '10.0') and '$(DisableWin2DPlatformCheck)' == ''"> diff --git a/samples/CompositionExample/CompositionExample.csproj b/samples/CompositionExample/CompositionExample.csproj index 5856ac88d..c48096f68 100644 --- a/samples/CompositionExample/CompositionExample.csproj +++ b/samples/CompositionExample/CompositionExample.csproj @@ -1,4 +1,4 @@ - + @@ -91,7 +91,7 @@ - 5.0.0 + 6.2.9 diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.csproj b/samples/CoreWindowExample/CoreWindowExample.uap.csproj index 2240a9c8f..829175602 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.csproj +++ b/samples/CoreWindowExample/CoreWindowExample.uap.csproj @@ -1,4 +1,4 @@ - + @@ -91,7 +91,7 @@ - 5.0.0 + 6.2.9 diff --git a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj index 091456e45..7a4a2f78f 100644 --- a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj +++ b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj @@ -1,4 +1,4 @@ - + @@ -90,7 +90,7 @@ - 5.0.0 + 6.2.9 diff --git a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj index ea623428e..6831f78bc 100644 --- a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj +++ b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj @@ -1,4 +1,4 @@ - + @@ -91,7 +91,7 @@ - 5.0.0 + 6.2.9 diff --git a/samples/ExampleGallery/ExampleGallery.uap.csproj b/samples/ExampleGallery/ExampleGallery.uap.csproj index baf7149a6..fe7537e29 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.csproj +++ b/samples/ExampleGallery/ExampleGallery.uap.csproj @@ -106,7 +106,7 @@ - 5.0.0 + 6.2.9 diff --git a/samples/SimpleSample/SimpleSample.uap.csproj b/samples/SimpleSample/SimpleSample.uap.csproj index 2a3c576ff..0a71884e6 100644 --- a/samples/SimpleSample/SimpleSample.uap.csproj +++ b/samples/SimpleSample/SimpleSample.uap.csproj @@ -125,7 +125,7 @@ - 5.0.0 + 6.2.9 diff --git a/tools/codegen/exe/OutputEffectType.cs b/tools/codegen/exe/OutputEffectType.cs index 41795724e..b69876a10 100644 --- a/tools/codegen/exe/OutputEffectType.cs +++ b/tools/codegen/exe/OutputEffectType.cs @@ -486,7 +486,7 @@ public static void OutputEffectCpp(Effects.Effect effect, Formatter output) } else { - output.WriteLine("ActivatableClassWithFactory(" + effect.ClassName + ", SimpleAgileActivationFactory<" + effect.ClassName + ">);"); + output.WriteLine("ActivatableClassWithFactory(" + effect.ClassName + ", ::SimpleAgileActivationFactory<" + effect.ClassName + ">);"); } output.Unindent(); diff --git a/winrt/lib/effects/generated/ArithmeticCompositeEffect.cpp b/winrt/lib/effects/generated/ArithmeticCompositeEffect.cpp index 02551f928..5c50bb1f0 100644 --- a/winrt/lib/effects/generated/ArithmeticCompositeEffect.cpp +++ b/winrt/lib/effects/generated/ArithmeticCompositeEffect.cpp @@ -37,5 +37,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(ArithmeticCompositeEffect, { L"ClampOutput", D2D1_ARITHMETICCOMPOSITE_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ArithmeticCompositeEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ArithmeticCompositeEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/AtlasEffect.cpp b/winrt/lib/effects/generated/AtlasEffect.cpp index dfa585f96..81bc7af28 100644 --- a/winrt/lib/effects/generated/AtlasEffect.cpp +++ b/winrt/lib/effects/generated/AtlasEffect.cpp @@ -40,5 +40,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"SourceRectangle", D2D1_ATLAS_PROP_INPUT_RECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4 }, { L"PaddingRectangle", D2D1_ATLAS_PROP_INPUT_PADDING_RECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4 }) - ActivatableClassWithFactory(AtlasEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(AtlasEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/BlendEffect.cpp b/winrt/lib/effects/generated/BlendEffect.cpp index b54463aed..f5594c796 100644 --- a/winrt/lib/effects/generated/BlendEffect.cpp +++ b/winrt/lib/effects/generated/BlendEffect.cpp @@ -36,5 +36,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(BlendEffect, { L"Mode", D2D1_BLEND_PROP_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(BlendEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(BlendEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/BorderEffect.cpp b/winrt/lib/effects/generated/BorderEffect.cpp index f6a077225..b06d5f495 100644 --- a/winrt/lib/effects/generated/BorderEffect.cpp +++ b/winrt/lib/effects/generated/BorderEffect.cpp @@ -40,5 +40,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"ExtendX", D2D1_BORDER_PROP_EDGE_MODE_X, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ExtendY", D2D1_BORDER_PROP_EDGE_MODE_Y, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(BorderEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(BorderEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/BrightnessEffect.cpp b/winrt/lib/effects/generated/BrightnessEffect.cpp index 2e52abce2..3d4415fd1 100644 --- a/winrt/lib/effects/generated/BrightnessEffect.cpp +++ b/winrt/lib/effects/generated/BrightnessEffect.cpp @@ -42,5 +42,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"WhitePoint", D2D1_BRIGHTNESS_PROP_WHITE_POINT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"BlackPoint", D2D1_BRIGHTNESS_PROP_BLACK_POINT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(BrightnessEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(BrightnessEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/ChromaKeyEffect.cpp b/winrt/lib/effects/generated/ChromaKeyEffect.cpp index cf103a8f1..c29680aaf 100644 --- a/winrt/lib/effects/generated/ChromaKeyEffect.cpp +++ b/winrt/lib/effects/generated/ChromaKeyEffect.cpp @@ -66,7 +66,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Feather", D2D1_CHROMAKEY_PROP_FEATHER, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ColorHdr", D2D1_CHROMAKEY_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(ChromaKeyEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ChromaKeyEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/ColorMatrixEffect.cpp b/winrt/lib/effects/generated/ColorMatrixEffect.cpp index 906e18d34..7dc1ace60 100644 --- a/winrt/lib/effects/generated/ColorMatrixEffect.cpp +++ b/winrt/lib/effects/generated/ColorMatrixEffect.cpp @@ -48,5 +48,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"AlphaMode", D2D1_COLORMATRIX_PROP_ALPHA_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE }, { L"ClampOutput", D2D1_COLORMATRIX_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ColorMatrixEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ColorMatrixEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/ColorSourceEffect.cpp b/winrt/lib/effects/generated/ColorSourceEffect.cpp index fa6310ff9..bcd2d8748 100644 --- a/winrt/lib/effects/generated/ColorSourceEffect.cpp +++ b/winrt/lib/effects/generated/ColorSourceEffect.cpp @@ -35,5 +35,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Color", D2D1_FLOOD_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_COLOR_TO_VECTOR4 }, { L"ColorHdr", D2D1_FLOOD_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(ColorSourceEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ColorSourceEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/CompositeEffect.cpp b/winrt/lib/effects/generated/CompositeEffect.cpp index 72dc8d93f..e65ac61eb 100644 --- a/winrt/lib/effects/generated/CompositeEffect.cpp +++ b/winrt/lib/effects/generated/CompositeEffect.cpp @@ -30,5 +30,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(CompositeEffect, { L"Mode", D2D1_COMPOSITE_PROP_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(CompositeEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(CompositeEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/ContrastEffect.cpp b/winrt/lib/effects/generated/ContrastEffect.cpp index 0499714b0..66f9f1de4 100644 --- a/winrt/lib/effects/generated/ContrastEffect.cpp +++ b/winrt/lib/effects/generated/ContrastEffect.cpp @@ -43,7 +43,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Contrast", D2D1_CONTRAST_PROP_CONTRAST, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampSource", D2D1_CONTRAST_PROP_CLAMP_INPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ContrastEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ContrastEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/ConvolveMatrixEffect.cpp b/winrt/lib/effects/generated/ConvolveMatrixEffect.cpp index 6a03caa60..a23c65256 100644 --- a/winrt/lib/effects/generated/ConvolveMatrixEffect.cpp +++ b/winrt/lib/effects/generated/ConvolveMatrixEffect.cpp @@ -115,5 +115,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"BorderMode", D2D1_CONVOLVEMATRIX_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampOutput", D2D1_CONVOLVEMATRIX_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ConvolveMatrixEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ConvolveMatrixEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/CropEffect.cpp b/winrt/lib/effects/generated/CropEffect.cpp index f635a42db..36959dd31 100644 --- a/winrt/lib/effects/generated/CropEffect.cpp +++ b/winrt/lib/effects/generated/CropEffect.cpp @@ -40,5 +40,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"SourceRectangle", D2D1_CROP_PROP_RECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4 }, { L"BorderMode", D2D1_CROP_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(CropEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(CropEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DirectionalBlurEffect.cpp b/winrt/lib/effects/generated/DirectionalBlurEffect.cpp index 18f165c47..6957bf26e 100644 --- a/winrt/lib/effects/generated/DirectionalBlurEffect.cpp +++ b/winrt/lib/effects/generated/DirectionalBlurEffect.cpp @@ -57,5 +57,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Optimization", D2D1_DIRECTIONALBLUR_PROP_OPTIMIZATION, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"BorderMode", D2D1_DIRECTIONALBLUR_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(DirectionalBlurEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DirectionalBlurEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DiscreteTransferEffect.cpp b/winrt/lib/effects/generated/DiscreteTransferEffect.cpp index 843d1b834..33f5b697f 100644 --- a/winrt/lib/effects/generated/DiscreteTransferEffect.cpp +++ b/winrt/lib/effects/generated/DiscreteTransferEffect.cpp @@ -92,5 +92,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"AlphaDisable", D2D1_DISCRETETRANSFER_PROP_ALPHA_DISABLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampOutput", D2D1_DISCRETETRANSFER_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(DiscreteTransferEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DiscreteTransferEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DisplacementMapEffect.cpp b/winrt/lib/effects/generated/DisplacementMapEffect.cpp index 69b12fd7a..de38b4e38 100644 --- a/winrt/lib/effects/generated/DisplacementMapEffect.cpp +++ b/winrt/lib/effects/generated/DisplacementMapEffect.cpp @@ -52,5 +52,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"XChannelSelect", D2D1_DISPLACEMENTMAP_PROP_X_CHANNEL_SELECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"YChannelSelect", D2D1_DISPLACEMENTMAP_PROP_Y_CHANNEL_SELECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(DisplacementMapEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DisplacementMapEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DistantDiffuseEffect.cpp b/winrt/lib/effects/generated/DistantDiffuseEffect.cpp index 3cd03827d..3ac799062 100644 --- a/winrt/lib/effects/generated/DistantDiffuseEffect.cpp +++ b/winrt/lib/effects/generated/DistantDiffuseEffect.cpp @@ -90,5 +90,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_DISTANTDIFFUSE_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_DISTANTDIFFUSE_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(DistantDiffuseEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DistantDiffuseEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DistantSpecularEffect.cpp b/winrt/lib/effects/generated/DistantSpecularEffect.cpp index 7c3d5bb51..6c43839d8 100644 --- a/winrt/lib/effects/generated/DistantSpecularEffect.cpp +++ b/winrt/lib/effects/generated/DistantSpecularEffect.cpp @@ -99,5 +99,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_DISTANTSPECULAR_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_DISTANTSPECULAR_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(DistantSpecularEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DistantSpecularEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/DpiCompensationEffect.cpp b/winrt/lib/effects/generated/DpiCompensationEffect.cpp index 756f22e63..199a0412e 100644 --- a/winrt/lib/effects/generated/DpiCompensationEffect.cpp +++ b/winrt/lib/effects/generated/DpiCompensationEffect.cpp @@ -48,5 +48,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"BorderMode", D2D1_DPICOMPENSATION_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"SourceDpi", D2D1_DPICOMPENSATION_PROP_INPUT_DPI, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(DpiCompensationEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(DpiCompensationEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/EdgeDetectionEffect.cpp b/winrt/lib/effects/generated/EdgeDetectionEffect.cpp index 46bf4156e..14d78e486 100644 --- a/winrt/lib/effects/generated/EdgeDetectionEffect.cpp +++ b/winrt/lib/effects/generated/EdgeDetectionEffect.cpp @@ -68,7 +68,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"OverlayEdges", D2D1_EDGEDETECTION_PROP_OVERLAY_EDGES, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"AlphaMode", D2D1_EDGEDETECTION_PROP_ALPHA_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE }) - ActivatableClassWithFactory(EdgeDetectionEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(EdgeDetectionEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/EmbossEffect.cpp b/winrt/lib/effects/generated/EmbossEffect.cpp index 97c647b27..5d48d70e2 100644 --- a/winrt/lib/effects/generated/EmbossEffect.cpp +++ b/winrt/lib/effects/generated/EmbossEffect.cpp @@ -43,7 +43,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Amount", D2D1_EMBOSS_PROP_HEIGHT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Angle", D2D1_EMBOSS_PROP_DIRECTION, GRAPHICS_EFFECT_PROPERTY_MAPPING_RADIANS_TO_DEGREES }) - ActivatableClassWithFactory(EmbossEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(EmbossEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/ExposureEffect.cpp b/winrt/lib/effects/generated/ExposureEffect.cpp index bf1b40217..ed637f14d 100644 --- a/winrt/lib/effects/generated/ExposureEffect.cpp +++ b/winrt/lib/effects/generated/ExposureEffect.cpp @@ -35,7 +35,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(ExposureEffect, { L"Exposure", D2D1_EXPOSURE_PROP_EXPOSURE_VALUE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ExposureEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ExposureEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/GammaTransferEffect.cpp b/winrt/lib/effects/generated/GammaTransferEffect.cpp index 969db2521..397d5fa32 100644 --- a/winrt/lib/effects/generated/GammaTransferEffect.cpp +++ b/winrt/lib/effects/generated/GammaTransferEffect.cpp @@ -160,5 +160,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"AlphaDisable", D2D1_GAMMATRANSFER_PROP_ALPHA_DISABLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampOutput", D2D1_GAMMATRANSFER_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(GammaTransferEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(GammaTransferEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/GaussianBlurEffect.cpp b/winrt/lib/effects/generated/GaussianBlurEffect.cpp index d1caa6138..0b7b7a786 100644 --- a/winrt/lib/effects/generated/GaussianBlurEffect.cpp +++ b/winrt/lib/effects/generated/GaussianBlurEffect.cpp @@ -49,5 +49,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Optimization", D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"BorderMode", D2D1_GAUSSIANBLUR_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(GaussianBlurEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(GaussianBlurEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/GrayscaleEffect.cpp b/winrt/lib/effects/generated/GrayscaleEffect.cpp index 888feadbb..803449455 100644 --- a/winrt/lib/effects/generated/GrayscaleEffect.cpp +++ b/winrt/lib/effects/generated/GrayscaleEffect.cpp @@ -24,7 +24,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na Source, 0) - ActivatableClassWithFactory(GrayscaleEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(GrayscaleEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/HighlightsAndShadowsEffect.cpp b/winrt/lib/effects/generated/HighlightsAndShadowsEffect.cpp index 266f342a2..97f019f95 100644 --- a/winrt/lib/effects/generated/HighlightsAndShadowsEffect.cpp +++ b/winrt/lib/effects/generated/HighlightsAndShadowsEffect.cpp @@ -63,7 +63,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Clarity", D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"MaskBlurAmount", D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(HighlightsAndShadowsEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(HighlightsAndShadowsEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/HueRotationEffect.cpp b/winrt/lib/effects/generated/HueRotationEffect.cpp index cf4ff8490..5e9014adc 100644 --- a/winrt/lib/effects/generated/HueRotationEffect.cpp +++ b/winrt/lib/effects/generated/HueRotationEffect.cpp @@ -32,5 +32,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(HueRotationEffect, { L"Angle", D2D1_HUEROTATION_PROP_ANGLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_RADIANS_TO_DEGREES }) - ActivatableClassWithFactory(HueRotationEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(HueRotationEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/HueToRgbEffect.cpp b/winrt/lib/effects/generated/HueToRgbEffect.cpp index e0b9a289c..adc4ba213 100644 --- a/winrt/lib/effects/generated/HueToRgbEffect.cpp +++ b/winrt/lib/effects/generated/HueToRgbEffect.cpp @@ -34,7 +34,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(HueToRgbEffect, { L"SourceColorSpace", D2D1_HUETORGB_PROP_INPUT_COLOR_SPACE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(HueToRgbEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(HueToRgbEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/InvertEffect.cpp b/winrt/lib/effects/generated/InvertEffect.cpp index b669a92db..e936cc1fd 100644 --- a/winrt/lib/effects/generated/InvertEffect.cpp +++ b/winrt/lib/effects/generated/InvertEffect.cpp @@ -24,7 +24,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na Source, 0) - ActivatableClassWithFactory(InvertEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(InvertEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/LinearTransferEffect.cpp b/winrt/lib/effects/generated/LinearTransferEffect.cpp index c0919b554..16f00ed82 100644 --- a/winrt/lib/effects/generated/LinearTransferEffect.cpp +++ b/winrt/lib/effects/generated/LinearTransferEffect.cpp @@ -128,5 +128,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"AlphaDisable", D2D1_LINEARTRANSFER_PROP_ALPHA_DISABLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampOutput", D2D1_LINEARTRANSFER_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(LinearTransferEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(LinearTransferEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/LuminanceToAlphaEffect.cpp b/winrt/lib/effects/generated/LuminanceToAlphaEffect.cpp index e83c68c2a..fe0cd002d 100644 --- a/winrt/lib/effects/generated/LuminanceToAlphaEffect.cpp +++ b/winrt/lib/effects/generated/LuminanceToAlphaEffect.cpp @@ -22,5 +22,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na Source, 0) - ActivatableClassWithFactory(LuminanceToAlphaEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(LuminanceToAlphaEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/MorphologyEffect.cpp b/winrt/lib/effects/generated/MorphologyEffect.cpp index ba64bf818..b0673e5f4 100644 --- a/winrt/lib/effects/generated/MorphologyEffect.cpp +++ b/winrt/lib/effects/generated/MorphologyEffect.cpp @@ -50,5 +50,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Width", D2D1_MORPHOLOGY_PROP_WIDTH, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Height", D2D1_MORPHOLOGY_PROP_HEIGHT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(MorphologyEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(MorphologyEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/OpacityMetadataEffect.cpp b/winrt/lib/effects/generated/OpacityMetadataEffect.cpp index 896d5322c..320852cf6 100644 --- a/winrt/lib/effects/generated/OpacityMetadataEffect.cpp +++ b/winrt/lib/effects/generated/OpacityMetadataEffect.cpp @@ -32,5 +32,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(OpacityMetadataEffect, { L"OpaqueRectangle", D2D1_OPACITYMETADATA_PROP_INPUT_OPAQUE_RECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4 }) - ActivatableClassWithFactory(OpacityMetadataEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(OpacityMetadataEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/PointDiffuseEffect.cpp b/winrt/lib/effects/generated/PointDiffuseEffect.cpp index 56ad6db29..234e40e41 100644 --- a/winrt/lib/effects/generated/PointDiffuseEffect.cpp +++ b/winrt/lib/effects/generated/PointDiffuseEffect.cpp @@ -82,5 +82,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_POINTDIFFUSE_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_POINTDIFFUSE_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(PointDiffuseEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(PointDiffuseEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/PointSpecularEffect.cpp b/winrt/lib/effects/generated/PointSpecularEffect.cpp index 826b3ec9d..35508791a 100644 --- a/winrt/lib/effects/generated/PointSpecularEffect.cpp +++ b/winrt/lib/effects/generated/PointSpecularEffect.cpp @@ -91,5 +91,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_POINTSPECULAR_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_POINTSPECULAR_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(PointSpecularEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(PointSpecularEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/PosterizeEffect.cpp b/winrt/lib/effects/generated/PosterizeEffect.cpp index 6af23d306..3b038eed7 100644 --- a/winrt/lib/effects/generated/PosterizeEffect.cpp +++ b/winrt/lib/effects/generated/PosterizeEffect.cpp @@ -53,7 +53,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"GreenValueCount", D2D1_POSTERIZE_PROP_GREEN_VALUE_COUNT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"BlueValueCount", D2D1_POSTERIZE_PROP_BLUE_VALUE_COUNT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(PosterizeEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(PosterizeEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/PremultiplyEffect.cpp b/winrt/lib/effects/generated/PremultiplyEffect.cpp index ebd845956..f0793416e 100644 --- a/winrt/lib/effects/generated/PremultiplyEffect.cpp +++ b/winrt/lib/effects/generated/PremultiplyEffect.cpp @@ -22,5 +22,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na Source, 0) - ActivatableClassWithFactory(PremultiplyEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(PremultiplyEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/RgbToHueEffect.cpp b/winrt/lib/effects/generated/RgbToHueEffect.cpp index efa3e2db3..ac174f94a 100644 --- a/winrt/lib/effects/generated/RgbToHueEffect.cpp +++ b/winrt/lib/effects/generated/RgbToHueEffect.cpp @@ -34,7 +34,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(RgbToHueEffect, { L"OutputColorSpace", D2D1_RGBTOHUE_PROP_OUTPUT_COLOR_SPACE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(RgbToHueEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(RgbToHueEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/SaturationEffect.cpp b/winrt/lib/effects/generated/SaturationEffect.cpp index b10af0858..1ecdb27f6 100644 --- a/winrt/lib/effects/generated/SaturationEffect.cpp +++ b/winrt/lib/effects/generated/SaturationEffect.cpp @@ -33,5 +33,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(SaturationEffect, { L"Saturation", D2D1_SATURATION_PROP_SATURATION, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(SaturationEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(SaturationEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/ScaleEffect.cpp b/winrt/lib/effects/generated/ScaleEffect.cpp index 20883d580..30845df5c 100644 --- a/winrt/lib/effects/generated/ScaleEffect.cpp +++ b/winrt/lib/effects/generated/ScaleEffect.cpp @@ -66,5 +66,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"BorderMode", D2D1_SCALE_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Sharpness", D2D1_SCALE_PROP_SHARPNESS, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(ScaleEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ScaleEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/SepiaEffect.cpp b/winrt/lib/effects/generated/SepiaEffect.cpp index e49b2b14d..aa25d3c8e 100644 --- a/winrt/lib/effects/generated/SepiaEffect.cpp +++ b/winrt/lib/effects/generated/SepiaEffect.cpp @@ -43,7 +43,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Intensity", D2D1_SEPIA_PROP_INTENSITY, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"AlphaMode", D2D1_SEPIA_PROP_ALPHA_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE }) - ActivatableClassWithFactory(SepiaEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(SepiaEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/ShadowEffect.cpp b/winrt/lib/effects/generated/ShadowEffect.cpp index 0fa4563fa..fb019490e 100644 --- a/winrt/lib/effects/generated/ShadowEffect.cpp +++ b/winrt/lib/effects/generated/ShadowEffect.cpp @@ -56,5 +56,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Optimization", D2D1_SHADOW_PROP_OPTIMIZATION, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ShadowColorHdr", D2D1_SHADOW_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(ShadowEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(ShadowEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/SharpenEffect.cpp b/winrt/lib/effects/generated/SharpenEffect.cpp index eccd3b9ab..44d75dad9 100644 --- a/winrt/lib/effects/generated/SharpenEffect.cpp +++ b/winrt/lib/effects/generated/SharpenEffect.cpp @@ -44,7 +44,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Amount", D2D1_SHARPEN_PROP_SHARPNESS, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Threshold", D2D1_SHARPEN_PROP_THRESHOLD, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(SharpenEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(SharpenEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/SpotDiffuseEffect.cpp b/winrt/lib/effects/generated/SpotDiffuseEffect.cpp index 1b5b0137f..7c2975ac3 100644 --- a/winrt/lib/effects/generated/SpotDiffuseEffect.cpp +++ b/winrt/lib/effects/generated/SpotDiffuseEffect.cpp @@ -107,5 +107,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_SPOTDIFFUSE_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_SPOTDIFFUSE_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(SpotDiffuseEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(SpotDiffuseEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/SpotSpecularEffect.cpp b/winrt/lib/effects/generated/SpotSpecularEffect.cpp index f30d7b84a..d8d309604 100644 --- a/winrt/lib/effects/generated/SpotSpecularEffect.cpp +++ b/winrt/lib/effects/generated/SpotSpecularEffect.cpp @@ -116,5 +116,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"HeightMapInterpolationMode", D2D1_SPOTSPECULAR_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"LightColorHdr", D2D1_SPOTSPECULAR_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(SpotSpecularEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(SpotSpecularEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/StraightenEffect.cpp b/winrt/lib/effects/generated/StraightenEffect.cpp index 5feb1238c..47aeb6624 100644 --- a/winrt/lib/effects/generated/StraightenEffect.cpp +++ b/winrt/lib/effects/generated/StraightenEffect.cpp @@ -51,7 +51,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"MaintainSize", D2D1_STRAIGHTEN_PROP_MAINTAIN_SIZE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"InterpolationMode", D2D1_STRAIGHTEN_PROP_SCALE_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(StraightenEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(StraightenEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/TableTransfer3DEffect.cpp b/winrt/lib/effects/generated/TableTransfer3DEffect.cpp index e5726b6ed..645ba6963 100644 --- a/winrt/lib/effects/generated/TableTransfer3DEffect.cpp +++ b/winrt/lib/effects/generated/TableTransfer3DEffect.cpp @@ -42,7 +42,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Table", D2D1_LOOKUPTABLE3D_PROP_LUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"AlphaMode", D2D1_LOOKUPTABLE3D_PROP_ALPHA_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE }) - ActivatableClassWithFactory(TableTransfer3DEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(TableTransfer3DEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/TableTransferEffect.cpp b/winrt/lib/effects/generated/TableTransferEffect.cpp index 17d389a1a..53005d153 100644 --- a/winrt/lib/effects/generated/TableTransferEffect.cpp +++ b/winrt/lib/effects/generated/TableTransferEffect.cpp @@ -92,5 +92,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"AlphaDisable", D2D1_TABLETRANSFER_PROP_ALPHA_DISABLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ClampOutput", D2D1_TABLETRANSFER_PROP_CLAMP_OUTPUT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(TableTransferEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(TableTransferEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/TemperatureAndTintEffect.cpp b/winrt/lib/effects/generated/TemperatureAndTintEffect.cpp index 333d0764c..da8899cfb 100644 --- a/winrt/lib/effects/generated/TemperatureAndTintEffect.cpp +++ b/winrt/lib/effects/generated/TemperatureAndTintEffect.cpp @@ -44,7 +44,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Temperature", D2D1_TEMPERATUREANDTINT_PROP_TEMPERATURE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Tint", D2D1_TEMPERATUREANDTINT_PROP_TINT, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(TemperatureAndTintEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(TemperatureAndTintEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/effects/generated/TileEffect.cpp b/winrt/lib/effects/generated/TileEffect.cpp index e6078da1a..086bb8f8b 100644 --- a/winrt/lib/effects/generated/TileEffect.cpp +++ b/winrt/lib/effects/generated/TileEffect.cpp @@ -32,5 +32,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na IMPLEMENT_EFFECT_PROPERTY_MAPPING(TileEffect, { L"SourceRectangle", D2D1_TILE_PROP_RECT, GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4 }) - ActivatableClassWithFactory(TileEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(TileEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/Transform2DEffect.cpp b/winrt/lib/effects/generated/Transform2DEffect.cpp index 6dfafc5ff..5f5b2725d 100644 --- a/winrt/lib/effects/generated/Transform2DEffect.cpp +++ b/winrt/lib/effects/generated/Transform2DEffect.cpp @@ -57,5 +57,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"TransformMatrix", D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Sharpness", D2D1_2DAFFINETRANSFORM_PROP_SHARPNESS, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(Transform2DEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(Transform2DEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/Transform3DEffect.cpp b/winrt/lib/effects/generated/Transform3DEffect.cpp index af8a94e5a..1e80844a3 100644 --- a/winrt/lib/effects/generated/Transform3DEffect.cpp +++ b/winrt/lib/effects/generated/Transform3DEffect.cpp @@ -49,5 +49,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"BorderMode", D2D1_3DTRANSFORM_PROP_BORDER_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"TransformMatrix", D2D1_3DTRANSFORM_PROP_TRANSFORM_MATRIX, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(Transform3DEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(Transform3DEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/TurbulenceEffect.cpp b/winrt/lib/effects/generated/TurbulenceEffect.cpp index 4089ba0e1..b6a5cccd5 100644 --- a/winrt/lib/effects/generated/TurbulenceEffect.cpp +++ b/winrt/lib/effects/generated/TurbulenceEffect.cpp @@ -80,5 +80,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Noise", D2D1_TURBULENCE_PROP_NOISE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"Tileable", D2D1_TURBULENCE_PROP_STITCHABLE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) - ActivatableClassWithFactory(TurbulenceEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(TurbulenceEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/UnPremultiplyEffect.cpp b/winrt/lib/effects/generated/UnPremultiplyEffect.cpp index 21bd44473..10bac9bcf 100644 --- a/winrt/lib/effects/generated/UnPremultiplyEffect.cpp +++ b/winrt/lib/effects/generated/UnPremultiplyEffect.cpp @@ -22,5 +22,5 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na Source, 0) - ActivatableClassWithFactory(UnPremultiplyEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(UnPremultiplyEffect, ::SimpleAgileActivationFactory); }}}}} diff --git a/winrt/lib/effects/generated/VignetteEffect.cpp b/winrt/lib/effects/generated/VignetteEffect.cpp index f6ccf02cd..01198727c 100644 --- a/winrt/lib/effects/generated/VignetteEffect.cpp +++ b/winrt/lib/effects/generated/VignetteEffect.cpp @@ -59,7 +59,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na { L"Curve", D2D1_VIGNETTE_PROP_STRENGTH, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, { L"ColorHdr", D2D1_VIGNETTE_PROP_COLOR, GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN }) - ActivatableClassWithFactory(VignetteEffect, SimpleAgileActivationFactory); + ActivatableClassWithFactory(VignetteEffect, ::SimpleAgileActivationFactory); }}}}} #endif // _WIN32_WINNT_WIN10 diff --git a/winrt/lib/winrt.lib.uap.vcxproj b/winrt/lib/winrt.lib.uap.vcxproj index 53429b37b..0e878a9cf 100644 --- a/winrt/lib/winrt.lib.uap.vcxproj +++ b/winrt/lib/winrt.lib.uap.vcxproj @@ -50,7 +50,7 @@ - + diff --git a/winrt/test.external/winrt.test.external.uap.vcxproj b/winrt/test.external/winrt.test.external.uap.vcxproj index 00ff805c8..2d7236b73 100644 --- a/winrt/test.external/winrt.test.external.uap.vcxproj +++ b/winrt/test.external/winrt.test.external.uap.vcxproj @@ -7,7 +7,7 @@ 14.0 en-US true - 15.0 + 16.0 NativeUnitTestProject Windows Store 10.0 diff --git a/winrt/test.internal/mocks/MockD2DFactory.h b/winrt/test.internal/mocks/MockD2DFactory.h index 59e7c4022..ec75f5c52 100644 --- a/winrt/test.internal/mocks/MockD2DFactory.h +++ b/winrt/test.internal/mocks/MockD2DFactory.h @@ -6,6 +6,8 @@ namespace canvas { +#pragma warning(push) +#pragma warning(disable: 4996) // GetDesktopDpi() is deprecated; don't let that break the build class MockD2DFactory : public RuntimeClass < RuntimeClassFlags, ChainInterfaces < ID2D1Factory2, ID2D1Factory1, ID2D1Factory >, ID2D1Multithread > @@ -275,6 +277,7 @@ namespace canvas int GetEnterCount() const { return m_enterCount; } int GetLeaveCount() const { return m_leaveCount; } }; +#pragma warning(pop) inline ComPtr MakeMockD2DFactory() diff --git a/winrt/test.internal/utils/Helpers.h b/winrt/test.internal/utils/Helpers.h index 16129164e..ce0b67c4a 100644 --- a/winrt/test.internal/utils/Helpers.h +++ b/winrt/test.internal/utils/Helpers.h @@ -671,6 +671,7 @@ namespace Microsoft END_ENUM(SamplerCoordinateMapping); } +#ifndef MS_CPP_UNITTESTFRAMEWORK_ASSERT // This overload is also defined there. template<> inline std::wstring ToString<__int64>(__int64 const& value) { @@ -683,6 +684,7 @@ namespace Microsoft return buf; } +#endif ENUM_TO_STRING(DWRITE_FLOW_DIRECTION) { diff --git a/winrt/test.internal/winrt.test.internal.uap.vcxproj b/winrt/test.internal/winrt.test.internal.uap.vcxproj index f9e6077db..3fd3ee244 100644 --- a/winrt/test.internal/winrt.test.internal.uap.vcxproj +++ b/winrt/test.internal/winrt.test.internal.uap.vcxproj @@ -12,7 +12,7 @@ - v141 + v142 winrt.test.internal.uap DynamicLibrary false diff --git a/winrt/test.internal/xaml/BaseControlUnitTests.cpp b/winrt/test.internal/xaml/BaseControlUnitTests.cpp index dbc750105..dc2b4d68d 100644 --- a/winrt/test.internal/xaml/BaseControlUnitTests.cpp +++ b/winrt/test.internal/xaml/BaseControlUnitTests.cpp @@ -153,7 +153,7 @@ namespace }; } -using Internal::AggregateType; +using ::ABI::Windows::Foundation::Internal::AggregateType; template<> struct ITypedEventHandler diff --git a/winrt/test.internal/xaml/RecreatableDeviceManagerTests.cpp b/winrt/test.internal/xaml/RecreatableDeviceManagerTests.cpp index cf51ea1b8..132d68666 100644 --- a/winrt/test.internal/xaml/RecreatableDeviceManagerTests.cpp +++ b/winrt/test.internal/xaml/RecreatableDeviceManagerTests.cpp @@ -8,7 +8,7 @@ #include "mocks/MockCanvasDeviceActivationFactory.h" -using Internal::AggregateType; +using ::ABI::Windows::Foundation::Internal::AggregateType; template<> struct ITypedEventHandler diff --git a/winrt/test.managed/winrt.test.managed.uap.csproj b/winrt/test.managed/winrt.test.managed.uap.csproj index d08d1965e..0cde34b32 100644 --- a/winrt/test.managed/winrt.test.managed.uap.csproj +++ b/winrt/test.managed/winrt.test.managed.uap.csproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,12 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 14.0 + 16.0 true + true + true - - - obj - obj - $(AssetDir)TemporaryKey.pfx @@ -118,9 +112,6 @@ Assets\WideLogo.scale-240.png - - - Designer @@ -157,14 +148,17 @@ + + 16.2.0 + - 6.0.8 + 6.2.9 - 1.2.0 + 2.0.0 - 1.2.0 + 2.0.0 diff --git a/winrt/test.nativecomponent/ShaderCompiler.cpp b/winrt/test.nativecomponent/ShaderCompiler.cpp index 6a510f9dd..bb2666b61 100644 --- a/winrt/test.nativecomponent/ShaderCompiler.cpp +++ b/winrt/test.nativecomponent/ShaderCompiler.cpp @@ -13,10 +13,13 @@ namespace NativeComponent public: static Platform::Array^ CompileShader(Platform::String^ shaderCode, Platform::String^ targetProfile, Platform::String^ entryPoint) { - // Convert Unicode -> ASCII (sloppily, just casting wchar_t to char, but this is good enough for unit tests). - std::string asciiShader(shaderCode->Begin(), shaderCode->End()); - std::string asciiProfile(targetProfile->Begin(), targetProfile->End()); - std::string asciiEntryPoint(entryPoint->Begin(), entryPoint->End()); + // Convert Unicode -> ASCII + std::string asciiShader(shaderCode->Length(), ' '); + std::transform(shaderCode->Begin(), shaderCode->End(), asciiShader.begin(), [](wchar_t c) { return static_cast(c); }); + std::string asciiProfile(targetProfile->Length(), ' '); + std::transform(targetProfile->Begin(), targetProfile->End(), asciiProfile.begin(), [](wchar_t c) { return static_cast(c); }); + std::string asciiEntryPoint(entryPoint->Length(), ' '); + std::transform(entryPoint->Begin(), entryPoint->End(), asciiEntryPoint.begin(), [](wchar_t c) { return static_cast(c); }); ComPtr result; ComPtr errors;