Skip to content

Commit

Permalink
User/erlangl/fixforpaul (#2783)
Browse files Browse the repository at this point in the history
* Use internal nuget feed for develop branch (#2274)

* Test push

* Test push revert

* Merge and Update FrameworkUDK

* publish to feed only on scheduled builds (#2571)

* Refactor register API (#2557)

* Refactor register API

* Address comments

* Address minor comments

* don't need these parameters

* Revert "don't need these parameters"

This reverts commit 5c76b96.

* FI main into develop (#2602)

* Create a pipeline to automate FIs from main to develop (#2610)

* Create tsaoptions.json

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Delete WindowsAppSDK-SourceAnalysis-job.yml

* Delete WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update ProjectReunion-CI.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update build-mrt.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update DownloadDotNetCoreSdk.ps1

* Update global.json

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update global.json

* Update global.json

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Add 1.1.1 & 1.0.4 to bug template and remove outdated versions (#2627)

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-CI.yml

* FI develop into WNP_ContentBuilder_Prev1 (#2656)

* Fix issue where WinUI C# and C++ item templates are not appearing in WinUI projects

* Making EM RS5+. Limiting the tracking capability to Windows11+ (Spec) (#2544)

* Updating spec

* Adressing comments

* More changes

Co-authored-by: Darren Hoehna <[email protected]>

* Create a pipeline to automate FIs from main to develop (#2610)

* v1.1 SDK throws an access violation from MddBootstrapInitialize's logging code if no matching packages are installed #2592 (#2608)

* v1.1 SDK throws an access violation from MddBootstrapInitialize's logging code if no matching packages are installed #2592

* Telemetry char/string. AppData DataStore-1.0.

* Retrieve the *Main* package's family name for AppData

* Add/Remove the test Main package (DataStore) just like we do the test Framework

* Detoured GetCurrentPackageInfo3() should route to the OS any PackageInfoType value it doesn't handle (#2623)

* Create tsaoptions.json

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Delete WindowsAppSDK-SourceAnalysis-job.yml

* Delete WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update ProjectReunion-CI.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update build-mrt.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Do a compiler options pass on all binaries contributing to WinAppSDK (#2629)

Tweak various compiler options for optimization (e.g. /GR-) and correctness/productivity (e.g. /W4).

Project-wide standardization via new \WindowsAppSDK.Build.Cpp.props. See for more details.

Corrected several inconsistencies across projects e.g. given Debug|Release + x86+x64+arm64 = 6 permutations, but some projects had an option set for only 5, or only 1. Most projects were mostly already setting most of these options so their changes were mostly removing the now-redundant project-specific setting and let the top-level project-wide standards handle it.

This now standardizes all C++ projects to...
* Compile (all): `/W4 /sdl /permissive- /std:c++17 /GR-` (except 2 projects that explicitly set `/std:c++20`)
* Compile (debug): `/Od`
* Compile (release): `/GS /GF /GL /Gy /Gw /Ob2 /Oi /Os /Oy`
* Link (debug) `/DEBUG:FULL /INCREMENTAL`
* Link (release): `/INCREMENTAL:NO /LTCG /OPT:ICF /OPT:REF`

https://task.ms/39994837 Foundation

https://task.ms/39994852 MRTCore

* Add standardized (project-wide) C++ compile and link options

* Remove ARM support (not supported, but some ARM-conditional fragments weren't removed)

* Removed <WarningLevel> from all projects. Fixed up warnings masked by projects who'd set Level3

* Added SDLCheck for all builds. Added Disable-Optimization for Debug builds. Remove properties in *vcxproj redundnat with standardized options

* Removed redundant <Optimization> from *vcxproj

* Fixed warnings. Removed unnecessary delayload

* Fixed some inconsistencies in project settings

* Fixed AccessControlTests weren't copying the Bootstrap dll to the test's OutDir and thus the test dll wouldn't load

* Fix some warnings in MRT. Had to disable read-only string pooling and strictstrings as workaround for some funky issues in MrtBaseUnitTests for now; filed bug for follow up to fix the errors

* Corrected some comments. Added the missing LTCG option

* Changed LTCG from fast to normal

* Updated FavorSizeOrSpeed to Size instead of Speed

* Move LinkIncremental=false for Release builds to the top-level project-wide standard

* Host LinkIncremental=true if Configuration=Debug to be project wide setting (projects were routinely doing this locally, but inconsistently)

* Fixed a comment

* Added a cautionary note about why Detours.vcxproj has seemingly redundant or contradictory options and to be wary of making any changes

* Removed options redundant with WindowsAppSDK.Build.Cpp.props

* Elevate GenerateDebugInformation=Full to project-wide and remove redundancies. Move dev\WindowsAppSDK.Build.Cpp.props content to project wide (not just \dev) and delete the now obsolete dev\WindowsAppSDK.Build.Cpp.props (really only amounted to /ZH:SHA_256).

* Incorporated feedback

* Overhaul NuGet versions to include "main" or "develop" (#2636)

* Some old MSTest.pfx references were lingering (and now breaking things) (#2638)

* Installation with System-Account doesn't work #2546 (#2565)

* Installation with System-Account doesn't work #2546 
Co-authored-by: Santosh Chintalapati <[email protected]>

* Fix the .NET SDK installer script used by MRT Core, and don't run the script anymore (#2640)

* Fix the .NET SDK install script.

* Remove .NET SDK version from global.json file.

* Don't run the DownloadDotNetCoreSdk.ps1 script in the pipeline.

* Update build-mrt.yml

* Update DownloadDotNetCoreSdk.ps1

* Update global.json

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update global.json

* Update global.json

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Add 1.1.1 & 1.0.4 to bug template and remove outdated versions (#2627)

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-CI.yml

Co-authored-by: James Parsons <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: reunion-maestro-bot <[email protected]>
Co-authored-by: Kyaw Thant <[email protected]>
Co-authored-by: Howard Kapustein <[email protected]>
Co-authored-by: alexlamtest <[email protected]>
Co-authored-by: Jeff Genovy <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>

* Update Newtonsoft.Json explicit reference in Dev16 projects to work around vulnerability in older versions (#2662)

* User/erlangl/fi develop into feature (#2660)

* Fix issue where WinUI C# and C++ item templates are not appearing in WinUI projects

* Making EM RS5+. Limiting the tracking capability to Windows11+ (Spec) (#2544)

* Updating spec

* Adressing comments

* More changes

Co-authored-by: Darren Hoehna <[email protected]>

* Create a pipeline to automate FIs from main to develop (#2610)

* v1.1 SDK throws an access violation from MddBootstrapInitialize's logging code if no matching packages are installed #2592 (#2608)

* v1.1 SDK throws an access violation from MddBootstrapInitialize's logging code if no matching packages are installed #2592

* Telemetry char/string. AppData DataStore-1.0.

* Retrieve the *Main* package's family name for AppData

* Add/Remove the test Main package (DataStore) just like we do the test Framework

* Detoured GetCurrentPackageInfo3() should route to the OS any PackageInfoType value it doesn't handle (#2623)

* Create tsaoptions.json

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Delete WindowsAppSDK-SourceAnalysis-job.yml

* Delete WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-BinaryAnalysis-steps.yml

* Create WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update ProjectReunion-CI.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update build-mrt.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Do a compiler options pass on all binaries contributing to WinAppSDK (#2629)

Tweak various compiler options for optimization (e.g. /GR-) and correctness/productivity (e.g. /W4).

Project-wide standardization via new \WindowsAppSDK.Build.Cpp.props. See for more details.

Corrected several inconsistencies across projects e.g. given Debug|Release + x86+x64+arm64 = 6 permutations, but some projects had an option set for only 5, or only 1. Most projects were mostly already setting most of these options so their changes were mostly removing the now-redundant project-specific setting and let the top-level project-wide standards handle it.

This now standardizes all C++ projects to...
* Compile (all): `/W4 /sdl /permissive- /std:c++17 /GR-` (except 2 projects that explicitly set `/std:c++20`)
* Compile (debug): `/Od`
* Compile (release): `/GS /GF /GL /Gy /Gw /Ob2 /Oi /Os /Oy`
* Link (debug) `/DEBUG:FULL /INCREMENTAL`
* Link (release): `/INCREMENTAL:NO /LTCG /OPT:ICF /OPT:REF`

https://task.ms/39994837 Foundation

https://task.ms/39994852 MRTCore

* Add standardized (project-wide) C++ compile and link options

* Remove ARM support (not supported, but some ARM-conditional fragments weren't removed)

* Removed <WarningLevel> from all projects. Fixed up warnings masked by projects who'd set Level3

* Added SDLCheck for all builds. Added Disable-Optimization for Debug builds. Remove properties in *vcxproj redundnat with standardized options

* Removed redundant <Optimization> from *vcxproj

* Fixed warnings. Removed unnecessary delayload

* Fixed some inconsistencies in project settings

* Fixed AccessControlTests weren't copying the Bootstrap dll to the test's OutDir and thus the test dll wouldn't load

* Fix some warnings in MRT. Had to disable read-only string pooling and strictstrings as workaround for some funky issues in MrtBaseUnitTests for now; filed bug for follow up to fix the errors

* Corrected some comments. Added the missing LTCG option

* Changed LTCG from fast to normal

* Updated FavorSizeOrSpeed to Size instead of Speed

* Move LinkIncremental=false for Release builds to the top-level project-wide standard

* Host LinkIncremental=true if Configuration=Debug to be project wide setting (projects were routinely doing this locally, but inconsistently)

* Fixed a comment

* Added a cautionary note about why Detours.vcxproj has seemingly redundant or contradictory options and to be wary of making any changes

* Removed options redundant with WindowsAppSDK.Build.Cpp.props

* Elevate GenerateDebugInformation=Full to project-wide and remove redundancies. Move dev\WindowsAppSDK.Build.Cpp.props content to project wide (not just \dev) and delete the now obsolete dev\WindowsAppSDK.Build.Cpp.props (really only amounted to /ZH:SHA_256).

* Incorporated feedback

* Overhaul NuGet versions to include "main" or "develop" (#2636)

* Some old MSTest.pfx references were lingering (and now breaking things) (#2638)

* Installation with System-Account doesn't work #2546 (#2565)

* Installation with System-Account doesn't work #2546 
Co-authored-by: Santosh Chintalapati <[email protected]>

* Fix the .NET SDK installer script used by MRT Core, and don't run the script anymore (#2640)

* Fix the .NET SDK install script.

* Remove .NET SDK version from global.json file.

* Don't run the DownloadDotNetCoreSdk.ps1 script in the pipeline.

* Update build-mrt.yml

* Update DownloadDotNetCoreSdk.ps1

* Update global.json

* Update WindowsAppSDK-BinaryAnalysis-steps.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update global.json

* Update global.json

* Update build-mrt.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-BuildDevProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildProject-Steps.yml

* Update WindowsAppSDK-BuildSolution-Steps.yml

* Add 1.1.1 & 1.0.4 to bug template and remove outdated versions (#2627)

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-BuildFoundation.yml

* Update ProjectReunion-CI.yml

* Update WindowsAppSDK-SourceAnalysis-job.yml

* Update ProjectReunion-CI.yml

* Update Newtonsoft.Json explicit reference in Dev16 projects to work around vulnerability in older versions (#2662)

Co-authored-by: James Parsons <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: reunion-maestro-bot <[email protected]>
Co-authored-by: Kyaw Thant <[email protected]>
Co-authored-by: Howard Kapustein <[email protected]>
Co-authored-by: alexlamtest <[email protected]>
Co-authored-by: Jeff Genovy <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Eric Langlois <[email protected]>
Co-authored-by: Ryan Shepherd <[email protected]>

* FI develop into Content Builder feature branch (#2717)

* update newtonsoft.json (#2688)

* Introduce Register Overload for assets (#2596)

* Introduce Register Overload for assets

* Address comments

* Add contractversion to register APi

* Address comments

* Add more examples of register API usage

* Process doc for develop branch (#2383)

* Add 1.1.2 tag to bug report

Co-authored-by: Hui Chen <[email protected]>
Co-authored-by: reunion-maestro-bot <[email protected]>
Co-authored-by: Sharath Manchala <[email protected]>
Co-authored-by: MikeHillberg <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Eric Langlois <[email protected]>

* FI develop into notification feature branch (#2733)

* update newtonsoft.json (#2688)

* Introduce Register Overload for assets (#2596)

* Introduce Register Overload for assets

* Address comments

* Add contractversion to register APi

* Address comments

* Add more examples of register API usage

* Process doc for develop branch (#2383)

* Add 1.1.2 tag to bug report

* Properly ignore cleanup event if it can't be opened. (#2658)

If we can't open the cleanup event, ignore it.

Fixes ADO#38606299

* WindowsAppRuntimeInstaller.exe fails if newer version present

Discussion #2708: [WindowsAppRuntime installation error: The package could not be installed because a higher version of this package is already installed](#2708)

>Microsoft.WindowsAppRuntime.1.1_1000.516.2156.0_x64__8wekyb3d8bbwe Package deployment result : 0x80073d06 The package could not be installed because a higher version of this package is already installed. One or more install operations failed. Result: 0x80073d06

That's a bug - it should be OK, not an error.

If v1.1.3 is installed and you run the installer for v1.1.2 we call packageManager.AddPackageAsync(...v1.1.2...) which returns 0x80073d06 == `ERROR_INSTALL_PACKAGE_DOWNGRADE` which is technically an error but functionally it's OK. If you build with 1.1.2 we don't require the runtime packages exactly match 1.1.2, but rather that there needs to be a package equal-or-higher than 1.1.2 (i.e. `>=1.1.2` not `==1.1.2`). If 1.1.3 is installed then all is well.

Problem is we should be trapping `ERROR_INSTALL_PACKAGE_DOWNGRADE` and treating it as success. That's a bug on our part. 

https://task.ms/40411617

FYI: servicing-consider-1.1 = https://task.ms/40411679

* XCOPY command should be <COPY> to ensure execution (#2734)

* XCOPY command should be XCOPY.EXE to ensure execution

* Changed xcopy.exe to <Copy>

* Fix typo

* Put AccessControl files into transport package (#2751)

* Add projection DLL

* Put files into nuget package

* Remove noexcept from Bootstrapper API so it can be used from C (#2750)

* Remove noexcept from Bootstrapper API so it can be used from C

* Switch noexcept to macro-style optional support per feedback

* Update bug version to 1.1.3 (#2757)

* <Copy> vs XCOPY.EXE -- Unbreak WindowsAppSDK-Nuget-Native.C.props

Not-Build break 'build\native\WindowsAppSDK-Nuget-Native.C.props(32,13): error MSB4066: The attribute 'SourceFiles' in element is unrecognized.' -- Foundation builds but the aggregator doesn't. I suspect it's because of the command can't go in a , maybe something more complicated with the PostBuildEvent DependsOn a to do the copy...but I can't find any clear docs or net links clearly spelling it out so rather than fiddling while Rome burns I'm switching back to the original xcopy.exe solution to un-break the pipeline.

Will follow up with folks to understand why the PR's build didn't pick this up

* Updating reference to pick up license installation fix. (#2531) (#2764)

Co-authored-by: Ben Kuhn <[email protected]>

Co-authored-by: Hui Chen <[email protected]>
Co-authored-by: reunion-maestro-bot <[email protected]>
Co-authored-by: Sharath Manchala <[email protected]>
Co-authored-by: MikeHillberg <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Johan Laanstra <[email protected]>
Co-authored-by: Howard Kapustein <[email protected]>
Co-authored-by: Eric Langlois <[email protected]>
Co-authored-by: Ryan Shepherd <[email protected]>
Co-authored-by: sachintaMSFT <[email protected]>
Co-authored-by: Ben Kuhn <[email protected]>

* Missed a few patches during previous merge

Co-authored-by: Kyaw Thant <[email protected]>
Co-authored-by: Will Thant <[email protected]>
Co-authored-by: Joshua Larkin <[email protected]>
Co-authored-by: Rohan Palaniappan <[email protected]>
Co-authored-by: Scott Jones <[email protected]>
Co-authored-by: sachintaMSFT <[email protected]>
Co-authored-by: Santosh Chintalapati <[email protected]>
Co-authored-by: Howard Kapustein <[email protected]>
Co-authored-by: Eric Langlois <[email protected]>
Co-authored-by: alexlamtest <[email protected]>
Co-authored-by: Paul Purifoy <[email protected]>
Co-authored-by: Sharath Manchala <[email protected]>
Co-authored-by: reunion-maestro-bot <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: James Parsons <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: Darren Hoehna <[email protected]>
Co-authored-by: Jeff Genovy <[email protected]>
Co-authored-by: Ryan Shepherd <[email protected]>
Co-authored-by: Hui Chen <[email protected]>
Co-authored-by: MikeHillberg <[email protected]>
Co-authored-by: Gabby Bilka <[email protected]>
Co-authored-by: Johan Laanstra <[email protected]>
Co-authored-by: Ben Kuhn <[email protected]>
  • Loading branch information
25 people authored Jul 26, 2022
1 parent 019077a commit addf73d
Show file tree
Hide file tree
Showing 44 changed files with 728 additions and 180 deletions.
9 changes: 9 additions & 0 deletions .config/tsaoptions.json
Original file line number Diff line number Diff line change
@@ -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": [ "[email protected]" ],
"ignoreBranchName": true,
"codebaseName": "WinAppSDK"
}
14 changes: 3 additions & 11 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
17 changes: 17 additions & 0 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
parameters:
channel: 'experimental'
enableLicenseInstall: false
runSDLBinaryAnalysis: false
enablePREFast: true

steps:
- template: WindowsAppSDK-BuildProject-Steps.yml
Expand All @@ -11,3 +13,5 @@ steps:
publishDir: $(publishDir)
channel: ${{ parameters.channel }}
enableLicenseInstall: ${{ parameters.enableLicenseInstall }}
runSDLBinaryAnalysis: ${{ parameters.runSDLBinaryAnalysis }}
enablePREFast: ${{ parameters.enablePREFast }}
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
41 changes: 41 additions & 0 deletions build/AzurePipelinesTemplates/WindowsAppSDK-SourceAnalysis-job.yml
Original file line number Diff line number Diff line change
@@ -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

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
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
Loading

0 comments on commit addf73d

Please sign in to comment.