Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
parameters:
artifactName: 'windowsappsdk_binaries'

steps:
- task: powershell@2
displayName: 'Copy files to staging dir'
inputs:
targetType: filePath
filePath: build\CopyFilesToStagingDir.ps1
arguments: -BuildOutputDir '$(buildOutputDir)' -OverrideDir '$(Build.SourcesDirectory)\build\override' -PublishDir '$(Build.ArtifactStagingDirectory)\${{ parameters.artifactName }}' -NugetDir '$(Build.ArtifactStagingDirectory)\FullNuget' -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)'
arguments: -BuildOutputDir '$(buildOutputDir)' -OverrideDir '$(Build.SourcesDirectory)\build\override' -PublishDir '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries' -NugetDir '$(Build.ArtifactStagingDirectory)\FullNuget' -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)'

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'SBOM Generation Task'
inputs:
BuildDropPath: '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries\$(buildConfiguration)\$(buildPlatform)'

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: ${{ parameters.artifactName }}'
displayName: 'Publish artifact: windowsappsdk_binaries'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\${{ parameters.artifactName }}'
artifactName: ${{ parameters.artifactName }}
PathtoPublish: '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries'
artifactName: windowsappsdk_binaries

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: Full Nuget (Windows App Runtime DLLs)'
Expand Down
28 changes: 25 additions & 3 deletions build/ProjectReunion-BuildFoundation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,18 @@ jobs:
parameters:
channel: ${{ variables.channel }}

- template: AzurePipelinesTemplates\WindowsAppSDK-PublishProjectOutput-Steps.yml

# component detection must happen *within* the build task
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

- template: AzurePipelinesTemplates\WindowsAppSDK-PublishProjectOutput-Steps.yml

- task: BinSkim@3
inputs:
InputType: 'Basic'
Function: 'analyze'
AnalyzeTarget: '$(Build.ArtifactStagingDirectory)\*.dll;$(Build.ArtifactStagingDirectory)\*.exe'
AnalyzeVerbose: true

- task: PostAnalysis@1
inputs:
AllTools: false
Expand Down Expand Up @@ -167,14 +168,35 @@ jobs:
channel: ${{ variables.channel }}

- task: CopyFiles@2
displayName: 'Copy AnyCpu-built binaries'
displayName: 'Copy AnyCpu-built binaries to Nuget for staging'
inputs:
SourceFolder: '$(buildOutputDir)\$(buildConfiguration)\$(buildPlatform)\Microsoft.WindowsAppRuntime.Bootstrap.Net'
Contents: |
Microsoft.WindowsAppRuntime.Bootstrap.Net.dll
TargetFolder: '$(Build.ArtifactStagingDirectory)\FullNuget\lib\net5.0-windows10.0.17763.0'
flattenFolders: false

# This is purely for the SBOM
- task: CopyFiles@2
displayName: 'Copy AnyCpu-built binaries to windowsappsdk_binaries'
inputs:
SourceFolder: '$(buildOutputDir)\$(buildConfiguration)\$(buildPlatform)\Microsoft.WindowsAppRuntime.Bootstrap.Net'
Contents: |
Microsoft.WindowsAppRuntime.Bootstrap.Net.dll
TargetFolder: '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries\$(buildPlatform)\$(buildConfiguration)'
flattenFolders: false

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'SBOM Generation Task'
inputs:
BuildDropPath: '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries\$(buildPlatform)\$(buildConfiguration)'

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: windowsappsdk_binaries'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\windowsappsdk_binaries'
artifactName: windowsappsdk_binaries

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: Full Nuget (Windows App Runtime DLLs)'
inputs:
Expand Down
5 changes: 5 additions & 0 deletions build/build-mrt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@ steps:
TargetFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\lib\anycpu'
flattenFolders: true

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'SBOM Generation Task'
inputs:
BuildDropPath: '$(Build.ArtifactStagingDirectory)\mrt_raw\lib\$(buildPlatform)'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: Binaries'
inputs:
Expand Down