User/erlangl/fixforpaul

.config/tsaoptions.json

@@ -0,0 +1,9 @@
+{
+    "instanceUrl": "https://microsoft.visualstudio.com",
+    "projectName": "os",
+    "areaPath": "OS\\WDX\\DXP\\APT-Application Platform and Tools\\BTAD-Base Tools and Developer experiences\\WinAppSDK Engineering System",
+    "iterationPath": "OS",
+    "notificationAliases": [ "WinAppSDK-Build@microsoft.com" ],
+    "ignoreBranchName": true,
+    "codebaseName": "WinAppSDK"
+}

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -35,20 +35,12 @@ body:
       label: NuGet package version
       description: Specify the version of Windows App SDK (or Project Reunion) you're using.
       options:
+        - "1.1.3"
         - "1.1.0-preview3"
-        - "1.1.0-preview2"
-        - "1.1.0-preview1"
-        - "1.0.0"
+        - "1.0.4"
         - "1.0.0-preview3"
-        - "1.0.0-preview2"
-        - "1.0.0-preview1"
         - "1.0.0-experimental1"
-        - "0.8.5"
-        - "0.8.4"
-        - "0.8.3"
-        - "0.8.2"
-        - "0.8.1"
-        - "0.8.0"
+        - "0.8.10"
         - "0.5"
   - type: dropdown
     attributes:

NuGet.config

@@ -3,7 +3,7 @@
   <packageSources>
     <clear />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-    <add key="WindowsAppSDK-Dependencies" value="https://pkgs.dev.azure.com/ms/ProjectReunion/_packaging/ProjectReunion-Dependencies/nuget/v3/index.json" />
+    <add key="ProjectReunion internal" value="https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

WindowsAppRuntime.sln

@@ -352,6 +352,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppNotificationBuilder", "d
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppNotificationBuilderTests", "test\AppNotificationBuilderTests\AppNotificationBuilderTests.vcxproj", "{131DE0C4-AA1E-4649-B5BC-7B43508FA93A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Windows.Security.AccessControl.Projection", "dev\Projections\CS\Microsoft.Windows.Security.AccessControl.Projection\Microsoft.Windows.Security.AccessControl.Projection.csproj", "{E6D59245-696F-4D13-ACF6-7ECE6E653367}"
+ndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		test\inc\inc.vcxitems*{08bc78e0-63c6-49a7-81b3-6afc3deac4de}*SharedItemsImports = 4
@@ -1374,6 +1376,20 @@ Global
 		{131DE0C4-AA1E-4649-B5BC-7B43508FA93A}.Release|x64.Build.0 = Release|x64
 		{131DE0C4-AA1E-4649-B5BC-7B43508FA93A}.Release|x86.ActiveCfg = Release|Win32
 		{131DE0C4-AA1E-4649-B5BC-7B43508FA93A}.Release|x86.Build.0 = Release|Win32
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|ARM64.Build.0 = Debug|arm64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|x64.ActiveCfg = Debug|x64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|x64.Build.0 = Debug|x64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|x86.ActiveCfg = Debug|x86
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Debug|x86.Build.0 = Debug|x86
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|Any CPU.ActiveCfg = Release|x86
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|ARM64.ActiveCfg = Release|arm64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|ARM64.Build.0 = Release|arm64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|x64.ActiveCfg = Release|x64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|x64.Build.0 = Release|x64
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|x86.ActiveCfg = Release|x86
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1490,6 +1506,7 @@ Global
 		{4410D374-A90C-4ADF-8B15-AA2AAE2636BF} = {E378857C-D22A-4E5E-A6DA-A59C445CF22E}
 		{E49329F3-5196-4BBA-B5C4-E11CE7EFB07A} = {1C9A0791-2BAA-420B-84B6-C0721F22A6E8}
 		{131DE0C4-AA1E-4649-B5BC-7B43508FA93A} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
+		{E6D59245-696F-4D13-ACF6-7ECE6E653367} = {716C26A0-E6B0-4981-8412-D14A4D410531}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

build/AzurePipelinesTemplates/WindowsAppSDK-BinaryAnalysis-steps.yml

@@ -0,0 +1,40 @@
+parameters:
+  # Caller optionally overrides these.
+  - name: outputDirectory
+    type: string
+    default: $(Build.SourcesDirectory)\BuildOutput
+  - name: enablePREFast
+    type: boolean
+    default: true
+
+steps:
+  - task: NodeTool@0
+    displayName: 'Use Node >=8.6.0'
+    inputs:
+      versionSpec: '>=8.6.0'
+
+  - template: v2/Steps/PackageES/Windows.SDL.Binary.Analysis.OS.Undocked.yml@templates_onebranch
+    parameters:
+      variables:
+        ob_outputDirectory: ${{ parameters.outputDirectory }}
+        ob_sdl_binskim_scanOutputDirectoryOnly: true
+        ob_sdl_binskim_break: false 
+      globalsdl:
+        binskim:
+          enabled: true
+          break: true
+          # The following serves as an include/exclude example (*untested*).
+          # analyzeTargetGlob: '+:file|**\bin\**\*.dll;-:file|**\Microsoft.WindowsAppRuntime.Insights.Resource.dll'
+        prefast:
+          ${{ if ne(parameters.enablePREFast, true) }}:
+            enabled: false
+          ${{ if eq(parameters.enablePREFast, true) }}:
+            enabled: true
+          # ToDo: set the following to true once pre-existing errors are resolved.
+          break: false
+        # The following scans we already did during in the SourceAnalysis job, not repeating here.
+        # ToDo: Consider disabling Antimalware also, but how?
+        credscan:
+          enabled: false
+        policheck:
+          enabled: false

build/AzurePipelinesTemplates/WindowsAppSDK-BuildDevProject-Steps.yml

@@ -1,6 +1,8 @@
 parameters:
   channel: 'experimental'
   enableLicenseInstall: false
+  runSDLBinaryAnalysis: false
+  enablePREFast: true
 
 steps:
   - template: WindowsAppSDK-BuildProject-Steps.yml
@@ -11,3 +13,5 @@ steps:
       publishDir: $(publishDir)
       channel: ${{ parameters.channel }}
       enableLicenseInstall: ${{ parameters.enableLicenseInstall }}
+      runSDLBinaryAnalysis: ${{ parameters.runSDLBinaryAnalysis }}
+      enablePREFast: ${{ parameters.enablePREFast }}

build/AzurePipelinesTemplates/WindowsAppSDK-BuildProject-Steps.yml

@@ -9,7 +9,8 @@ parameters:
   # license installation assets are only accessible in internal builds, but are only
   # needed in release-signed stable builds. Only enble this functionality in the private
   # pipeline builds. Otherwise, default to an inert placeholder implementation.
-
+  runSDLBinaryAnalysis: false
+  enablePREFast: true
 
 steps:
   - ${{ if eq(parameters.enableLicenseInstall, true) }}:
@@ -175,6 +176,12 @@ steps:
       configuration: '$(buildConfiguration)'
       msbuildArgs: '/restore /p:AppxSymbolPackageEnabled=false /binaryLogger:$(Build.SourcesDirectory)/${{ parameters.solutionPath }}.$(buildPlatform).$(buildConfiguration).binlog /p:WindowsAppSDKVersionBuild=$(builddate_yymm) /p:WindowsAppSDKVersionRevision=$(builddate_dd)$(buildrevision) /p:VCToolsInstallDir="$(VCToolsInstallDir)\" /p:PGOBuildMode=$(PGOBuildMode) /p:WindowsAppSDKBuildPipeline=1 /p:WindowsAppSDKCleanIntermediateFiles=${{ parameters.WindowsAppSDKCleanIntermediateFiles }}'
 
+  - ${{ if eq(parameters.runSDLBinaryAnalysis, 'true') }}:
+    - template: WindowsAppSDK-BinaryAnalysis-steps.yml
+      parameters:
+        outputDirectory: '${{ parameters.buildOutputDir }}'
+        enablePREFast: ${{ parameters.enablePREFast }}
+
   - task: powershell@2
     displayName: 'Install test certificate for MSIX test packages (DevCheck)'
     inputs:

build/AzurePipelinesTemplates/WindowsAppSDK-BuildSolution-Steps.yml

@@ -3,6 +3,8 @@ parameters:
   displayName: ''
   additionalMsBuildArgs: ''
   WindowsAppSDKCleanIntermediateFiles: 'true'
+  runSDLBinaryAnalysis: false
+  enablePREFast: true
 
 # Note, this template depends on these variables from parent yml:
 # $(buildConfiguration), $(buildPlatform)
@@ -26,6 +28,12 @@ steps:
     msbuildArgs: /binaryLogger:$(Build.SourcesDirectory)\${{ parameters.displayName }}.$(buildConfiguration).$(buildPlatform).binlog /restore ${{ parameters.additionalMsBuildArgs }} /p:WindowsAppSDKCleanIntermediateFiles=${{ parameters.WindowsAppSDKCleanIntermediateFiles }}
     logProjectEvents: false
 
+- ${{ if eq(parameters.runSDLBinaryAnalysis, 'true') }}:
+  - template: WindowsAppSDK-BinaryAnalysis-steps.yml
+    parameters:
+      outputDirectory: '$(Build.SourcesDirectory)\buildoutput'
+      enablePREFast: ${{ parameters.enablePREFast }}
+
 - task: PublishBuildArtifacts@1
   displayName: 'Publish ${{ parameters.displayName }} binlog'
   condition: always()

build/AzurePipelinesTemplates/WindowsAppSDK-SourceAnalysis-job.yml

@@ -0,0 +1,41 @@
+# This job is expected to run in parallel with the build task.
+
+jobs:
+- job: SDLSourcesScanning
+  pool: 
+    name: $(buildPool)
+  steps:
+  # Required by the Packaged ES SDL Templates.
+  - checkout: self
+    persistCredentials: true
+
+  - task: NodeTool@0
+    displayName: 'Use Node >=8.6.0'
+    inputs:
+      versionSpec: '>=8.6.0'
+
+  - template: v2/Steps/PackageES/Windows.SDL.Sources.Analysis.OS.Undocked.yml@templates_onebranch
+    parameters:
+      globalsdl:
+        tsa:
+          # Not filing bugs for issues found by the scans just yet.
+          #enabled: true    
+          enabled: false    
+        codeql:
+          tsandjs:
+            enabled: true
+            break: true
+          python:
+            enabled: true
+            break: true
+          psscriptanalyzer:
+            enable: true
+            break: true
+          credscan:
+            enable: true
+            break: true
+          policheck:       
+            # ToDo: Once pre-existing issues have been resolved, set break to true.
+            enable: true
+            break: false
+

build/CopyFilesToStagingDir.ps1

@@ -45,8 +45,10 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windo
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.ApplicationModel.WindowsAppRuntime.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.Power.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
+PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.AccessControl.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\MsixDynamicDependency.h $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\wil_msixdynamicdependency.h $FullPublishDir\Microsoft.WindowsAppRuntime\
+PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\Security.AccessControl.h $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\RestartAgent\RestartAgent.exe $FullPublishDir\Microsoft.WindowsAppRuntime\
 PublishFile $FullBuildOutput\DeploymentAgent\DeploymentAgent.exe $FullPublishDir\Microsoft.WindowsAppRuntime\
 
@@ -97,6 +99,8 @@ PublishFile $FullBuildOutput\Microsoft.Windows.System.Projection\Microsoft.Windo
 PublishFile $FullBuildOutput\Microsoft.Windows.System.Projection\Microsoft.Windows.System.Projection.pdb $NugetDir\lib\net5.0-windows10.0.17763.0
 PublishFile $FullBuildOutput\Microsoft.Windows.System.Power.Projection\Microsoft.Windows.System.Power.Projection.dll $NugetDir\lib\net5.0-windows10.0.17763.0
 PublishFile $FullBuildOutput\Microsoft.Windows.System.Power.Projection\Microsoft.Windows.System.Power.Projection.pdb $NugetDir\lib\net5.0-windows10.0.17763.0
+PublishFile $FullBuildOutput\Microsoft.Windows.Security.AccessControl.Projection\Microsoft.Windows.Security.AccessControl.Projection.dll $NugetDir\lib\net5.0-windows10.0.17763.0
+PublishFile $FullBuildOutput\Microsoft.Windows.Security.AccessControl.Projection\Microsoft.Windows.Security.AccessControl.Projection.pdb $NugetDir\lib\net5.0-windows10.0.17763.0
 #
 # Dynamic Dependency build overrides
 PublishFile $OverrideDir\DynamicDependency-Override.json $NugetDir\runtimes\win10-$Platform\native
@@ -109,6 +113,7 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\MddBootstrap.h $Nuge
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\MsixDynamicDependency.h $NugetDir\include
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\wil_msixdynamicdependency.h $NugetDir\include
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntimeInsights.h $NugetDir\include\
+PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\Security.AccessControl.h $NugetDir\include\
 #
 # Libraries (*.lib)
 PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\Microsoft.WindowsAppRuntime.Bootstrap.lib $NugetDir\lib\win10-$Platform
@@ -159,6 +164,7 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windo
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.ApplicationModel.WindowsAppRuntime.winmd $NugetDir\lib\uap10.0
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.winmd $NugetDir\lib\uap10.0
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.Power.winmd $NugetDir\lib\uap10.0
+PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.AccessControl.winmd $NugetDir\lib\uap10.0
 #
 # Bootstrap Auto-Initializer Files
 PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\MddBootstrapAutoInitializer.cpp $NugetDir\include

build/NuSpecs/WindowsAppSDK-Nuget-Native.C.props

@@ -29,7 +29,7 @@
       </AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /y "$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.Bootstrap.dll" "$(OutDir)"</Command>
+      <Command>xcopy.exe /y "$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.Bootstrap.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
 

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

@@ -30,6 +30,11 @@
       <Implementation Condition="'$(WindowsAppSDKFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.dll</Implementation>
       <IsWinMDFile>true</IsWinMDFile>
     </Reference>
+    <Reference Include="Microsoft.Windows.Security.AccessControl.winmd">
+      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.AccessControl.winmd</HintPath>
+      <Implementation Condition="'$(WindowsAppSDKFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+    </Reference>
     <!-- conditionally include experimental metadata -->
     <Reference Include="Microsoft.Windows.System.winmd" 
       Condition="Exists('$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.System.winmd')">

build/NuSpecs/WindowsAppSDK-Nuget-Native.targets

@@ -37,6 +37,13 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.AccessControl.winmd">
+      <Private>false</Private>
+      <Implementation>Microsoft.WindowsAppRuntime.dll</Implementation>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.ApplicationModel.Resources.winmd">
       <Private>false</Private>