Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[in-proc backport] Use dotnet common artifacts output (#9858) #10079

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bin
obj
out
csx
.vs
.vscode
Expand Down
9 changes: 9 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<PropertyGroup>
<ArtifactsPath>$(MSBuildThisFileDirectory)out</ArtifactsPath>
<ArtifactsPublishOutputName>pub</ArtifactsPublishOutputName>
<ArtifactsPackageOutputName>pkg</ArtifactsPackageOutputName>
</PropertyGroup>

</Project>
31 changes: 16 additions & 15 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
filePath: '$(Build.Repository.LocalPath)\build\initialize-pipeline.ps1'
arguments: -minorVersionPrefix "$(minorVersionPrefix)"
showWarnings: true
pwsh: true

- job: BuildArtifacts
dependsOn: InitializePipeline
Expand Down Expand Up @@ -82,15 +83,15 @@ jobs:
filePath: '$(Build.Repository.LocalPath)\build\update-hostreferences.ps1'
- task: CopyFiles@2
inputs:
SourceFolder: '$(Build.Repository.LocalPath)\buildoutput'
Contents: '**\*.zip'
SourceFolder: 'out/pub/WebJobs.Script.WebHost'
Contents: '**/*.zip'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
- task: DotNetCoreCLI@2
displayName: 'Build host packages'
inputs:
command: 'custom'
custom: 'pack'
arguments: -o packages -p:BuildNumber=$(buildNumber) -c Release $(packSuffixSwitch)
arguments: -p:BuildNumber=$(buildNumber) -c Release $(packSuffixSwitch)
projects: |
**\WebJobs.Script.csproj
**\WebJobs.Script.WebHost.csproj
Expand All @@ -100,7 +101,7 @@ jobs:
foreach ($baseName in @("WebJobs.Script", "WebJobs.Script.WebHost", "WebJobs.Script.Grpc"))
{
$packageName = "Microsoft.Azure." + $baseName + "*.nupkg"
$sourcePath = "$(Build.Repository.LocalPath)/packages/$packageName"
$sourcePath = "$(Build.Repository.LocalPath)/out/pkg/release/$packageName"
if (-not (test-path $sourcePath))
{
throw "Unable to find '$packageName' at './package'"
Expand Down Expand Up @@ -138,7 +139,7 @@ jobs:
displayName: 'ESRP CodeSigning: Strong Name and Authenticode'
inputs:
ConnectedServiceName: 'ESRP Service'
FolderPath: 'src\WebJobs.Script.Abstractions\bin\Release'
FolderPath: 'out/bin/WebJobs.Script.Abstractions/release'
Pattern: Microsoft.Azure.WebJobs.Script.Abstractions*.dll
signConfigType: inlineSignParams
inlineOperation: |
Expand Down Expand Up @@ -173,14 +174,14 @@ jobs:
inputs:
command: 'custom'
custom: 'pack'
arguments: '--no-build -c Release -o packages'
arguments: '--no-build -c Release'
projects: |
**\WebJobs.Script.Abstractions.csproj
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: 'ESRP CodeSigning: Nupkg'
inputs:
ConnectedServiceName: 'ESRP Service'
FolderPath: 'packages'
FolderPath: 'out/pkg/release'
Pattern: 'Microsoft.Azure.WebJobs.Script.Abstractions*.nupkg'
signConfigType: inlineSignParams
inlineOperation: |
Expand All @@ -204,8 +205,8 @@ jobs:
displayName: 'ESRP CodeSigning: Strong Name and Authenticode'
inputs:
ConnectedServiceName: 'ESRP Service'
FolderPath: 'tools\ExtensionsMetadataGenerator\src\ExtensionsMetadataGenerator\bin\Release'
Pattern: Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator*.dll
FolderPath: 'out/bin/ExtensionsMetadataGenerator'
Pattern: 'Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator*.dll'
signConfigType: inlineSignParams
inlineOperation: |
[
Expand Down Expand Up @@ -254,15 +255,15 @@ jobs:
inputs:
command: 'custom'
custom: 'pack'
arguments: '--no-build -c Release -o packages $(emgSuffixSwitch)'
arguments: '--no-build -c Release $(emgSuffixSwitch)'
projects: |
**\ExtensionsMetadataGenerator.csproj
steps:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: 'ESRP CodeSigning: Nupkg'
inputs:
ConnectedServiceName: 'ESRP Service'
FolderPath: 'packages'
FolderPath: 'out/pkg/release'
Pattern: 'Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator*.nupkg'
signConfigType: inlineSignParams
inlineOperation: |
Expand Down Expand Up @@ -327,16 +328,16 @@ jobs:
- task: ManifestGeneratorTask@0
displayName: 'SBOM Generation Task - NugetPackages'
inputs:
BuildDropPath: '$(Build.Repository.LocalPath)\packages'
BuildDropPath: 'out/pkg/release'
Verbosity: 'Information'
- publish: $(Build.Repository.LocalPath)\packages
- publish: out/pkg/release
artifact: NugetPackages
- task: ManifestGeneratorTask@0
displayName: 'SBOM Generation Task - Performance'
inputs:
BuildDropPath: '$(Build.Repository.LocalPath)\WebJobs.Script.Performance.App'
BuildDropPath: 'WebJobs.Script.Performance.App'
Verbosity: 'Information'
- publish: $(Build.Repository.LocalPath)\WebJobs.Script.Performance.App
- publish: WebJobs.Script.Performance.App
artifact: Performance

- job: RunUnitTests
Expand Down