Skip to content

Commit

Permalink
Resolve merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
kythant committed Aug 10, 2022
2 parents 991765a + edc79b1 commit 92d1e15
Show file tree
Hide file tree
Showing 198 changed files with 912 additions and 911 deletions.
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ body:
label: NuGet package version
description: Specify the version of Windows App SDK (or Project Reunion) you're using.
options:
- "1.1.1"
- "1.2.220727.1-experimental1"
- "1.1.3"
- "1.1.0-preview3"
- "1.0.4"
- "1.0.0-preview3"
- "1.0.0-experimental1"
- "0.8.10"
- "0.8.12"
- "0.5"
- type: dropdown
attributes:
Expand Down
17 changes: 17 additions & 0 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeploymentAgent", "dev\Depl
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
EndProjectSection
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1322,6 +1324,20 @@ Global
{4410D374-A90C-4ADF-8B15-AA2AAE2636BF}.Release|x64.Build.0 = Release|x64
{4410D374-A90C-4ADF-8B15-AA2AAE2636BF}.Release|x86.ActiveCfg = Release|Win32
{4410D374-A90C-4ADF-8B15-AA2AAE2636BF}.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
Expand Down Expand Up @@ -1436,6 +1452,7 @@ Global
{D9139E3C-8D21-4BD9-84E3-30A03A54D610} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
{4A74BBED-3B20-44A7-B6FF-3373160DE741} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
{4410D374-A90C-4ADF-8B15-AA2AAE2636BF} = {E378857C-D22A-4E5E-A6DA-A59C445CF22E}
{E6D59245-696F-4D13-ACF6-7ECE6E653367} = {716C26A0-E6B0-4981-8412-D14A4D410531}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand Down
6 changes: 6 additions & 0 deletions build/CopyFilesToStagingDir.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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\

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build/NuSpecs/Microsoft.WindowsAppSDK.BootstrapCommon.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<!-- Targets file common to both managed and native projects that helps enable access to Framework packages-->

<PropertyGroup Condition="'$(WindowsAppSdkBootstrapInitialize)'=='' and '$(WindowsAppSDKSelfContained)'!='true' and '$(WindowsPackageType)'=='None'">
<PropertyGroup Condition="'$(WindowsAppSdkBootstrapInitialize)'=='' and '$(WindowsAppSDKSelfContained)'!='true' and '$(WindowsPackageType)'=='None' and ('$(OutputType)'=='Exe' or '$(OutputType)'=='Winexe')">
<!--Allows GenerateBootstrapCS/GenerateBootstrapCpp to run-->
<WindowsAppSdkBootstrapInitialize>true</WindowsAppSdkBootstrapInitialize>
</PropertyGroup>

<PropertyGroup Condition="'$(WindowsAppSdkBootstrapInitialize)'== 'true'">
<PublishAppxPackage>false</PublishAppxPackage>
</PropertyGroup>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion build/NuSpecs/WindowsAppSDK-Nuget-Native.C.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions build/NuSpecs/WindowsAppSDK-Nuget-Native.WinRt.props
Original file line number Diff line number Diff line change
Expand Up @@ -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')">
Expand Down
7 changes: 7 additions & 0 deletions build/NuSpecs/WindowsAppSDK-Nuget-Native.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
34 changes: 29 additions & 5 deletions build/ProjectReunion-BuildFoundation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,27 @@ jobs:
# This relatively low-cost job is always run, in parallel w/ the Build job.
- template: AzurePipelinesTemplates\WindowsAppSDK-SourceAnalysis-job.yml

- job: Build
- job: VerifyCopyrightHeaders
dependsOn: []
pool: $(ProjectReunionBuildPool)
steps:
- task: powershell@2
displayName: 'Verify copyright headers'
inputs:
targetType: filePath
filePath: tools\VerifyCopyrightHeaders.ps1

- job: Build
dependsOn:
- VerifyCopyrightHeaders
# Skip the build job if we are reusing the output of a previous build.
# useBuildOutputFromBuildId variable is set on the Pipeline at Queue time.
condition:
eq(variables['useBuildOutputFromBuildId'],'')
condition: |
and
(
eq(variables['useBuildOutputFromBuildId'],''),
in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
)
pool: $(ProjectReunionBuildPool)
timeoutInMinutes: 120
strategy:
Expand Down Expand Up @@ -120,8 +135,14 @@ jobs:
- job: BuildAnyCPU
# For now, this job just builds Microsoft.WindowsAppRuntime.Bootstrap.Net.dll in AnyCPU
# Can be expanded to add any other binary as needed
condition:
eq(variables['useBuildOutputFromBuildId'],'')
dependsOn:
- VerifyCopyrightHeaders
condition: |
and
(
eq(variables['useBuildOutputFromBuildId'],''),
in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
)
pool: $(ProjectReunionBuildPool)
timeoutInMinutes: 120
variables:
Expand Down Expand Up @@ -202,6 +223,9 @@ jobs:

- job: BuildMRT
pool: $(ProjectReunionBuildPool)
dependsOn:
- VerifyCopyrightHeaders
condition: in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
strategy:
maxParallel: 10
matrix:
Expand Down
20 changes: 19 additions & 1 deletion build/ProjectReunion-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,20 @@ jobs:
TSLint: false
ToolLogsNotFoundAction: 'Standard'

- job: VerifyCopyrightHeaders
pool:
vmImage: 'windows-2019'
steps:
- task: powershell@2
displayName: 'Verify copyright headers'
inputs:
targetType: filePath
filePath: tools\VerifyCopyrightHeaders.ps1

- job: Build
dependsOn:
- VerifyCopyrightHeaders
condition: in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
pool:
vmImage: 'windows-2022'
timeoutInMinutes: 120
Expand Down Expand Up @@ -113,6 +126,9 @@ jobs:
ToolLogsNotFoundAction: 'Standard'

- job: BuildMRT
dependsOn:
- VerifyCopyrightHeaders
condition: in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
pool:
vmImage: 'windows-2022'
strategy:
Expand Down Expand Up @@ -189,12 +205,14 @@ jobs:
publishToMaestro: false
jobName: CreateNugetPackage
dependsOn:
- VerifyCopyrightHeaders
- Build
- PublishMRT
prereleaseVersionTag: ci
condition: |
and
(
in(dependencies.PublishMRT.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.Build.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
in(dependencies.Build.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.VerifyCopyrightHeaders.result, 'Succeeded')
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include <pch.h>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include <pch.h>
#include <accctrl.h>
#include <aclapi.h>
#include <userenv.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include <pch.h>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include <pch.h>
#include "Microsoft.Windows.Security.AccessControl.h"
#include "Microsoft.Windows.Security.AccessControl.SecurityDescriptorHelpers.g.cpp"
#include "Security.AccessControl.h"
Expand Down
5 changes: 4 additions & 1 deletion dev/AccessControl/Microsoft.Windows.Security.AccessControl.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once
#include "Microsoft.Windows.Security.AccessControl.SecurityDescriptorHelpers.g.h"

namespace winrt::Microsoft::Windows::Security::AccessControl::implementation
Expand Down
5 changes: 4 additions & 1 deletion dev/AccessControl/Security.AccessControl.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once

#include <Windows.h>

Expand Down
5 changes: 4 additions & 1 deletion dev/AccessControl/SecurityDescriptorHelpers.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once

#include <Windows.h>
#include <wil/resource.h>
Expand Down
3 changes: 1 addition & 2 deletions dev/AppLifecycle/AppInstance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation

std::wstring eventName = name + c_activatedEventNameSuffix;
wil::unique_event cleanupEvent;
cleanupEvent.open(eventName.c_str());
if (cleanupEvent)
if (cleanupEvent.try_open(eventName.c_str()))
{
// If the event is missing, it means the waiter gave up. Ignore the error.
cleanupEvent.SetEvent();
Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotification.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include "pch.h"
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include "pch.h"
#include "AppNotification.h"
#include "Microsoft.Windows.AppNotifications.AppNotification.g.cpp"

Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotification.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once
#include "Microsoft.Windows.AppNotifications.AppNotification.g.h"

namespace winrt::Microsoft::Windows::AppNotifications::implementation
Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotificationActivatedEventArgs.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once
#include "Microsoft.Windows.AppNotifications.AppNotificationActivatedEventArgs.g.h"

namespace winrt::Microsoft::Windows::AppNotifications::implementation
Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotificationManager.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include "pch.h"
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include "pch.h"
#include "AppNotificationManager.h"
#include "Microsoft.Windows.AppNotifications.AppNotificationManager.g.cpp"
#include <winrt/Windows.ApplicationModel.Core.h>
Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotificationManager.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once
#include "Microsoft.Windows.AppNotifications.AppNotificationManager.g.h"
#include "NotificationActivationCallback.h"
#include "AppNotificationUtility.h"
Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotificationProgressData.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include "pch.h"
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include "pch.h"
#include "AppNotificationProgressData.h"
#include "Microsoft.Windows.AppNotifications.AppNotificationProgressData.g.cpp"

Expand Down
5 changes: 4 additions & 1 deletion dev/AppNotifications/AppNotificationProgressData.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once
#include "Microsoft.Windows.AppNotifications.AppNotificationProgressData.g.h"

namespace winrt::Microsoft::Windows::AppNotifications::implementation
Expand Down
Loading

0 comments on commit 92d1e15

Please sign in to comment.