FI main into WNP_ToastNotification_L1

Directory.Build.props

@@ -51,6 +51,9 @@
   <!-- Build with the hybrid CRT (Universal CRT + Static VS CRT (for what little the Universal CRT doesn't cover) -->
   <Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
 
+  <!-- Build with APIscan-friendly compiler+linker options -->
+  <Import Project="$(MSBuildThisFileDirectory)ApiScan.Cpp.props" />
+
   <!-- Load the test certificate's password (so we do it once for reuse across projects) -->
   <PropertyGroup Condition="'$(RepoTestCertificatePFX)' == ''">
     <RepoTestCertificatePFX>$(RepoRoot)\.user\winappsdk.certificate.test.pfx</RepoTestCertificatePFX>

WindowsAppRuntime.sln

@@ -289,8 +289,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licensing", "Licensing", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Licensing", "dev\Licensing\Licensing.vcxitems", "{885A43FA-052D-4B0D-A2DC-13EE15796435}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AccessControl", "AccessControl", "{A06B7FE8-D201-4EA2-BB10-61B4595EC377}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AccessControl", "dev\AccessControl\AccessControl.vcxitems", "{C91BCB93-9ED1-4ACD-85F3-26F9F6AC52E3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AccessControlTests", "test\AccessControlTests\AccessControlTests.vcxproj", "{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
+		{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
+		{03EBF097-66C6-4996-95A3-28F6F5999E27} = {03EBF097-66C6-4996-95A3-28F6F5999E27}
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE} = {D5667DF6-A151-4081-ABC7-B93E8E5604CE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AccessControlTestApp", "test\TestApps\AccessControlTestApp\AccessControlTestApp.vcxproj", "{D5667DF6-A151-4081-ABC7-B93E8E5604CE}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AccessControlTestAppPackage", "test\TestApps\AccessControlTestAppPackage\AccessControlTestAppPackage.wapproj", "{03EBF097-66C6-4996-95A3-28F6F5999E27}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		test\inc\inc.vcxitems*{08bc78e0-63c6-49a7-81b3-6afc3deac4de}*SharedItemsImports = 4
 		test\inc\inc.vcxitems*{0a5fee93-48b7-40ec-bb9a-b27d11060da9}*SharedItemsImports = 4
 		dev\PushNotifications\PushNotifications.vcxitems*{103c0c23-7ba8-4d44-a63c-83488e2e3a81}*SharedItemsImports = 9
 		test\inc\inc.vcxitems*{2cd5cd9b-cf45-4fa7-9769-ee4e02426bf0}*SharedItemsImports = 4
@@ -312,7 +329,9 @@ Global
 		dev\PowerNotifications\PowerNotifications.vcxitems*{b75c1b22-553c-40e4-b38e-6ab4d01fdb9d}*SharedItemsImports = 9
 		dev\DynamicDependency\API\DynamicDependency.vcxitems*{bf055a59-0919-4e34-9b76-dd055495cc5a}*SharedItemsImports = 9
 		test\inc\inc.vcxitems*{c62688a1-16a0-4729-b6ed-842f4faa29f3}*SharedItemsImports = 4
+		dev\AccessControl\AccessControl.vcxitems*{c91bcb93-9ed1-4acd-85f3-26f9f6ac52e3}*SharedItemsImports = 9
 		dev\Common\Common.vcxitems*{d45d4170-e055-4926-8b03-04daa5f02c6c}*SharedItemsImports = 4
+		test\inc\inc.vcxitems*{d5667df6-a151-4081-abc7-b93e8e5604ce}*SharedItemsImports = 4
 		dev\Deployment\Deployment.vcxitems*{db38fb4d-d04f-4c1d-93e0-f8ae259c5fd6}*SharedItemsImports = 9
 		dev\EnvironmentManager\ChangeTracker\ChangeTracker.vcxitems*{e15c3465-9d45-495d-92ce-b91ef45e8623}*SharedItemsImports = 9
 		dev\AppLifecycle\AppLifecycle.vcxitems*{e3a522a3-6635-4a42-bded-1af46a15f63c}*SharedItemsImports = 9
@@ -1184,6 +1203,59 @@ Global
 		{BC5E5A3E-E733-4388-8B00-F8495DA7C778}.Release|x64.Build.0 = Release|x64
 		{BC5E5A3E-E733-4388-8B00-F8495DA7C778}.Release|x86.ActiveCfg = Release|Win32
 		{BC5E5A3E-E733-4388-8B00-F8495DA7C778}.Release|x86.Build.0 = Release|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|ARM.ActiveCfg = Debug|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|x64.ActiveCfg = Debug|x64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|x64.Build.0 = Debug|x64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|x86.ActiveCfg = Debug|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Debug|x86.Build.0 = Debug|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|ARM.ActiveCfg = Release|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|ARM64.ActiveCfg = Release|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|x64.ActiveCfg = Release|x64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|x64.Build.0 = Release|x64
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|x86.ActiveCfg = Release|Win32
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE}.Release|x86.Build.0 = Release|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|ARM.ActiveCfg = Debug|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|x64.ActiveCfg = Debug|x64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|x64.Build.0 = Debug|x64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|x86.ActiveCfg = Debug|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Debug|x86.Build.0 = Debug|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|ARM.ActiveCfg = Release|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|ARM64.Build.0 = Release|ARM64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|x64.ActiveCfg = Release|x64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|x64.Build.0 = Release|x64
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|x86.ActiveCfg = Release|Win32
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE}.Release|x86.Build.0 = Release|Win32
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|ARM.ActiveCfg = Debug|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|ARM64.Build.0 = Debug|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x64.ActiveCfg = Debug|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x64.Build.0 = Debug|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x64.Deploy.0 = Debug|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x86.ActiveCfg = Debug|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x86.Build.0 = Debug|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Debug|x86.Deploy.0 = Debug|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|Any CPU.ActiveCfg = Release|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|ARM.ActiveCfg = Release|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|ARM64.ActiveCfg = Release|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|ARM64.Build.0 = Release|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|ARM64.Deploy.0 = Release|ARM64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x64.ActiveCfg = Release|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x64.Build.0 = Release|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x64.Deploy.0 = Release|x64
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x86.ActiveCfg = Release|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x86.Build.0 = Release|x86
+		{03EBF097-66C6-4996-95A3-28F6F5999E27}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1274,6 +1346,11 @@ Global
 		{BC5E5A3E-E733-4388-8B00-F8495DA7C778} = {3DE93B2F-F887-437D-B512-6B1024ABA290}
 		{34671779-4A4D-4D0E-B259-CD0F14D4F6D4} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
 		{885A43FA-052D-4B0D-A2DC-13EE15796435} = {34671779-4A4D-4D0E-B259-CD0F14D4F6D4}
+		{A06B7FE8-D201-4EA2-BB10-61B4595EC377} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
+		{C91BCB93-9ED1-4ACD-85F3-26F9F6AC52E3} = {A06B7FE8-D201-4EA2-BB10-61B4595EC377}
+		{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
+		{D5667DF6-A151-4081-ABC7-B93E8E5604CE} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
+		{03EBF097-66C6-4996-95A3-28F6F5999E27} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

build/AzurePipelinesTemplates/WindowsAppSDK-CreateNugetPackage-Job.yml

@@ -70,19 +70,7 @@ jobs:
         $xslt = New-Object System.Xml.Xsl.XslCompiledTransform;
         $xslt.Load('build\TransformAppxManifest.xslt');
         $xslt.Transform($fullpackagePath+'\AppxManifest.xml', $manifestPath+'\Microsoft.WindowsAppSdk.Foundation.manifest');
-
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.AppLifecycle.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.AppLifecycle.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.ApplicationModel.DynamicDependency.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.WindowsAppSDK.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.ApplicationModel.WindowsAppSDK.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.System.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.System.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.System.Power.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.System.Power.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.PushNotifications.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.PushNotifications.xml"
-
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.AppLifecycle.xml" -Destination "$fullpackagePath\lib\net5.0-windows10.0.17763.0\Microsoft.Windows.AppLifecycle.Projection.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.System.Power.xml" -Destination "$fullpackagePath\lib\net5.0-windows10.0.17763.0\Microsoft.Windows.System.Power.Projection.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\net5.0-windows10.0.17763.0\Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.WindowsAppSDK.xml" -Destination "$fullpackagePath\lib\net5.0-windows10.0.17763.0\Microsoft.Windows.ApplicationModel.WindowsAppSDK.Projection.xml"
-
+
   # - script: |
   #     dir /s $(Build.SourcesDirectory)
 

build/AzurePipelinesTemplates/WindowsAppSDK-RunHelixTests-Job.yml

@@ -30,8 +30,8 @@ jobs:
 
     # The target queues to run the tests on.
     # Note: %3b is the escape sequence for ';' which is used as the delimiter
-    helixTargetQueuesOpen: 'Windows.10.Amd64.ClientRS5.Open.reunion%3bWindows.10.Amd64.Client19h1.Open.reunion%3bWindows.10.Amd64.Client20h2.Open.reunion'
-    helixTargetQueuesClosed: 'Windows.10.Amd64.ClientRS5.reunion%3bWindows.10.Amd64.Client19h1.reunion%3bWindows.10.Amd64.Client20h2.reunion'
+    helixTargetQueuesOpen: 'Windows.10.Amd64.ClientRS5.Open.reunion%3bWindows.10.Amd64.Client20h2.Open.reunion%3bwindows.10.amd64.client21h1.open.reunion'
+    helixTargetQueuesClosed: 'windows.10.amd64.client20h2.reunion%3bwindows.10.amd64.clientrs5.reunion%3bwindows.10.amd64.client21h1.reunion'
 
     # When a test fails, it is re-run 10 times. This variable specifies how many times out of 10 it is required to pass
     rerunPassesRequiredToAvoidFailure: 8

build/NuSpecs/AppxManifest.xml

@@ -61,6 +61,8 @@
 		  <ActivatableClass ActivatableClassId="Microsoft.Windows.ToastNotifications.ToastAssets" ThreadingModel="both" />
 		  <ActivatableClass ActivatableClassId="Microsoft.Windows.ToastNotifications.ToastNotificationManager" ThreadingModel="both" />
 
+          <!-- AccessControl -->
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.Security.AccessControl.SecurityDescriptorHelpers" ThreadingModel="both" />
       </InProcessServer>
     </Extension>
   </Extensions>

build/publish-mrt.yml

@@ -27,15 +27,6 @@ steps:
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\uap10.0\'
     flattenFolders: true
 
-- task: CopyFiles@2
-  displayName: 'copy Intellisense into uap10.0 folder'
-  inputs:
-    SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging\Intellisense'
-    Contents: |
-      Microsoft.Windows.ApplicationModel.Resources.xml
-    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\uap10.0\'
-    flattenFolders: true
-
 - task: CopyFiles@2
   displayName: 'copy .net 5 projection DLL and PDB'
   inputs:
@@ -46,15 +37,6 @@ steps:
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\net5.0-windows10.0.17763.0\'
     flattenFolders: true
 
-- task: CopyFiles@2
-  displayName: 'copy Intellisense into .net 5 folder'
-  inputs:
-    SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging\Intellisense'
-    Contents: |
-      Microsoft.Windows.ApplicationModel.Resources.Projection.xml
-    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\net5.0-windows10.0.17763.0\'
-    flattenFolders: true
-
 - task: CopyFiles@2
   displayName: 'copy x86'
   inputs:

dev/AccessControl/AccessControl.idl

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+namespace Microsoft.Windows.Security.AccessControl
+{
+    struct AppContainerNameAndAccess
+    {
+        String appContainerName;
+        UInt32 accessMask;
+    };
+
+    static runtimeclass SecurityDescriptorHelpers
+    {
+        static String GetSddlForAppContainerNames(
+            AppContainerNameAndAccess[] accessRequests,
+            String principalStringSid,
+            UInt32 principalAccessMask
+        );
+
+        static UInt8[] GetSecurityDescriptorBytesFromAppContainerNames(
+            AppContainerNameAndAccess[] accessRequests,
+            String principalStringSid,
+            UInt32 principalAccessMask
+        );
+    };
+}

dev/AccessControl/AccessControl.vcxitems

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{c91bcb93-9ed1-4acd-85f3-26f9f6ac52e3}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="$(MSBuildThisFileDirectory)AccessControl.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Security.AccessControl.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Microsoft.Windows.Security.AccessControl.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)SecurityDescriptorHelpers.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)GetSecurityDescriptorForAppContainerNames.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Microsoft.Windows.Security.AccessControl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <PublicHeaders Include="$(MSBuildThisFileDirectory)Security.AccessControl.h" />
+  </ItemGroup>
+</Project>