jkunkee · azchohfi · Apr 23, 2019 · Jul 23, 2019 · Aug 21, 2019 · Aug 22, 2019
diff --git 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
@@ -270,7 +270,8 @@
     <_VsTest Condition="Exists('$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
     <_VsTest Condition="Exists('$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
     <_VsTest Condition="Exists('$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
-    <VsTest>"$([System.IO.Path]::GetFullPath('$(_VsTest)'))"</VsTest>
+	<_VsTest Condition="Exists('$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>
+    <VsTest Condition="'$(_VsTest)' != ''">"$([System.IO.Path]::GetFullPath('$(_VsTest)'))"</VsTest>
   </PropertyGroup>
 
   <Target Name="RunTests"
@@ -279,8 +280,14 @@
           Inputs="@(TestProjects)"
           Outputs="%(TestProjects.TestAppX)">
 
+    <PropertyGroup>
+        <PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
+    </PropertyGroup>
+
+    <Error Text="vstest.console.exe not found, please specify using the VsTest property" Condition="'$(VsTest)' == ''" />
     <Message Importance="High" Text="Running tests: %(TestProjects.Filename) (%(TestProjects.Configuration)|%(TestProjects.Platform))" />
 
+	<Exec Command="$(PowerShellExe) -NonInteractive -executionpolicy Unrestricted -command &quot;&amp; { get-appxpackage -name E2C40EB9-8CCE-48B1-9A5C-4C8CA4999631 | remove-appxpackage } &quot;" ConsoleToMsBuild="true" ContinueOnError="ErrorAndContinue" IgnoreStandardErrorWarningFormat="true"/>
     <Exec Command="$(VsTest) %(TestProjects.TestBinary)%(TestProjects.TestArgs)" ContinueOnError="ErrorAndContinue" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 

diff --git 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
@@ -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
@@ -49,11 +49,11 @@
   </ItemGroup>
 
   <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(ApplicationType)' == 'Windows Store' And '$(ApplicationTypeRevision)' == '10.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(ApplicationType)' == 'Windows Store' And '$(ApplicationTypeRevision)' == '10.0'">v142</PlatformToolset>
   </PropertyGroup>
 
   <PropertyGroup>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'ARM64'">
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

diff --git a/build/Win2D.cs.props b/build/Win2D.cs.props
@@ -15,7 +15,7 @@
   <PropertyGroup>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'ARM64'">
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>

diff --git a/build/nuget/Win2D.common.targets b/build/nuget/Win2D.common.targets
@@ -28,7 +28,7 @@
 
   <Target Name="Win2DValidatePlatformVersion"
           BeforeTargets="ResolveAssemblyReferences"
-          Condition="'$(TargetPlatformVersion)' != '' and '$(DisableWin2DPlatformCheck)' == ''">
+          Condition="('$(TargetPlatformVersion)' != '' and '$(TargetPlatformVersion)' != '10.0') and '$(DisableWin2DPlatformCheck)' == ''">
 
     <Win2DIsPlatformTooOld ActualVersion="$(TargetPlatformVersion)" RequiredVersion="$(Win2DMinPlatformVersion)">
       <Output TaskParameter="Result" PropertyName="Win2DPlatformTooOld" />

diff --git a/build/nuget/Win2D.uwp-managed.targets b/build/nuget/Win2D.uwp-managed.targets
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <win2d-Platform Condition="$(RuntimeIdentifier.EndsWith('-x64'))">x64</win2d-Platform>
+    <win2d-Platform Condition="$(RuntimeIdentifier.EndsWith('-x86'))">x86</win2d-Platform>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(win2d-Platform)' == ''">
+    <win2d-Platform Condition="'$(Platform)' == 'Win32'">x86</win2d-Platform>
+    <win2d-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</win2d-Platform>
+    <win2d-Platform Condition="'$(Platform)' == 'AnyCPU'"></win2d-Platform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Win2DWarnNoPlatform Condition="'$(Win2DWarnNoPlatform)' == ''">true</Win2DWarnNoPlatform>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Graphics.Canvas">
+      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Graphics.Canvas.winmd</HintPath>
+      <Implementation>Microsoft.Graphics.Canvas.dll</Implementation>
+    </Reference>
+    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(win2d-Platform)\native\Microsoft.Graphics.Canvas.dll" Condition="'$(win2d-Platform)' != ''" />
+  </ItemGroup>
+
+  <Target Name="Win2DWarnNoPlatform" BeforeTargets="BeforeBuild" Condition="'$(win2d-Platform)' == '' and '$(Win2DWarnNoPlatform)' == 'true'">
+    <Warning Text="Microsoft.Graphics.Canvas.dll could not be copied because the AnyCPU platform is being used. Please specify a specific platform to copy this file." />
+  </Target>
+
+  <!--
+  Don't import Win2D.common.targets here, as it will cause build failures because desktop project
+  files don't define $(TargetPlatformVersion) with the same semantics as with UWP or C++ project files.
+  -->
+
+</Project>
diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec
@@ -20,6 +20,8 @@
       <file target="Win2d.githash.txt"                                       src="obj\Win2d.githash.txt" />
 
       <file target="build\native\Win2D.uwp.targets"                          src="build\nuget\Win2D.uwp-native.targets" />
+      <file target="build\netcoreapp3.0\Win2D.uwp.targets"                   src="build\nuget\Win2D.uwp-managed.targets" />
+      <file target="build\net45\Win2D.uwp.targets"                           src="build\nuget\Win2D.uwp-managed.targets" />
       <file target="build\win10\Win2D.uwp.targets"                           src="build\nuget\Win2D.uwp-win10.targets" />
       <file target="build\Win2D.common.targets"                              src="build\nuget\Win2D.common.targets" />
 
@@ -28,6 +30,10 @@
 
       <file target="lib\uap10.0\Microsoft.Graphics.Canvas.winmd"             src="$bin$\UAPx86\release\winrt.dll.UAP\Microsoft.Graphics.Canvas.winmd" />
       <file target="lib\uap10.0\Microsoft.Graphics.Canvas.xml"               src="bin\intellisense\Microsoft.Graphics.Canvas.xml" />
+      <file target="lib\netcoreapp3.0\Microsoft.Graphics.Canvas.winmd"       src="$bin$\UAPx86\release\winrt.dll.UAP\Microsoft.Graphics.Canvas.winmd" />
+      <file target="lib\netcoreapp3.0\Microsoft.Graphics.Canvas.xml"         src="bin\intellisense\Microsoft.Graphics.Canvas.xml" />
+      <file target="lib\net45\Microsoft.Graphics.Canvas.winmd"       src="$bin$\UAPx86\release\winrt.dll.UAP\Microsoft.Graphics.Canvas.winmd" />
+      <file target="lib\net45\Microsoft.Graphics.Canvas.xml"         src="bin\intellisense\Microsoft.Graphics.Canvas.xml" />
 
       <file target="runtimes\win10-arm64\native\Microsoft.Graphics.Canvas.dll" src="$bin$\UAPARM64\release\winrt.dll.UAP\Microsoft.Graphics.Canvas.dll" />
       <file target="runtimes\win10-arm\native\Microsoft.Graphics.Canvas.dll" src="$bin$\UAPARM\release\winrt.dll.UAP\Microsoft.Graphics.Canvas.dll" />

diff --git a/samples/CompositionExample/CompositionExample.csproj b/samples/CompositionExample/CompositionExample.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.csproj b/samples/CoreWindowExample/CoreWindowExample.uap.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -110,7 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -109,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/ExampleGallery/ExampleGallery.uap.csproj b/samples/ExampleGallery/ExampleGallery.uap.csproj
@@ -127,7 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/SimpleSample/SimpleSample.uap.csproj b/samples/SimpleSample/SimpleSample.uap.csproj
@@ -146,7 +146,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git 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/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
       <summary>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.</summary>
     </member>
     <member name="P:Microsoft.Graphics.Canvas.Text.CanvasFontFace.CapHeight">
-      <summary>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.</summary>
+      <summary>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.</summary>
     </member>
     <member name="P:Microsoft.Graphics.Canvas.Text.CanvasFontFace.CaretOffset">
       <summary>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).</summary>

diff --git 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 <see
           cref="E:Microsoft.Graphics.Canvas.Printing.CanvasPrintDocument.Print"/>
           event is raised.  The application can then draw each page in turn
-          using <cee
+          using <see
           cref="M:Microsoft.Graphics.Canvas.Printing.CanvasPrintEventArgs.CreateDrawingSession"/>
         </p>
         <p>

diff --git 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
 
         <step><content>
           <para>
-            Now you can animate the Gaussian blur. Find the <codeInline>canvas_AnimatedDraw</codeInline> method and add the
+            Now you can animate the Gaussian blur. Find the <codeInline>canvas_DrawAnimated</codeInline> method and add the
             following code:
           </para>
           <code language="cs">
-            private void canvas_AnimatedDraw(
+            private void canvas_DrawAnimated(
                 Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender,
                 Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args)
             {

diff --git 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<ArithmeticCompositeEffect>);
+    ActivatableClassWithFactory(ArithmeticCompositeEffect, ::SimpleAgileActivationFactory<ArithmeticCompositeEffect>);
 }}}}}
diff --git 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<AtlasEffect>);
+    ActivatableClassWithFactory(AtlasEffect, ::SimpleAgileActivationFactory<AtlasEffect>);
 }}}}}
diff --git 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<BlendEffect>);
+    ActivatableClassWithFactory(BlendEffect, ::SimpleAgileActivationFactory<BlendEffect>);
 }}}}}
diff --git 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<BorderEffect>);
+    ActivatableClassWithFactory(BorderEffect, ::SimpleAgileActivationFactory<BorderEffect>);
 }}}}}
diff --git 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<BrightnessEffect>);
+    ActivatableClassWithFactory(BrightnessEffect, ::SimpleAgileActivationFactory<BrightnessEffect>);
 }}}}}
diff --git 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<ChromaKeyEffect>);
+    ActivatableClassWithFactory(ChromaKeyEffect, ::SimpleAgileActivationFactory<ChromaKeyEffect>);
 }}}}}
 
 #endif // _WIN32_WINNT_WIN10
diff --git 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<ColorMatrixEffect>);
+    ActivatableClassWithFactory(ColorMatrixEffect, ::SimpleAgileActivationFactory<ColorMatrixEffect>);
 }}}}}
diff --git 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<ColorSourceEffect>);
+    ActivatableClassWithFactory(ColorSourceEffect, ::SimpleAgileActivationFactory<ColorSourceEffect>);
 }}}}}
diff --git 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<CompositeEffect>);
+    ActivatableClassWithFactory(CompositeEffect, ::SimpleAgileActivationFactory<CompositeEffect>);
 }}}}}
diff --git 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<ContrastEffect>);
+    ActivatableClassWithFactory(ContrastEffect, ::SimpleAgileActivationFactory<ContrastEffect>);
 }}}}}
 
 #endif // _WIN32_WINNT_WIN10
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    output.WriteLine("ActivatableClassWithFactory(" + effect.ClassName + ", SimpleAgileActivationFactory<" + effect.ClassName + ">);");
+                    output.WriteLine("ActivatableClassWithFactory(" + effect.ClassName + ", ::SimpleAgileActivationFactory<" + effect.ClassName + ">);");
                 }
                 output.Unindent();
@@ Expand Down @@