Skip to content

Commit 240b5cc

Browse files
author
Freddy Kristiansen
authored
Merge branch 'microsoft:master' into master
2 parents 795a996 + db35b49 commit 240b5cc

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

AppHandling/Compile-AppInNavContainer.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function Compile-AppInBcContainer {
108108
[string] $assemblyProbingPaths,
109109
[Parameter(Mandatory=$false)]
110110
[ValidateSet('ExcludeGeneratedTranslations','GenerateCaptions','GenerateLockedTranslations','NoImplicitWith','TranslationFile','LcgTranslationFile')]
111-
[string[]] $features,
111+
[string[]] $features = @(),
112112
[Hashtable] $bcAuthContext,
113113
[string] $environment,
114114
[string[]] $treatWarningsAsErrors = $bcContainerHelperConfig.TreatWarningsAsErrors,

AppHandling/Run-AlPipeline.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@
160160
Only relevant for AppSource Apps when AppSourceCop is enabled. This needs to be an array (or a string with a comma seperated list) of supported countries for this app.
161161
.Parameter obsoleteTagMinAllowedMajorMinor
162162
Only relevant for AppSource Apps. Objects that are pending obsoletion with an obsolete tag version lower than the minimum set in the AppSourceCop.json file are not allowed. (AS0105)
163+
.Parameter features
164+
Features to set when compiling the app.
163165
.Parameter DockerPull
164166
Override function parameter for docker pull
165167
.Parameter NewBcContainer
@@ -284,6 +286,7 @@ Param(
284286
$AppSourceCopMandatoryAffixes = @(),
285287
$AppSourceCopSupportedCountries = @(),
286288
[string] $obsoleteTagMinAllowedMajorMinor = "",
289+
[string[]] $features = @(),
287290
[scriptblock] $DockerPull,
288291
[scriptblock] $NewBcContainer,
289292
[scriptblock] $SetBcContainerKeyVaultAadAppAndCertificate,
@@ -1496,6 +1499,7 @@ Write-Host -ForegroundColor Yellow @'
14961499
"preProcessorSymbols" = $preProcessorSymbols
14971500
"generatecrossreferences" = $generatecrossreferences
14981501
"updateDependencies" = $UpdateDependencies
1502+
"features" = $features
14991503
}
15001504

15011505
if ($buildOutputFile) {

ReleaseNotes.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
4.0.8
2+
Add parameter 'features' to Run-AlPipeline which allows for setting the compiler features
3+
14
4.0.7
25
Issue #2765 Unused param in Publish-BuildOutputToAzureFeed.ps1
36
Fix multiple layout files with same file name in BC21

Version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.7-dev
1+
4.0.8-dev

0 commit comments

Comments
 (0)