From a309c2b5455bbbefee0508f36a77bfb834b5f045 Mon Sep 17 00:00:00 2001 From: "reunion-maestro[bot]" <81196566+reunion-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Mar 2022 14:17:32 -0800 Subject: [PATCH] Update dependencies from https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal build Maestro-UpdateEngCommon_2203.04001 (#2209) --- eng/Version.Details.xml | 4 ++-- .../AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml | 5 ++++- .../WindowsAppSDK-BuildAndIntegrationTest-Steps.yml | 4 ++++ global.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cb1cbff8..f603a4d3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ https://github.com/microsoft/CsWinRT 394ce3a7fb435b99010ee4ed8690789944e08870 - + https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - 0ca9d38f85c5acfac8772ba3d354e7cb86c64df0 + 5bdfbc9d59aab610bf1dba20acc13e059f9ec0b4 diff --git a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml index 623966b19..a9c75b657 100644 --- a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml +++ b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml @@ -23,6 +23,9 @@ parameters: - name: TransportPackageArtifactName type: string default: '' + - name: WindowsAppSDKPackageVersion + type: string + default: '' - name: BuildType displayName: "Build Type" type: string @@ -61,7 +64,7 @@ steps: inputs: filePath: 'BuildAll.ps1' arguments: > - -WindowsAppSDKPackageVersion "" + -WindowsAppSDKPackageVersion ${{ parameters.WindowsAppSDKPackageVersion }} -Channel ${{ parameters.BuildType }} -Checkpoint "none" -Platform "x86,x64,arm64" diff --git a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildAndIntegrationTest-Steps.yml b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildAndIntegrationTest-Steps.yml index 6a70f8746..948ef0423 100644 --- a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildAndIntegrationTest-Steps.yml +++ b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildAndIntegrationTest-Steps.yml @@ -4,6 +4,9 @@ parameters: - name: TransportPackageArtifactName type: string default: '' + - name: WindowsAppSDKPackageVersion + type: string + default: '' - name: AzureSubscriptionServiceConnection type: string default: 'ProjectReunion Resource Manager' @@ -37,6 +40,7 @@ steps: - template: WindowsAppSDK-Build-Steps.yml parameters: TransportPackageArtifactName: ${{ parameters.TransportPackageArtifactName }} + WindowsAppSDKPackageVersion: ${{ parameters.WindowsAppSDKPackageVersion }} BuildType: ${{ parameters.BuildType }} TransportPackages: ${{ parameters.TransportPackages }} diff --git a/global.json b/global.json index 534811d22..2e77a17d6 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "6.0.101" }, "msbuild-sdks": { - "Microsoft.WinAppSDK.EngCommon": "1.1.0-20220225.0-CI" + "Microsoft.WinAppSDK.EngCommon": "1.1.0-20220304.0-CI" } }