AppInstancing feature

ProjectReunion.sln

@@ -26,6 +26,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inc", "test\inc\inc.vcxitems", "{B567FE2E-3A03-48D0-B2B5-760CDEC35891}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppLifecycleTestApp", "test\TestApps\AppLifecycleTestApp\AppLifecycleTestApp.vcxproj", "{7C502995-59C3-483B-86BA-815985353633}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
+		{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
+		{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicDependency", "DynamicDependency", "{6CD01EF6-D4A4-4801-ADCF-344CF87FF942}"
 EndProject
@@ -87,17 +92,39 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UndockedRegFreeWinRT", "dev\UndockedRegFreeWinRT\UndockedRegFreeWinRT.vcxitems", "{56371CA6-144B-4989-A4E9-391AD4FA7651}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppLifecycleTests", "test\AppLifecycle\AppLifecycle.vcxproj", "{C62688A1-16A0-4729-B6ED-842F4FAA29F3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9} = {A3FBA80D-5B35-471F-9A45-DB4B29E195B9}
+		{A7391725-4EF5-438F-8DE1-645423E46955} = {A7391725-4EF5-438F-8DE1-645423E46955}
+		{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
+		{B71E818A-882E-456A-87E5-4DE4A6602B99} = {B71E818A-882E-456A-87E5-4DE4A6602B99}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DynamicDependencyLifetimeManagerGC1000.Msix", "test\DynamicDependency\data\DynamicDependencyLifetimeManagerGC1000.Msix\DynamicDependencyLifetimeManagerGC1000.Msix.vcxproj", "{5D97F9A6-AFAD-4B0C-B609-E62DDDE6E4FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DynamicDependencyLifetimeManagerGC1010.Msix", "test\DynamicDependency\data\DynamicDependencyLifetimeManagerGC1010.Msix\DynamicDependencyLifetimeManagerGC1010.Msix.vcxproj", "{72F124D1-A1D2-44BC-8941-1B4C452591E5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{A657A14D-910D-43F3-9994-DAB0E22C4530}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ManualTestApp", "test\TestApps\ManualTestApp\ManualTestApp.vcxproj", "{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
+		{A7391725-4EF5-438F-8DE1-645423E46955} = {A7391725-4EF5-438F-8DE1-645423E46955}
+		{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
+		{8C79C46D-1577-44CA-83DF-88B74C3E4586} = {8C79C46D-1577-44CA-83DF-88B74C3E4586}
+		{B71E818A-882E-456A-87E5-4DE4A6602B99} = {B71E818A-882E-456A-87E5-4DE4A6602B99}
+		{D6BC25C5-1AA7-4C4A-A02C-B42DEDBFEA33} = {D6BC25C5-1AA7-4C4A-A02C-B42DEDBFEA33}
+		{2E5BF0D2-78FA-4B60-A341-F65A0D58BD86} = {2E5BF0D2-78FA-4B60-A341-F65A0D58BD86}
+		{51293DFA-614B-4355-A60D-B30DF3228FD1} = {51293DFA-614B-4355-A60D-B30DF3228FD1}
+	EndProjectSection
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppLifecycleTestPackage", "test\TestApps\AppLifecycleTestPackage\AppLifecycleTestPackage.wapproj", "{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		dev\UndockedRegFreeWinRT\UndockedRegFreeWinRT.vcxitems*{56371ca6-144b-4989-a4e9-391ad4fa7651}*SharedItemsImports = 9
 		test\inc\inc.vcxitems*{7c502995-59c3-483b-86ba-815985353633}*SharedItemsImports = 4
+		test\inc\inc.vcxitems*{8e52d7ea-a200-4a6b-ba74-8efb49468caf}*SharedItemsImports = 4
 		test\inc\inc.vcxitems*{b567fe2e-3a03-48d0-b2b5-760cdec35891}*SharedItemsImports = 9
 		dev\Common\Common.vcxitems*{b73ad907-6164-4294-88fb-f3c9c10da1f1}*SharedItemsImports = 4
 		dev\DynamicDependency\DynamicDependency.vcxitems*{b73ad907-6164-4294-88fb-f3c9c10da1f1}*SharedItemsImports = 4
@@ -629,6 +656,79 @@ Global
 		{72F124D1-A1D2-44BC-8941-1B4C452591E5}.Release|x64.Build.0 = Release|x64
 		{72F124D1-A1D2-44BC-8941-1B4C452591E5}.Release|x86.ActiveCfg = Release|Win32
 		{72F124D1-A1D2-44BC-8941-1B4C452591E5}.Release|x86.Build.0 = Release|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|Any CPU.ActiveCfg = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|Any CPU.Build.0 = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|ARM.ActiveCfg = Debug|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|ARM.Build.0 = Debug|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|x64.ActiveCfg = Debug|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|x64.Build.0 = Debug|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|x86.ActiveCfg = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug_test|x86.Build.0 = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|ARM.Build.0 = Debug|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|x64.ActiveCfg = Debug|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|x64.Build.0 = Debug|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|x86.ActiveCfg = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Debug|x86.Build.0 = Debug|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|Any CPU.ActiveCfg = Release|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|ARM.ActiveCfg = Release|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|ARM.Build.0 = Release|ARM
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|ARM64.Build.0 = Release|ARM64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|x64.ActiveCfg = Release|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|x64.Build.0 = Release|x64
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|x86.ActiveCfg = Release|Win32
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF}.Release|x86.Build.0 = Release|Win32
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|Any CPU.Build.0 = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|Any CPU.Deploy.0 = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM.ActiveCfg = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM.Build.0 = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM.Deploy.0 = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|ARM64.Deploy.0 = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x64.ActiveCfg = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x64.Build.0 = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x64.Deploy.0 = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x86.ActiveCfg = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x86.Build.0 = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug_test|x86.Deploy.0 = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM.ActiveCfg = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM.Build.0 = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM.Deploy.0 = Debug|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x64.ActiveCfg = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x64.Build.0 = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x64.Deploy.0 = Debug|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x86.ActiveCfg = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x86.Build.0 = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Debug|x86.Deploy.0 = Debug|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM.ActiveCfg = Release|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM.Build.0 = Release|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM.Deploy.0 = Release|ARM
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM64.Build.0 = Release|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|ARM64.Deploy.0 = Release|ARM64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x64.ActiveCfg = Release|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x64.Build.0 = Release|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x64.Deploy.0 = Release|x64
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x86.ActiveCfg = Release|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x86.Build.0 = Release|x86
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -666,6 +766,8 @@ Global
 		{5D97F9A6-AFAD-4B0C-B609-E62DDDE6E4FA} = {0C534F12-B076-47E5-A05B-2A711233AC6F}
 		{72F124D1-A1D2-44BC-8941-1B4C452591E5} = {0C534F12-B076-47E5-A05B-2A711233AC6F}
 		{A657A14D-910D-43F3-9994-DAB0E22C4530} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
+		{8E52D7EA-A200-4A6B-BA74-8EFB49468CAF} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
+		{A3FBA80D-5B35-471F-9A45-DB4B29E195B9} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

build/AzurePipelinesTemplates/ProjectReunion-CreateNugetPackage-Job.yml

@@ -64,7 +64,7 @@ jobs:
 
         Copy-Item -Path "$targetsFilePath\AppxManifest.xml" -Destination "$fullpackagePath\AppxManifest.xml"
 
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.ApplicationModel.Activation.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.ApplicationModel.Activation.xml"
+        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.AppLifecycle.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.AppLifecycle.xml"
         Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.ApplicationModel.DynamicDependency.xml"
 
   # - script: |

build/CopyFilesToStagingDir.ps1

@@ -36,7 +36,7 @@ PublishFile $BuildOutputDir\override\DynamicDependency-Override.json $FullPublis
 
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.dll $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.lib $FullPublishDir\Microsoft.ProjectReunion\
-PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.Activation.winmd $FullPublishDir\Microsoft.ProjectReunion\
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.DynamicDependency.winmd $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\MsixDynamicDependency.h $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\wil_msixdynamicdependency.h $FullPublishDir\Microsoft.ProjectReunion\
@@ -112,12 +112,12 @@ PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicD
 PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicDependencyLifetimeManager.ProxyStub.pdb $NugetDir\runtimes\win10-$Platform\native
 #
 # WinMD for UWP apps
-PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.Activation.winmd $NugetDir\lib\uap10.0
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\uap10.0
 #
 # Native (not managed, no MSIX)
 PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.dll $NugetDir\runtimes\lib\native\$Platform
 PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.pdb $NugetDir\runtimes\lib\native\$Platform
-PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.Activation.winmd $NugetDir\lib\native
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\native
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.DynamicDependency.winmd $NugetDir\lib\native
 #
 # C#/WinRT Projections

build/NuSpecs/AppxManifest.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build" IgnorableNamespaces="uap build">
   <Identity Name="Microsoft.ProjectReunion.0.5" ProcessorArchitecture="x64" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="0.52102.3000.0" />
   <Properties>
@@ -35,8 +35,8 @@
           <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.DynamicDependency.PackageDependencyRank" ThreadingModel="both" />
 
           <!-- AppLifecycle -->
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Activation.ActivationRegistrationManager" ThreadingModel="both" />
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Activation.AppLifecycle" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.ActivationRegistrationManager" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.AppInstance" ThreadingModel="both" />
       </InProcessServer>
     </Extension>
   </Extensions>

build/NuSpecs/Intellisense/Microsoft.Windows.AppLifecycle.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>Microsoft.Windows.AppLifecycle</name>
+  </assembly>
+  <members>
+  </members>
+</doc>
+

build/NuSpecs/ProjectReunion-Nuget-Native.WinRt.props

@@ -10,9 +10,9 @@
 
   <!-- OutputType Exe corresponds to C++ -->
   <ItemGroup Condition="'$(OutputType)' == 'Exe'">
-    <Reference Include="Microsoft.ApplicationModel.Activation.winmd">
-      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.ApplicationModel.Activation.winmd</HintPath>
-      <Implementation Condition="'$(ProjectReunionFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_ProjectReunionFoundationPlatform)\native\Microsoft.ApplicationModel.Activation.dll</Implementation>
+    <Reference Include="Microsoft.Windows.AppLifecycle.winmd">
+      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.AppLifecycle.winmd</HintPath>
+      <Implementation Condition="'$(ProjectReunionFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_ProjectReunionFoundationPlatform)\native\Microsoft.Windows.AppLifecycle.dll</Implementation>
       <IsWinMDFile>true</IsWinMDFile>
     </Reference>
     <Reference Include="Microsoft.ApplicationModel.DynamicDependency.winmd">

dev/AppLifecycle/ActivatedEventArgsBase.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 #pragma once
 
-namespace winrt::Microsoft::ApplicationModel::Activation::implementation
+namespace winrt::Microsoft::Windows::AppLifecycle::implementation
 {
     using namespace winrt::Windows::ApplicationModel::Activation;