From 6f1a2f2537f3d3d56652dd9b1b39dc20919339bf Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 13:28:34 -0700 Subject: [PATCH 1/7] test vpack token --- .../MUX-PushCBSVpack-Job.yml | 27 ++- build/MUX-Release.yml | 226 +++++++++--------- 2 files changed, 132 insertions(+), 121 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index 6bceab201b..48d412aad2 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -3,8 +3,8 @@ parameters: jobs: - job: CreateVPack - dependsOn: - - ${{ parameters.dependsOn }} + # dependsOn: + # - ${{ parameters.dependsOn }} pool: name: WinDevPool-S variables: @@ -16,6 +16,11 @@ jobs: inputs: artifactName: drop downloadPath: $(System.ArtifactsDirectory) + buildType: specific + buildVersionToDownload: specific + project: $(System.TeamProjectId) + pipeline: 35915 + buildId: 46434715 # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 @@ -58,46 +63,52 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' + vpackToken: $(GitHub-Token) description: Microsoft.UI.Xaml - pushPkgName: Microsoft.UI.Xaml + pushPkgName: Microsoft.UI.Xaml-test version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_x64' condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' + vpackToken: $(GitHub-Token) description: 'MicrosoftUIXamlInbox_x64' - pushPkgName: 'MicrosoftUIXamlInbox_x64' + pushPkgName: 'MicrosoftUIXamlInbox_x64-test' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_x86' condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' + vpackToken: $(GitHub-Token) description: 'MicrosoftUIXamlInbox_x86' - pushPkgName: 'MicrosoftUIXamlInbox_x86' + pushPkgName: 'MicrosoftUIXamlInbox_x86-test' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_arm' condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' + vpackToken: $(GitHub-Token) description: 'MicrosoftUIXamlInbox_arm' - pushPkgName: 'MicrosoftUIXamlInbox_arm' + pushPkgName: 'MicrosoftUIXamlInbox_arm-test' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' + vpackToken: $(GitHub-Token) description: 'MicrosoftUIXamlInbox_arm64' - pushPkgName: 'MicrosoftUIXamlInbox_arm64' + pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' + vpackToken: $(GitHub-Token) description: 'MicrosoftUIXamlInboxWinmd' - pushPkgName: 'MicrosoftUIXamlInboxWinmd' + pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' version: $(vpackversion) \ No newline at end of file diff --git a/build/MUX-Release.yml b/build/MUX-Release.yml index a1d4ec30a8..8bf569cc2c 100644 --- a/build/MUX-Release.yml +++ b/build/MUX-Release.yml @@ -3,133 +3,133 @@ variables: minimumExpectedTestsExecutedCount: 35 # Sanity check for minimum expected tests to be reported Packaging.EnableSBOMSigning: true jobs: -- job: Build - # Skip the build job if we are reusing the output of a previous build. - # useBuildOutputFromBuildId variable is set on the Pipeline at Queue time. - condition: - eq(variables['useBuildOutputFromBuildId'],'') - pool: - ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: - name: WinDevPoolOSS-L - ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: - name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-9 - timeoutInMinutes: 120 - strategy: - maxParallel: 10 - matrix: - Debug_x86: - buildPlatform: 'x86' - buildConfiguration: 'Debug' - Release_x86: - buildPlatform: 'x86' - buildConfiguration: 'Release' - PGOBuildMode: 'Optimize' - Release_x64: - buildPlatform: 'x64' - buildConfiguration: 'Release' - PGOBuildMode: 'Optimize' - Release_Arm: - buildPlatform: 'arm' - buildConfiguration: 'Release' - Release_Arm64: - buildPlatform: 'arm64' - buildConfiguration: 'Release' +# - job: Build +# # Skip the build job if we are reusing the output of a previous build. +# # useBuildOutputFromBuildId variable is set on the Pipeline at Queue time. +# condition: +# eq(variables['useBuildOutputFromBuildId'],'') +# pool: +# ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: +# name: WinDevPoolOSS-L +# ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: +# name: WinDevPool-L +# demands: ImageOverride -equals WinDevVS16-9 +# timeoutInMinutes: 120 +# strategy: +# maxParallel: 10 +# matrix: +# Debug_x86: +# buildPlatform: 'x86' +# buildConfiguration: 'Debug' +# Release_x86: +# buildPlatform: 'x86' +# buildConfiguration: 'Release' +# PGOBuildMode: 'Optimize' +# Release_x64: +# buildPlatform: 'x64' +# buildConfiguration: 'Release' +# PGOBuildMode: 'Optimize' +# Release_Arm: +# buildPlatform: 'arm' +# buildConfiguration: 'Release' +# Release_Arm64: +# buildPlatform: 'arm64' +# buildConfiguration: 'Release' - variables: - appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages - buildOutputDir : $(Build.SourcesDirectory)\BuildOutput - publishDir : $(Build.ArtifactStagingDirectory) - artifactsDir: $(Build.SourcesDirectory)\Artifacts - sbomdir: $(Build.ArtifactStagingDirectory)\sbom\$(buildConfiguration)\$(buildPlatform) - steps: +# variables: +# appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages +# buildOutputDir : $(Build.SourcesDirectory)\BuildOutput +# publishDir : $(Build.ArtifactStagingDirectory) +# artifactsDir: $(Build.SourcesDirectory)\Artifacts +# sbomdir: $(Build.ArtifactStagingDirectory)\sbom\$(buildConfiguration)\$(buildPlatform) +# steps: - # Download and extract nuget package with non-stubbed MicrosoftTelemetry.h header - - task: DownloadPackage@1 - displayName: 'Download Microsoft.Telemetry.Inbox.Native' - inputs: - feed: '/3415933f-ac0d-4766-8c0a-3f4c247c25f5' # 0 - view: 'ef61a1c1-003b-4a27-bde5-beec8301021b' # Release - definition: '2fe60c09-c66f-4275-ae2d-f015c7170c72' # Microsoft.Telemetry.Inbox.Native - version: '10.0.18362.1-190318-1202.19h1-release.amd64fre' # latest version - downloadPath: '$(System.DefaultWorkingDirectory)' # download and extract to repo root +# # Download and extract nuget package with non-stubbed MicrosoftTelemetry.h header +# - task: DownloadPackage@1 +# displayName: 'Download Microsoft.Telemetry.Inbox.Native' +# inputs: +# feed: '/3415933f-ac0d-4766-8c0a-3f4c247c25f5' # 0 +# view: 'ef61a1c1-003b-4a27-bde5-beec8301021b' # Release +# definition: '2fe60c09-c66f-4275-ae2d-f015c7170c72' # Microsoft.Telemetry.Inbox.Native +# version: '10.0.18362.1-190318-1202.19h1-release.amd64fre' # latest version +# downloadPath: '$(System.DefaultWorkingDirectory)' # download and extract to repo root - # Replace the stubbed MicrosoftTelemetry.h with the real one - # Delete the existing stubbed MicrosoftTelemetry.h first, to ensure that if it is no longer at the expected path that the task, and build, fails - - script: | - del $(System.DefaultWorkingDirectory)\dev\telemetry\MicrosoftTelemetry.h - move /Y $(System.DefaultWorkingDirectory)\build\native\inc\MicrosoftTelemetry.h $(System.DefaultWorkingDirectory)\dev\telemetry\ - failOnStderr: true - displayName: 'Replace existing stubbed MicrosoftTelemetry.h header with the real version from the nuget package' +# # Replace the stubbed MicrosoftTelemetry.h with the real one +# # Delete the existing stubbed MicrosoftTelemetry.h first, to ensure that if it is no longer at the expected path that the task, and build, fails +# - script: | +# del $(System.DefaultWorkingDirectory)\dev\telemetry\MicrosoftTelemetry.h +# move /Y $(System.DefaultWorkingDirectory)\build\native\inc\MicrosoftTelemetry.h $(System.DefaultWorkingDirectory)\dev\telemetry\ +# failOnStderr: true +# displayName: 'Replace existing stubbed MicrosoftTelemetry.h header with the real version from the nuget package' - - template: AzurePipelinesTemplates\MUX-BuildDevProject-Steps.yml - parameters: - signOutput: true +# - template: AzurePipelinesTemplates\MUX-BuildDevProject-Steps.yml +# parameters: +# signOutput: true - - script: | - mkdir $(sbomdir) - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - inputs: - BuildDropPath: $(sbomdir) +# - script: | +# mkdir $(sbomdir) +# - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 +# displayName: 'Generate SBOM manifest' +# inputs: +# BuildDropPath: $(sbomdir) - - template: AzurePipelinesTemplates\MUX-PublishProjectOutput-Steps.yml +# - template: AzurePipelinesTemplates\MUX-PublishProjectOutput-Steps.yml -# Create Nuget Package -- template: AzurePipelinesTemplates\MUX-CreateNugetPackage-Job.yml - parameters: - jobName: CreateNugetPackage - dependsOn: Build - signOutput: true - useReleaseTag: '$(MUXFinalRelease)' - prereleaseVersionTag: prerelease +# # Create Nuget Package +# - template: AzurePipelinesTemplates\MUX-CreateNugetPackage-Job.yml +# parameters: +# jobName: CreateNugetPackage +# dependsOn: Build +# signOutput: true +# useReleaseTag: '$(MUXFinalRelease)' +# prereleaseVersionTag: prerelease - template: AzurePipelinesTemplates\MUX-PushCBSVpack-Job.yml parameters: dependsOn: Build -- template: AzurePipelinesTemplates\MUX-ComplianceChecks-Job.yml - parameters: - dependsOn: CreateVPack +# - template: AzurePipelinesTemplates\MUX-ComplianceChecks-Job.yml +# parameters: +# dependsOn: CreateVPack -# Build solution that depends on nuget package -- template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml - parameters: - buildJobName: 'BuildNugetPkgTests' - buildArtifactName: 'NugetPkgTestsDrop' - runTestJobName: 'RunNugetPkgTestsInHelix' - helixType: 'test/nuget' - dependsOn: CreateNugetPackage - useFrameworkPkg: false +# # Build solution that depends on nuget package +# - template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml +# parameters: +# buildJobName: 'BuildNugetPkgTests' +# buildArtifactName: 'NugetPkgTestsDrop' +# runTestJobName: 'RunNugetPkgTestsInHelix' +# helixType: 'test/nuget' +# dependsOn: CreateNugetPackage +# useFrameworkPkg: false -# Framework package tests -- template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml - parameters: - buildJobName: 'BuildFrameworkPkgTests' - buildArtifactName: 'FrameworkPkgTestsDrop' - runTestJobName: 'RunFrameworkPkgTestsInHelix' - helixType: 'test/frpkg' - dependsOn: CreateNugetPackage - useFrameworkPkg: true +# # Framework package tests +# - template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml +# parameters: +# buildJobName: 'BuildFrameworkPkgTests' +# buildArtifactName: 'FrameworkPkgTestsDrop' +# runTestJobName: 'RunFrameworkPkgTestsInHelix' +# helixType: 'test/frpkg' +# dependsOn: CreateNugetPackage +# useFrameworkPkg: true -- template: AzurePipelinesTemplates\MUX-ProcessTestResults-Job.yml - parameters: - dependsOn: - - RunNugetPkgTestsInHelix - - RunFrameworkPkgTestsInHelix - rerunPassesRequiredToAvoidFailure: 5 - minimumExpectedTestsExecutedCount: $(minimumExpectedTestsExecutedCount) +# - template: AzurePipelinesTemplates\MUX-ProcessTestResults-Job.yml +# parameters: +# dependsOn: +# - RunNugetPkgTestsInHelix +# - RunFrameworkPkgTestsInHelix +# rerunPassesRequiredToAvoidFailure: 5 +# minimumExpectedTestsExecutedCount: $(minimumExpectedTestsExecutedCount) -# NuGet package WACK tests -- template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml - parameters: - name: 'NugetPkgWACKTests' - dependsOn: BuildNugetPkgTests - artifactName: 'NugetPkgTestsDrop' +# # NuGet package WACK tests +# - template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml +# parameters: +# name: 'NugetPkgWACKTests' +# dependsOn: BuildNugetPkgTests +# artifactName: 'NugetPkgTestsDrop' -# Framework package WACK tests -- template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml - parameters: - name: 'FrameworkPkgWACKTests' - dependsOn: BuildFrameworkPkgTests - artifactName: 'FrameworkPkgTestsDrop' \ No newline at end of file +# # Framework package WACK tests +# - template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml +# parameters: +# name: 'FrameworkPkgWACKTests' +# dependsOn: BuildFrameworkPkgTests +# artifactName: 'FrameworkPkgTestsDrop' \ No newline at end of file From 3e1c62f28b69a2f904109bf0a8a71ec6c7eae056 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 14:03:45 -0700 Subject: [PATCH 2/7] var --- .../AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index 48d412aad2..bb37cfee29 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -63,7 +63,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: Microsoft.UI.Xaml pushPkgName: Microsoft.UI.Xaml-test version: $(vpackversion) @@ -72,7 +72,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: 'MicrosoftUIXamlInbox_x64' pushPkgName: 'MicrosoftUIXamlInbox_x64-test' version: $(vpackversion) @@ -81,7 +81,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: 'MicrosoftUIXamlInbox_x86' pushPkgName: 'MicrosoftUIXamlInbox_x86-test' version: $(vpackversion) @@ -90,7 +90,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: 'MicrosoftUIXamlInbox_arm' pushPkgName: 'MicrosoftUIXamlInbox_arm-test' version: $(vpackversion) @@ -99,7 +99,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: 'MicrosoftUIXamlInbox_arm64' pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' version: $(vpackversion) @@ -108,7 +108,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' - vpackToken: $(GitHub-Token) + vpackToken: $(GitHubToken) description: 'MicrosoftUIXamlInboxWinmd' pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' version: $(vpackversion) \ No newline at end of file From 6e3ed793b3239630ba6668f9af66ad2e96b3d345 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 14:18:17 -0700 Subject: [PATCH 3/7] new token --- .../AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index bb37cfee29..7f6e22a151 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -63,7 +63,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: Microsoft.UI.Xaml pushPkgName: Microsoft.UI.Xaml-test version: $(vpackversion) @@ -72,7 +72,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x64' pushPkgName: 'MicrosoftUIXamlInbox_x64-test' version: $(vpackversion) @@ -81,7 +81,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x86' pushPkgName: 'MicrosoftUIXamlInbox_x86-test' version: $(vpackversion) @@ -90,7 +90,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm' pushPkgName: 'MicrosoftUIXamlInbox_arm-test' version: $(vpackversion) @@ -99,7 +99,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm64' pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' version: $(vpackversion) @@ -108,7 +108,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' - vpackToken: $(GitHubToken) + vpackToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInboxWinmd' pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' version: $(vpackversion) \ No newline at end of file From f9b4dd78904524c3f830d5a04ea9f8d9b88cad2e Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 14:35:03 -0700 Subject: [PATCH 4/7] vpacktoken -> githubtoken --- .../AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index 7f6e22a151..dd41f5a3d0 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -63,7 +63,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: Microsoft.UI.Xaml pushPkgName: Microsoft.UI.Xaml-test version: $(vpackversion) @@ -72,7 +72,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x64' pushPkgName: 'MicrosoftUIXamlInbox_x64-test' version: $(vpackversion) @@ -81,7 +81,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x86' pushPkgName: 'MicrosoftUIXamlInbox_x86-test' version: $(vpackversion) @@ -90,7 +90,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm' pushPkgName: 'MicrosoftUIXamlInbox_arm-test' version: $(vpackversion) @@ -99,7 +99,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm64' pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' version: $(vpackversion) @@ -108,7 +108,7 @@ jobs: condition: eq(variables['PublishVpack'], 'true') inputs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' - vpackToken: $(WinUI2GitHubToken) + githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInboxWinmd' pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' version: $(vpackversion) \ No newline at end of file From 00c77f57f6c400a00495189cf5ed73f5e88ff3f0 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 14:56:47 -0700 Subject: [PATCH 5/7] foo --- .../MUX-PushCBSVpack-Job.yml | 200 ++++++++++-------- 1 file changed, 106 insertions(+), 94 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index dd41f5a3d0..8eb97801ee 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -12,103 +12,115 @@ jobs: internalSDKFeedUrl: https://pkgs.dev.azure.com/microsoft/WinUI/_packaging/WinUIInternalWindowsSDK/nuget/v3/index.json steps: - - task: DownloadBuildArtifacts@0 - inputs: - artifactName: drop - downloadPath: $(System.ArtifactsDirectory) - buildType: specific - buildVersionToDownload: specific - project: $(System.TeamProjectId) - pipeline: 35915 - buildId: 46434715 - # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. - - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'nuget install Microsoft.Internal.WinUI.WindowsPublicsWinmd' - inputs: - command: custom - arguments: 'install Microsoft.Internal.WinUI.WindowsPublicsWinmd -NonInteractive -Version $(windowsPublicsWinmdVersion) -Source $(internalSDKFeedUrl) -OutputDirectory packages' + - script: | + echo %SYSTEM_ACCESSTOKEN% + echo %WinUI2GitHubToken% + echo $(System.AccessToken) + echo $(WinUI2GitHubToken) + displayName: 'Foo' + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + WinUI2GitHubToken: $(WinUI2GitHubToken) - - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'NuGet restore dev\dll\packages.config' - inputs: - restoreSolution: dev\dll\packages.config - feedsToUse: config - nugetConfigPath: nuget.config - restoreDirectory: $(Build.SourcesDirectory)\packages - - script: | - $(Build.SourcesDirectory)\build\CreateCBSVPack.cmd -releaseFolder $(System.ArtifactsDirectory)\drop\Release -publicsRoot $(Build.SourcesDirectory)\packages\Microsoft.Internal.WinUI.WindowsPublicsWinmd.$(windowsPublicsWinmdVersion) - displayName: CreateCBSVPack.cmd - failOnStderr: true - # Note: This task sets the 'vpackversion' variable that is used below. + # - task: DownloadBuildArtifacts@0 + # inputs: + # artifactName: drop + # downloadPath: $(System.ArtifactsDirectory) + # buildType: specific + # buildVersionToDownload: specific + # project: $(System.TeamProjectId) + # pipeline: 35915 + # buildId: 46434715 - - task: PublishBuildArtifacts@1 - displayName: Publish WinUIVpack Artifact - inputs: - PathtoPublish: $(System.ArtifactsDirectory)\drop\release\WinUIVpack - artifactName: WinUIVpack - # This artifact is not consumed by anyone, but it is useful for debugging purposes. + # # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. + # - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + # displayName: 'nuget install Microsoft.Internal.WinUI.WindowsPublicsWinmd' + # inputs: + # command: custom + # arguments: 'install Microsoft.Internal.WinUI.WindowsPublicsWinmd -NonInteractive -Version $(windowsPublicsWinmdVersion) -Source $(internalSDKFeedUrl) -OutputDirectory packages' - - task: PublishBuildArtifacts@1 - displayName: Publish CBS Artifact - inputs: - PathtoPublish: $(System.ArtifactsDirectory)\drop\release\cbs - artifactName: cbs - # This artifact is not consumed by anyone, but it is useful for debugging purposes. + # - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + # displayName: 'NuGet restore dev\dll\packages.config' + # inputs: + # restoreSolution: dev\dll\packages.config + # feedsToUse: config + # nugetConfigPath: nuget.config + # restoreDirectory: $(Build.SourcesDirectory)\packages - # Push the VPacks: - - task: PkgESVPack@12 - displayName: 'Push VPack Microsoft.UI.Xaml' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' - githubToken: $(WinUI2GitHubToken) - description: Microsoft.UI.Xaml - pushPkgName: Microsoft.UI.Xaml-test - version: $(vpackversion) - - task: PkgESVPack@12 - displayName: 'Push VPack MicrosoftUIXamlInbox_x64' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' - githubToken: $(WinUI2GitHubToken) - description: 'MicrosoftUIXamlInbox_x64' - pushPkgName: 'MicrosoftUIXamlInbox_x64-test' - version: $(vpackversion) - - task: PkgESVPack@12 - displayName: 'Push VPack MicrosoftUIXamlInbox_x86' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' - githubToken: $(WinUI2GitHubToken) - description: 'MicrosoftUIXamlInbox_x86' - pushPkgName: 'MicrosoftUIXamlInbox_x86-test' - version: $(vpackversion) - - task: PkgESVPack@12 - displayName: 'Push VPack MicrosoftUIXamlInbox_arm' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' - githubToken: $(WinUI2GitHubToken) - description: 'MicrosoftUIXamlInbox_arm' - pushPkgName: 'MicrosoftUIXamlInbox_arm-test' - version: $(vpackversion) - - task: PkgESVPack@12 - displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' - githubToken: $(WinUI2GitHubToken) - description: 'MicrosoftUIXamlInbox_arm64' - pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' - version: $(vpackversion) - - task: PkgESVPack@12 - displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' - condition: eq(variables['PublishVpack'], 'true') - inputs: - sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' - githubToken: $(WinUI2GitHubToken) - description: 'MicrosoftUIXamlInboxWinmd' - pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' - version: $(vpackversion) \ No newline at end of file + # - script: | + # $(Build.SourcesDirectory)\build\CreateCBSVPack.cmd -releaseFolder $(System.ArtifactsDirectory)\drop\Release -publicsRoot $(Build.SourcesDirectory)\packages\Microsoft.Internal.WinUI.WindowsPublicsWinmd.$(windowsPublicsWinmdVersion) + # displayName: CreateCBSVPack.cmd + # failOnStderr: true + # # Note: This task sets the 'vpackversion' variable that is used below. + + # - task: PublishBuildArtifacts@1 + # displayName: Publish WinUIVpack Artifact + # inputs: + # PathtoPublish: $(System.ArtifactsDirectory)\drop\release\WinUIVpack + # artifactName: WinUIVpack + # # This artifact is not consumed by anyone, but it is useful for debugging purposes. + + # - task: PublishBuildArtifacts@1 + # displayName: Publish CBS Artifact + # inputs: + # PathtoPublish: $(System.ArtifactsDirectory)\drop\release\cbs + # artifactName: cbs + # # This artifact is not consumed by anyone, but it is useful for debugging purposes. + + # # Push the VPacks: + # - task: PkgESVPack@12 + # displayName: 'Push VPack Microsoft.UI.Xaml' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' + # githubToken: $(WinUI2GitHubToken) + # description: Microsoft.UI.Xaml + # pushPkgName: Microsoft.UI.Xaml-test + # version: $(vpackversion) + # - task: PkgESVPack@12 + # displayName: 'Push VPack MicrosoftUIXamlInbox_x64' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' + # githubToken: $(WinUI2GitHubToken) + # description: 'MicrosoftUIXamlInbox_x64' + # pushPkgName: 'MicrosoftUIXamlInbox_x64-test' + # version: $(vpackversion) + # - task: PkgESVPack@12 + # displayName: 'Push VPack MicrosoftUIXamlInbox_x86' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' + # githubToken: $(WinUI2GitHubToken) + # description: 'MicrosoftUIXamlInbox_x86' + # pushPkgName: 'MicrosoftUIXamlInbox_x86-test' + # version: $(vpackversion) + # - task: PkgESVPack@12 + # displayName: 'Push VPack MicrosoftUIXamlInbox_arm' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' + # githubToken: $(WinUI2GitHubToken) + # description: 'MicrosoftUIXamlInbox_arm' + # pushPkgName: 'MicrosoftUIXamlInbox_arm-test' + # version: $(vpackversion) + # - task: PkgESVPack@12 + # displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' + # githubToken: $(WinUI2GitHubToken) + # description: 'MicrosoftUIXamlInbox_arm64' + # pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' + # version: $(vpackversion) + # - task: PkgESVPack@12 + # displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' + # condition: eq(variables['PublishVpack'], 'true') + # inputs: + # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' + # githubToken: $(WinUI2GitHubToken) + # description: 'MicrosoftUIXamlInboxWinmd' + # pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' + # version: $(vpackversion) \ No newline at end of file From 837c053b322fe6e3e2a46d283c56c73a7189fee7 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 15 Mar 2022 15:07:30 -0700 Subject: [PATCH 6/7] Revert "foo" This reverts commit 00c77f57f6c400a00495189cf5ed73f5e88ff3f0. --- .../MUX-PushCBSVpack-Job.yml | 200 ++++++++---------- 1 file changed, 94 insertions(+), 106 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index 8eb97801ee..dd41f5a3d0 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -12,115 +12,103 @@ jobs: internalSDKFeedUrl: https://pkgs.dev.azure.com/microsoft/WinUI/_packaging/WinUIInternalWindowsSDK/nuget/v3/index.json steps: + - task: DownloadBuildArtifacts@0 + inputs: + artifactName: drop + downloadPath: $(System.ArtifactsDirectory) + buildType: specific + buildVersionToDownload: specific + project: $(System.TeamProjectId) + pipeline: 35915 + buildId: 46434715 - - script: | - echo %SYSTEM_ACCESSTOKEN% - echo %WinUI2GitHubToken% - echo $(System.AccessToken) - echo $(WinUI2GitHubToken) - displayName: 'Foo' - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - WinUI2GitHubToken: $(WinUI2GitHubToken) + # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: 'nuget install Microsoft.Internal.WinUI.WindowsPublicsWinmd' + inputs: + command: custom + arguments: 'install Microsoft.Internal.WinUI.WindowsPublicsWinmd -NonInteractive -Version $(windowsPublicsWinmdVersion) -Source $(internalSDKFeedUrl) -OutputDirectory packages' + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: 'NuGet restore dev\dll\packages.config' + inputs: + restoreSolution: dev\dll\packages.config + feedsToUse: config + nugetConfigPath: nuget.config + restoreDirectory: $(Build.SourcesDirectory)\packages - # - task: DownloadBuildArtifacts@0 - # inputs: - # artifactName: drop - # downloadPath: $(System.ArtifactsDirectory) - # buildType: specific - # buildVersionToDownload: specific - # project: $(System.TeamProjectId) - # pipeline: 35915 - # buildId: 46434715 + - script: | + $(Build.SourcesDirectory)\build\CreateCBSVPack.cmd -releaseFolder $(System.ArtifactsDirectory)\drop\Release -publicsRoot $(Build.SourcesDirectory)\packages\Microsoft.Internal.WinUI.WindowsPublicsWinmd.$(windowsPublicsWinmdVersion) + displayName: CreateCBSVPack.cmd + failOnStderr: true + # Note: This task sets the 'vpackversion' variable that is used below. - # # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. - # - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - # displayName: 'nuget install Microsoft.Internal.WinUI.WindowsPublicsWinmd' - # inputs: - # command: custom - # arguments: 'install Microsoft.Internal.WinUI.WindowsPublicsWinmd -NonInteractive -Version $(windowsPublicsWinmdVersion) -Source $(internalSDKFeedUrl) -OutputDirectory packages' + - task: PublishBuildArtifacts@1 + displayName: Publish WinUIVpack Artifact + inputs: + PathtoPublish: $(System.ArtifactsDirectory)\drop\release\WinUIVpack + artifactName: WinUIVpack + # This artifact is not consumed by anyone, but it is useful for debugging purposes. - # - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - # displayName: 'NuGet restore dev\dll\packages.config' - # inputs: - # restoreSolution: dev\dll\packages.config - # feedsToUse: config - # nugetConfigPath: nuget.config - # restoreDirectory: $(Build.SourcesDirectory)\packages + - task: PublishBuildArtifacts@1 + displayName: Publish CBS Artifact + inputs: + PathtoPublish: $(System.ArtifactsDirectory)\drop\release\cbs + artifactName: cbs + # This artifact is not consumed by anyone, but it is useful for debugging purposes. - # - script: | - # $(Build.SourcesDirectory)\build\CreateCBSVPack.cmd -releaseFolder $(System.ArtifactsDirectory)\drop\Release -publicsRoot $(Build.SourcesDirectory)\packages\Microsoft.Internal.WinUI.WindowsPublicsWinmd.$(windowsPublicsWinmdVersion) - # displayName: CreateCBSVPack.cmd - # failOnStderr: true - # # Note: This task sets the 'vpackversion' variable that is used below. - - # - task: PublishBuildArtifacts@1 - # displayName: Publish WinUIVpack Artifact - # inputs: - # PathtoPublish: $(System.ArtifactsDirectory)\drop\release\WinUIVpack - # artifactName: WinUIVpack - # # This artifact is not consumed by anyone, but it is useful for debugging purposes. - - # - task: PublishBuildArtifacts@1 - # displayName: Publish CBS Artifact - # inputs: - # PathtoPublish: $(System.ArtifactsDirectory)\drop\release\cbs - # artifactName: cbs - # # This artifact is not consumed by anyone, but it is useful for debugging purposes. - - # # Push the VPacks: - # - task: PkgESVPack@12 - # displayName: 'Push VPack Microsoft.UI.Xaml' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' - # githubToken: $(WinUI2GitHubToken) - # description: Microsoft.UI.Xaml - # pushPkgName: Microsoft.UI.Xaml-test - # version: $(vpackversion) - # - task: PkgESVPack@12 - # displayName: 'Push VPack MicrosoftUIXamlInbox_x64' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' - # githubToken: $(WinUI2GitHubToken) - # description: 'MicrosoftUIXamlInbox_x64' - # pushPkgName: 'MicrosoftUIXamlInbox_x64-test' - # version: $(vpackversion) - # - task: PkgESVPack@12 - # displayName: 'Push VPack MicrosoftUIXamlInbox_x86' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' - # githubToken: $(WinUI2GitHubToken) - # description: 'MicrosoftUIXamlInbox_x86' - # pushPkgName: 'MicrosoftUIXamlInbox_x86-test' - # version: $(vpackversion) - # - task: PkgESVPack@12 - # displayName: 'Push VPack MicrosoftUIXamlInbox_arm' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' - # githubToken: $(WinUI2GitHubToken) - # description: 'MicrosoftUIXamlInbox_arm' - # pushPkgName: 'MicrosoftUIXamlInbox_arm-test' - # version: $(vpackversion) - # - task: PkgESVPack@12 - # displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' - # githubToken: $(WinUI2GitHubToken) - # description: 'MicrosoftUIXamlInbox_arm64' - # pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' - # version: $(vpackversion) - # - task: PkgESVPack@12 - # displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' - # condition: eq(variables['PublishVpack'], 'true') - # inputs: - # sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' - # githubToken: $(WinUI2GitHubToken) - # description: 'MicrosoftUIXamlInboxWinmd' - # pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' - # version: $(vpackversion) \ No newline at end of file + # Push the VPacks: + - task: PkgESVPack@12 + displayName: 'Push VPack Microsoft.UI.Xaml' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' + githubToken: $(WinUI2GitHubToken) + description: Microsoft.UI.Xaml + pushPkgName: Microsoft.UI.Xaml-test + version: $(vpackversion) + - task: PkgESVPack@12 + displayName: 'Push VPack MicrosoftUIXamlInbox_x64' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' + githubToken: $(WinUI2GitHubToken) + description: 'MicrosoftUIXamlInbox_x64' + pushPkgName: 'MicrosoftUIXamlInbox_x64-test' + version: $(vpackversion) + - task: PkgESVPack@12 + displayName: 'Push VPack MicrosoftUIXamlInbox_x86' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' + githubToken: $(WinUI2GitHubToken) + description: 'MicrosoftUIXamlInbox_x86' + pushPkgName: 'MicrosoftUIXamlInbox_x86-test' + version: $(vpackversion) + - task: PkgESVPack@12 + displayName: 'Push VPack MicrosoftUIXamlInbox_arm' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' + githubToken: $(WinUI2GitHubToken) + description: 'MicrosoftUIXamlInbox_arm' + pushPkgName: 'MicrosoftUIXamlInbox_arm-test' + version: $(vpackversion) + - task: PkgESVPack@12 + displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' + githubToken: $(WinUI2GitHubToken) + description: 'MicrosoftUIXamlInbox_arm64' + pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' + version: $(vpackversion) + - task: PkgESVPack@12 + displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' + condition: eq(variables['PublishVpack'], 'true') + inputs: + sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' + githubToken: $(WinUI2GitHubToken) + description: 'MicrosoftUIXamlInboxWinmd' + pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' + version: $(vpackversion) \ No newline at end of file From fe54493f432f579091923069879d5828cab38684 Mon Sep 17 00:00:00 2001 From: kmahone Date: Wed, 16 Mar 2022 15:29:15 -0700 Subject: [PATCH 7/7] cleanup --- .../MUX-PushCBSVpack-Job.yml | 21 +- build/MUX-Release.yml | 226 +++++++++--------- 2 files changed, 121 insertions(+), 126 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml index dd41f5a3d0..93b998ad08 100644 --- a/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-PushCBSVpack-Job.yml @@ -3,8 +3,8 @@ parameters: jobs: - job: CreateVPack - # dependsOn: - # - ${{ parameters.dependsOn }} + dependsOn: + - ${{ parameters.dependsOn }} pool: name: WinDevPool-S variables: @@ -16,11 +16,6 @@ jobs: inputs: artifactName: drop downloadPath: $(System.ArtifactsDirectory) - buildType: specific - buildVersionToDownload: specific - project: $(System.TeamProjectId) - pipeline: 35915 - buildId: 46434715 # This contains the OS internal version of windows.winmd which is required for us to re-merge our winmd so that it can be used from OS repo. - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 @@ -65,7 +60,7 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\WinUIVpack' githubToken: $(WinUI2GitHubToken) description: Microsoft.UI.Xaml - pushPkgName: Microsoft.UI.Xaml-test + pushPkgName: Microsoft.UI.Xaml version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_x64' @@ -74,7 +69,7 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x64' githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x64' - pushPkgName: 'MicrosoftUIXamlInbox_x64-test' + pushPkgName: 'MicrosoftUIXamlInbox_x64' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_x86' @@ -83,7 +78,7 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\x86' githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_x86' - pushPkgName: 'MicrosoftUIXamlInbox_x86-test' + pushPkgName: 'MicrosoftUIXamlInbox_x86' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_arm' @@ -92,7 +87,7 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm' githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm' - pushPkgName: 'MicrosoftUIXamlInbox_arm-test' + pushPkgName: 'MicrosoftUIXamlInbox_arm' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInbox_arm64' @@ -101,7 +96,7 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\arm64' githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInbox_arm64' - pushPkgName: 'MicrosoftUIXamlInbox_arm64-test' + pushPkgName: 'MicrosoftUIXamlInbox_arm64' version: $(vpackversion) - task: PkgESVPack@12 displayName: 'Push VPack MicrosoftUIXamlInboxWinmd' @@ -110,5 +105,5 @@ jobs: sourceDirectory: '$(System.ArtifactsDirectory)\drop\Release\CBS\winmd' githubToken: $(WinUI2GitHubToken) description: 'MicrosoftUIXamlInboxWinmd' - pushPkgName: 'MicrosoftUIXamlInboxWinmd-test' + pushPkgName: 'MicrosoftUIXamlInboxWinmd' version: $(vpackversion) \ No newline at end of file diff --git a/build/MUX-Release.yml b/build/MUX-Release.yml index 8bf569cc2c..a1d4ec30a8 100644 --- a/build/MUX-Release.yml +++ b/build/MUX-Release.yml @@ -3,133 +3,133 @@ variables: minimumExpectedTestsExecutedCount: 35 # Sanity check for minimum expected tests to be reported Packaging.EnableSBOMSigning: true jobs: -# - job: Build -# # Skip the build job if we are reusing the output of a previous build. -# # useBuildOutputFromBuildId variable is set on the Pipeline at Queue time. -# condition: -# eq(variables['useBuildOutputFromBuildId'],'') -# pool: -# ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: -# name: WinDevPoolOSS-L -# ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: -# name: WinDevPool-L -# demands: ImageOverride -equals WinDevVS16-9 -# timeoutInMinutes: 120 -# strategy: -# maxParallel: 10 -# matrix: -# Debug_x86: -# buildPlatform: 'x86' -# buildConfiguration: 'Debug' -# Release_x86: -# buildPlatform: 'x86' -# buildConfiguration: 'Release' -# PGOBuildMode: 'Optimize' -# Release_x64: -# buildPlatform: 'x64' -# buildConfiguration: 'Release' -# PGOBuildMode: 'Optimize' -# Release_Arm: -# buildPlatform: 'arm' -# buildConfiguration: 'Release' -# Release_Arm64: -# buildPlatform: 'arm64' -# buildConfiguration: 'Release' +- job: Build + # Skip the build job if we are reusing the output of a previous build. + # useBuildOutputFromBuildId variable is set on the Pipeline at Queue time. + condition: + eq(variables['useBuildOutputFromBuildId'],'') + pool: + ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: + name: WinDevPoolOSS-L + ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: + name: WinDevPool-L + demands: ImageOverride -equals WinDevVS16-9 + timeoutInMinutes: 120 + strategy: + maxParallel: 10 + matrix: + Debug_x86: + buildPlatform: 'x86' + buildConfiguration: 'Debug' + Release_x86: + buildPlatform: 'x86' + buildConfiguration: 'Release' + PGOBuildMode: 'Optimize' + Release_x64: + buildPlatform: 'x64' + buildConfiguration: 'Release' + PGOBuildMode: 'Optimize' + Release_Arm: + buildPlatform: 'arm' + buildConfiguration: 'Release' + Release_Arm64: + buildPlatform: 'arm64' + buildConfiguration: 'Release' -# variables: -# appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages -# buildOutputDir : $(Build.SourcesDirectory)\BuildOutput -# publishDir : $(Build.ArtifactStagingDirectory) -# artifactsDir: $(Build.SourcesDirectory)\Artifacts -# sbomdir: $(Build.ArtifactStagingDirectory)\sbom\$(buildConfiguration)\$(buildPlatform) -# steps: + variables: + appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages + buildOutputDir : $(Build.SourcesDirectory)\BuildOutput + publishDir : $(Build.ArtifactStagingDirectory) + artifactsDir: $(Build.SourcesDirectory)\Artifacts + sbomdir: $(Build.ArtifactStagingDirectory)\sbom\$(buildConfiguration)\$(buildPlatform) + steps: -# # Download and extract nuget package with non-stubbed MicrosoftTelemetry.h header -# - task: DownloadPackage@1 -# displayName: 'Download Microsoft.Telemetry.Inbox.Native' -# inputs: -# feed: '/3415933f-ac0d-4766-8c0a-3f4c247c25f5' # 0 -# view: 'ef61a1c1-003b-4a27-bde5-beec8301021b' # Release -# definition: '2fe60c09-c66f-4275-ae2d-f015c7170c72' # Microsoft.Telemetry.Inbox.Native -# version: '10.0.18362.1-190318-1202.19h1-release.amd64fre' # latest version -# downloadPath: '$(System.DefaultWorkingDirectory)' # download and extract to repo root + # Download and extract nuget package with non-stubbed MicrosoftTelemetry.h header + - task: DownloadPackage@1 + displayName: 'Download Microsoft.Telemetry.Inbox.Native' + inputs: + feed: '/3415933f-ac0d-4766-8c0a-3f4c247c25f5' # 0 + view: 'ef61a1c1-003b-4a27-bde5-beec8301021b' # Release + definition: '2fe60c09-c66f-4275-ae2d-f015c7170c72' # Microsoft.Telemetry.Inbox.Native + version: '10.0.18362.1-190318-1202.19h1-release.amd64fre' # latest version + downloadPath: '$(System.DefaultWorkingDirectory)' # download and extract to repo root -# # Replace the stubbed MicrosoftTelemetry.h with the real one -# # Delete the existing stubbed MicrosoftTelemetry.h first, to ensure that if it is no longer at the expected path that the task, and build, fails -# - script: | -# del $(System.DefaultWorkingDirectory)\dev\telemetry\MicrosoftTelemetry.h -# move /Y $(System.DefaultWorkingDirectory)\build\native\inc\MicrosoftTelemetry.h $(System.DefaultWorkingDirectory)\dev\telemetry\ -# failOnStderr: true -# displayName: 'Replace existing stubbed MicrosoftTelemetry.h header with the real version from the nuget package' + # Replace the stubbed MicrosoftTelemetry.h with the real one + # Delete the existing stubbed MicrosoftTelemetry.h first, to ensure that if it is no longer at the expected path that the task, and build, fails + - script: | + del $(System.DefaultWorkingDirectory)\dev\telemetry\MicrosoftTelemetry.h + move /Y $(System.DefaultWorkingDirectory)\build\native\inc\MicrosoftTelemetry.h $(System.DefaultWorkingDirectory)\dev\telemetry\ + failOnStderr: true + displayName: 'Replace existing stubbed MicrosoftTelemetry.h header with the real version from the nuget package' -# - template: AzurePipelinesTemplates\MUX-BuildDevProject-Steps.yml -# parameters: -# signOutput: true + - template: AzurePipelinesTemplates\MUX-BuildDevProject-Steps.yml + parameters: + signOutput: true -# - script: | -# mkdir $(sbomdir) -# - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 -# displayName: 'Generate SBOM manifest' -# inputs: -# BuildDropPath: $(sbomdir) + - script: | + mkdir $(sbomdir) + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + inputs: + BuildDropPath: $(sbomdir) -# - template: AzurePipelinesTemplates\MUX-PublishProjectOutput-Steps.yml + - template: AzurePipelinesTemplates\MUX-PublishProjectOutput-Steps.yml -# # Create Nuget Package -# - template: AzurePipelinesTemplates\MUX-CreateNugetPackage-Job.yml -# parameters: -# jobName: CreateNugetPackage -# dependsOn: Build -# signOutput: true -# useReleaseTag: '$(MUXFinalRelease)' -# prereleaseVersionTag: prerelease +# Create Nuget Package +- template: AzurePipelinesTemplates\MUX-CreateNugetPackage-Job.yml + parameters: + jobName: CreateNugetPackage + dependsOn: Build + signOutput: true + useReleaseTag: '$(MUXFinalRelease)' + prereleaseVersionTag: prerelease - template: AzurePipelinesTemplates\MUX-PushCBSVpack-Job.yml parameters: dependsOn: Build -# - template: AzurePipelinesTemplates\MUX-ComplianceChecks-Job.yml -# parameters: -# dependsOn: CreateVPack +- template: AzurePipelinesTemplates\MUX-ComplianceChecks-Job.yml + parameters: + dependsOn: CreateVPack -# # Build solution that depends on nuget package -# - template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml -# parameters: -# buildJobName: 'BuildNugetPkgTests' -# buildArtifactName: 'NugetPkgTestsDrop' -# runTestJobName: 'RunNugetPkgTestsInHelix' -# helixType: 'test/nuget' -# dependsOn: CreateNugetPackage -# useFrameworkPkg: false +# Build solution that depends on nuget package +- template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml + parameters: + buildJobName: 'BuildNugetPkgTests' + buildArtifactName: 'NugetPkgTestsDrop' + runTestJobName: 'RunNugetPkgTestsInHelix' + helixType: 'test/nuget' + dependsOn: CreateNugetPackage + useFrameworkPkg: false -# # Framework package tests -# - template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml -# parameters: -# buildJobName: 'BuildFrameworkPkgTests' -# buildArtifactName: 'FrameworkPkgTestsDrop' -# runTestJobName: 'RunFrameworkPkgTestsInHelix' -# helixType: 'test/frpkg' -# dependsOn: CreateNugetPackage -# useFrameworkPkg: true +# Framework package tests +- template: AzurePipelinesTemplates\MUX-NugetReleaseTest-Job.yml + parameters: + buildJobName: 'BuildFrameworkPkgTests' + buildArtifactName: 'FrameworkPkgTestsDrop' + runTestJobName: 'RunFrameworkPkgTestsInHelix' + helixType: 'test/frpkg' + dependsOn: CreateNugetPackage + useFrameworkPkg: true -# - template: AzurePipelinesTemplates\MUX-ProcessTestResults-Job.yml -# parameters: -# dependsOn: -# - RunNugetPkgTestsInHelix -# - RunFrameworkPkgTestsInHelix -# rerunPassesRequiredToAvoidFailure: 5 -# minimumExpectedTestsExecutedCount: $(minimumExpectedTestsExecutedCount) +- template: AzurePipelinesTemplates\MUX-ProcessTestResults-Job.yml + parameters: + dependsOn: + - RunNugetPkgTestsInHelix + - RunFrameworkPkgTestsInHelix + rerunPassesRequiredToAvoidFailure: 5 + minimumExpectedTestsExecutedCount: $(minimumExpectedTestsExecutedCount) -# # NuGet package WACK tests -# - template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml -# parameters: -# name: 'NugetPkgWACKTests' -# dependsOn: BuildNugetPkgTests -# artifactName: 'NugetPkgTestsDrop' +# NuGet package WACK tests +- template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml + parameters: + name: 'NugetPkgWACKTests' + dependsOn: BuildNugetPkgTests + artifactName: 'NugetPkgTestsDrop' -# # Framework package WACK tests -# - template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml -# parameters: -# name: 'FrameworkPkgWACKTests' -# dependsOn: BuildFrameworkPkgTests -# artifactName: 'FrameworkPkgTestsDrop' \ No newline at end of file +# Framework package WACK tests +- template: AzurePipelinesTemplates\MUX-WACKTests-Job.yml + parameters: + name: 'FrameworkPkgWACKTests' + dependsOn: BuildFrameworkPkgTests + artifactName: 'FrameworkPkgTestsDrop' \ No newline at end of file