Skip to content

Commit dd73c4c

Browse files
author
reunion-maestro-bot
committed
Merge branch 'main' of https://github.com/microsoft/WindowsAppSDK into develop
2 parents a2c174c + 034544d commit dd73c4c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

build/WindowsAppSDK-CommonVariables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variables:
1313

1414
Codeql.Enabled: true # CodeQL runs every 3 days on the default branch for all languages its applicable to in that pipeline.
1515

16-
channel: 'experimental'
16+
channel: 'preview'
1717
rerunPassesRequiredToAvoidFailure: 5
1818
versionDate: $[format('{0:yyyyMMdd}', pipeline.startTime)]
1919
versionCounter: $[counter(variables['versionDate'], 0)]

build/WindowsAppSDK-Foundation-Release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
isNativeCode: false #TODO turn back on when bug in CheckCFlags2.exe is fixed
5858
binskim:
5959
enabled: true
60-
break: true
60+
break: false
6161

6262
stages:
6363
- template: AzurePipelinesTemplates\WindowsAppSDK-BuildTransportPackage-Stage.yml@self

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
3232
<Sha>21e744a00a8be67e713d3ca24f1e91467b89cbe3</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.WindowsAppSDK.AppLicensingInternal.TransportPackage" Version="1.4.0-main.20230609.1">
34+
<Dependency Name="Microsoft.WindowsAppSDK.AppLicensingInternal.TransportPackage" Version="1.4.0-preview1.20230614.0">
3535
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
36-
<Sha>ed2fcbbccbea8080b3e5d943299547ddeeee0bf7</Sha>
36+
<Sha>f8e1e474101834180971e60e68999becb053f367</Sha>
3737
</Dependency>
3838
</ProductDependencies>
3939
<ToolsetDependencies>

eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildSetup-Steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
default: 'ProjectReunionInternal'
2323

2424
steps:
25-
- checkout: git://ProjectReunion/WindowsAppSDKAggregator
25+
- checkout: git://ProjectReunion/WindowsAppSDKAggregator@release/1.4-stable
2626

2727
- task: AzureKeyVault@1
2828
inputs:

test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/WindowsAppSDK-VersionInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Release information
1010
#define WINDOWSAPPSDK_RELEASE_MAJOR 1
11-
#define WINDOWSAPPSDK_RELEASE_MINOR 1
11+
#define WINDOWSAPPSDK_RELEASE_MINOR 4
1212
#define WINDOWSAPPSDK_RELEASE_PATCH 0
1313
#define WINDOWSAPPSDK_RELEASE_MAJORMINOR 0x00010001
1414

0 commit comments

Comments
 (0)