Skip to content

Commit 1aae101

Browse files
lauren-cihalauren-ciha
committed
Merge branch 'main' into user/laurenciha/pushreceivederrorcode
2 parents b75da94 + 7990252 commit 1aae101

7 files changed

+71
-44
lines changed

‎build/AzurePipelinesTemplates/WindowsAppSDK-Build-Per-Platform-Stage.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -193,25 +193,27 @@ stages:
193193
runPREfast : ${{ parameters.runPREfast }}
194194
runApiScan : ${{ parameters.runApiScan }}
195195

196-
- job: ExtractMatrix
197-
pool:
198-
type: windows
199-
isCustom: true
200-
name: 'ProjectReunionESPool-2022'
201-
steps:
202-
- powershell: |
203-
$testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json
204-
$targetPlatform = "${{ parameters.buildPlatform }}"
205-
$filteredMatrix = @{}
206-
foreach ($entry in $testMatrix.PSObject.Properties) {
207-
if ($entry.Value.buildPlatform -eq $targetPlatform) {
208-
$filteredMatrix[$entry.Name] = $entry.Value
196+
# Only run the test matrix extraction job in Build_{buildPlatform} job. The PREfast_{buildPlatform} job don't have the following test stages, don't need this job.
197+
- ${{ if not(parameters.runPREfast) }}:
198+
- job: ExtractMatrix
199+
pool:
200+
type: windows
201+
isCustom: true
202+
name: 'ProjectReunionESPool-2022'
203+
steps:
204+
- powershell: |
205+
$testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json
206+
$targetPlatform = "${{ parameters.buildPlatform }}"
207+
$filteredMatrix = @{}
208+
foreach ($entry in $testMatrix.PSObject.Properties) {
209+
if ($entry.Value.buildPlatform -eq $targetPlatform) {
210+
$filteredMatrix[$entry.Name] = $entry.Value
211+
}
209212
}
210-
}
211-
$matrixJson = $filteredMatrix | ConvertTo-Json -Compress
212-
Write-Host "##vso[task.setvariable variable=filteredTestMatrix;isOutput=true]$matrixJson"
213-
name: filterByPlatformStep
214-
displayName: "Extract matrix as json value filtering by build platform"
215-
- script: echo $(filterByPlatformStep.filteredTestMatrix)
216-
name: echoMatrix
217-
displayName: "Echo filtered matrix"
213+
$matrixJson = $filteredMatrix | ConvertTo-Json -Compress
214+
Write-Host "##vso[task.setvariable variable=filteredTestMatrix;isOutput=true]$matrixJson"
215+
name: filterByPlatformStep
216+
displayName: "Extract matrix as json value filtering by build platform"
217+
- script: echo $(filterByPlatformStep.filteredTestMatrix)
218+
name: echoMatrix
219+
displayName: "Echo filtered matrix"

‎build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ jobs:
3434
artifactAttempt: ''
3535
ob_artifactSuffix: '_$(buildConfiguration)$(buildPlatform)_$(Agent.JobStatus)$(artifactAttempt)'
3636
ob_artifactBaseName: '$(System.StageName)_$(imageName)'
37+
# As the name of this job suggests, we currently don't build any code here, but only run tests; therefore, not bothering to enable BinSkim scans
38+
# here. OTOH, if we leave BinSkim enabled, then the "Guardian: BinSkim" task in the Post* jobs injected into our pipeline by OneBranch
39+
# for this job would hit the following non-fatal, but noisy AnalyzeArgumentNoValuesException error:
40+
#
41+
# ##[error]Error running binskim job: 1 of 1
42+
# ##[error]AnalyzeArgumentNoValuesException: Argument Target has no values. Check your configuration. -- Additional arguments:Microsoft.Guardian.InvalidResponseFileContentsException: InvalidResponseFileContentsException: Cannot create a response file with zero arguments. Ensure that your arguments are correctly set up.
43+
# at Microsoft.Guardian.ResponseFileFormatterPlaintext.Format(IList`1 arguments, ResponseFileOptions Options)
44+
# at Microsoft.Guardian.ResponseFileManager.CreateResponseFile(IList`1 arguments, String formatterName, ResponseFileOptions options, String outputPathOverride)
45+
# at Microsoft.Guardian.CliAnalyzerResponseFileManager.SetupResponseFile(CliAnalyzerConfig analyzeConfig, ToolConfig toolConfig)
46+
ob_sdl_binskim_enabled: false
3747
steps:
3848
- template: WindowsAppSDK-RunTests-Steps.yml
3949
parameters:

‎build/NuSpecs/WindowsAppSDK-Nuget-Native.AutoInitializer.targets

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
33
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
5+
<Target Name="SetAutoInitializerPreprocessorDefinitions" BeforeTargets="BeforeClCompile" >
6+
<!-- Build the AutoInitializer preprocessor definitions based on conditions -->
7+
<PropertyGroup>
8+
<AutoInitializerPreprocessorDefinitions></AutoInitializerPreprocessorDefinitions>
9+
<AutoInitializerPreprocessorDefinitions Condition="'$(WindowsAppSdkBootstrapInitialize)'=='true'">$(AutoInitializerPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_BOOTSTRAP</AutoInitializerPreprocessorDefinitions>
10+
<AutoInitializerPreprocessorDefinitions Condition="'$(WindowsAppSdkDeploymentManagerInitialize)'=='true'">$(AutoInitializerPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_DEPLOYMENTMANAGER</AutoInitializerPreprocessorDefinitions>
11+
<AutoInitializerPreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)'=='true'">$(AutoInitializerPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_UNDOCKEDREGFREEWINRT</AutoInitializerPreprocessorDefinitions>
12+
<AutoInitializerPreprocessorDefinitions Condition="'$(WindowsAppSdkCompatibilityInitialize)'=='true'">$(AutoInitializerPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_COMPATIBILITY</AutoInitializerPreprocessorDefinitions>
13+
<!-- Inherit the previous definitions based on condition -->
14+
<AutoInitializerPreprocessorDefinitions>$(AutoInitializerPreprocessorDefinitions);%(ClCompile.PreprocessorDefinitions)</AutoInitializerPreprocessorDefinitions>
15+
</PropertyGroup>
16+
</Target>
417

518
<Target Name="WindowsAppRuntimeAutoInitializer">
619
<ItemGroup>
720
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\include\WindowsAppRuntimeAutoInitializer.cpp">
821
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9-
<PreprocessorDefinitions Condition="'$(WindowsAppSdkBootstrapInitialize)'=='true'">MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_BOOTSTRAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10-
<PreprocessorDefinitions Condition="'$(WindowsAppSdkDeploymentManagerInitialize)'=='true'">MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_DEPLOYMENTMANAGER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
11-
<PreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)'=='true'">MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_UNDOCKEDREGFREEWINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
12-
<PreprocessorDefinitions Condition="'$(WindowsAppSdkCompatibilityInitialize)'=='true'">MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_COMPATIBILITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
22+
<PreprocessorDefinitions>$(AutoInitializerPreprocessorDefinitions)</PreprocessorDefinitions>
1323
</ClCompile>
1424
</ItemGroup>
1525
</Target>

‎build/NuSpecs/WindowsAppSDK-Nuget-Native.Bootstrap.targets

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3+
<Target Name="SetBootstrapPreprocessorDefinitions" BeforeTargets="BeforeClCompile" >
4+
<PropertyGroup>
5+
<!-- Build the Bootstrap preprocessor definitions based on conditions -->
6+
<BootstrapPreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE=1</BootstrapPreprocessorDefinitions>
7+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_Default)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_DEFAULT</BootstrapPreprocessorDefinitions>
8+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_None)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_NONE</BootstrapPreprocessorDefinitions>
9+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_DebugBreak)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK</BootstrapPreprocessorDefinitions>
10+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_DebugBreak_IfDebuggerAttached)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED</BootstrapPreprocessorDefinitions>
11+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_FailFast)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST</BootstrapPreprocessorDefinitions>
12+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnNoMatch_ShowUI)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONNOMATCH_SHOWUI</BootstrapPreprocessorDefinitions>
13+
<BootstrapPreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp)'=='true'">$(BootstrapPreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONPACKAGEIDENTITY_NOOP</BootstrapPreprocessorDefinitions>
14+
<!-- Inherit the previous definitions based on condition -->
15+
<BootstrapPreprocessorDefinitions>$(BootstrapPreprocessorDefinitions);%(ClCompile.PreprocessorDefinitions)</BootstrapPreprocessorDefinitions>
16+
</PropertyGroup>
17+
</Target>
18+
319
<Target Name="GenerateBootstrapCpp">
420
<ItemGroup>
521
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\include\MddBootstrapAutoInitializer.cpp">
622
<PrecompiledHeader>NotUsing</PrecompiledHeader>
7-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_Default)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_DEFAULT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_None)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_NONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_DebugBreak)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_DebugBreak_IfDebuggerAttached)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
11-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_FailFast)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
12-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnNoMatch_ShowUI)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONNOMATCH_SHOWUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
13-
<PreprocessorDefinitions Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp)'=='true'">MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONPACKAGEIDENTITY_NOOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
14-
<PreprocessorDefinitions>%(PreprocessorDefinitions);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE=1</PreprocessorDefinitions>
23+
<PreprocessorDefinitions>$(BootstrapPreprocessorDefinitions)</PreprocessorDefinitions>
1524
</ClCompile>
1625
</ItemGroup>
1726
</Target>
@@ -21,5 +30,4 @@
2130
$(BeforeClCompileTargets); GenerateBootstrapCpp;
2231
</BeforeClCompileTargets>
2332
</PropertyGroup>
24-
25-
</Project>
33+
</Project>

‎build/WindowsAppSDK-Foundation-Nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,15 @@ extends:
118118
SignOutput: ${{ parameters.SignOutput }}
119119
runApiScan: ${{ parameters.runStaticAnalysis }}
120120
runPREFast: false
121+
testMatrix: ${{ variables.PipelineTests }}
121122

122123
- ${{ if eq(parameters.runStaticAnalysis, 'true') }}:
123124
- template: AzurePipelinesTemplates\WindowsAppSDK-Build-Stage.yml@self
124125
parameters:
125126
SignOutput: ${{ parameters.SignOutput }}
126127
runApiScan: false
127128
runPREFast: true
129+
testMatrix: ${{ variables.PipelineTests }}
128130

129131
- template: AzurePipelinesTemplates\WindowsAppSDK-PackTransportPackage-Stage.yml@self
130132
parameters:
@@ -136,8 +138,6 @@ extends:
136138
SignOutput: ${{ parameters.SignOutput }}
137139

138140
- template: AzurePipelinesTemplates\WindowsAppSDK-Test-Stage.yml@self
139-
parameters:
140-
testMatrix: ${{ variables.PipelineTests }}
141141

142142
- template: AzurePipelinesTemplates\WindowsAppSDK-Publish-Stage.yml@self
143143
parameters:

‎build/WindowsAppSDK-Foundation-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ extends:
103103
SignOutput: ${{ parameters.SignOutput }}
104104
runApiScan: ${{ parameters.runStaticAnalysis }}
105105
runPREFast: false
106+
testMatrix: ${{ variables.PipelineTests }}
106107

107108
- ${{ if eq(parameters.runStaticAnalysis, 'true') }}:
108109
- template: AzurePipelinesTemplates\WindowsAppSDK-Build-Stage.yml@self
109110
parameters:
110111
SignOutput: ${{ parameters.SignOutput }}
111112
runApiScan: false
112113
runPREFast: true
114+
testMatrix: ${{ variables.PipelineTests }}
113115

114116
- template: AzurePipelinesTemplates\WindowsAppSDK-PackTransportPackage-Stage.yml@self
115117
parameters:
@@ -122,8 +124,6 @@ extends:
122124
SignOutput: ${{ parameters.SignOutput }}
123125

124126
- template: AzurePipelinesTemplates\WindowsAppSDK-Test-Stage.yml@self
125-
parameters:
126-
testMatrix: ${{ variables.PipelineTests }}
127127

128128
- template: AzurePipelinesTemplates\WindowsAppSDK-Publish-Stage.yml@self
129129
parameters:

‎dev/Interop/StoragePickers/Strings/StoragePickers.resw

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,8 @@
120120
<data name="All Files" xml:space="preserve">
121121
<value>All Files</value>
122122
</data>
123-
<data name="IDS_APIERROR_INVALIDVIEWMODEVALUE" xml:space="preserve">
124-
<value>The specified 'ViewMode' is invalid.</value>
125-
</data>
126-
<data name="IDS_APIERROR_INVALIDSUGGESTEDSTARTLOCATIONVALUE" xml:space="preserve">
127-
<value>The specified 'SuggestedStartLocation' is invalid.</value>
123+
<data name="IDS_APIERROR_INVALIDENUMVALUE" xml:space="preserve">
124+
<value>This specified Enum value is invalid.</value>
128125
</data>
129126
<data name="IDS_APIERROR_IMPROPERFILEEXTENSION" xml:space="preserve">
130127
<value>File extensions must begin with '.' and contain no wildcards.</value>

0 commit comments

Comments
 (0)