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
8 changes: 0 additions & 8 deletions NuGet.config

This file was deleted.

127 changes: 0 additions & 127 deletions azure-pipelines.yml

This file was deleted.

59 changes: 1 addition & 58 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ param(
$Configuration = "Debug",

[string]
$BuildNumber = '0',

[switch]
$AddSBOM,

[string]
$SBOMUtilSASUrl
$BuildNumber = '0'
)

#Requires -Version 6.0
Expand Down Expand Up @@ -68,35 +62,6 @@ function Get-FunctionsCoreToolsDir {
}
}

function Install-SBOMUtil
{
if ([string]::IsNullOrEmpty($SBOMUtilSASUrl))
{
throw "The `$SBOMUtilSASUrl parameter cannot be null or empty when specifying the `$AddSBOM switch"
}

$MANIFESTOOLNAME = "ManifestTool"
Write-Host "Installing $MANIFESTOOLNAME..."

$MANIFESTOOL_DIRECTORY = Join-Path $PSScriptRoot $MANIFESTOOLNAME
Remove-Item -Recurse -Force $MANIFESTOOL_DIRECTORY -ErrorAction Ignore

Invoke-RestMethod -Uri $SBOMUtilSASUrl -OutFile "$MANIFESTOOL_DIRECTORY.zip"
Expand-Archive "$MANIFESTOOL_DIRECTORY.zip" -DestinationPath $MANIFESTOOL_DIRECTORY

$dllName = "Microsoft.ManifestTool.dll"
$manifestToolPath = "$MANIFESTOOL_DIRECTORY/$dllName"

if (-not (Test-Path $manifestToolPath))
{
throw "$MANIFESTOOL_DIRECTORY does not contain '$dllName'"
}

Write-Host 'Done.'

return $manifestToolPath
}

function Deploy-PowerShellWorker {
$ErrorActionPreference = 'Stop'

Expand Down Expand Up @@ -170,28 +135,6 @@ if (!$NoBuild.IsPresent) {

dotnet publish -c $Configuration "/p:BuildNumber=$BuildNumber" $PSScriptRoot

if ($AddSBOM)
{
# Install manifest tool
$manifestTool = Install-SBOMUtil
Write-Log "manifestTool: $manifestTool "

# Generate manifest
$buildPath = "$PSScriptRoot/src/bin/$Configuration/$TargetFramework/publish"
$telemetryFilePath = Join-Path $PSScriptRoot ((New-Guid).Guid + ".json")
$packageName = "Microsoft.Azure.Functions.PowerShellWorker.nuspec"

# Delete the manifest folder if it exists
$manifestFolderPath = Join-Path $buildPath "_manifest"
if (Test-Path $manifestFolderPath)
{
Remove-Item $manifestFolderPath -Recurse -Force -ErrorAction Ignore
}

Write-Log "Running: dotnet $manifestTool generate -BuildDropPath $buildPath -BuildComponentPath $buildPath -Verbosity Information -t $telemetryFilePath"
& { dotnet $manifestTool generate -BuildDropPath $buildPath -BuildComponentPath $buildPath -Verbosity Information -t $telemetryFilePath -PackageName $packageName }
}

dotnet pack -c $Configuration "/p:BuildNumber=$BuildNumber" "$PSScriptRoot/package"
}

Expand Down
21 changes: 21 additions & 0 deletions eng/ci/code-mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
trigger:
branches:
include:
# Below branches are examples for Azure/azure-functions-host. Replace with appropriate branches for your repository.
# Keep this set limited as appropriate (don't mirror individual user branches).
- dev
- v4.x/*
- v3.x/*

resources:
repositories:
- repository: eng
type: git
name: engineering
ref: refs/tags/release

variables:
- template: ci/variables/cfs.yml@eng

extends:
template: ci/code-mirror.yml@eng
48 changes: 48 additions & 0 deletions eng/ci/official.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
trigger:
batch: true
branches:
include:
- v4.x/*
- v3.x/*

# CI only, does not trigger on PRs.
pr: none

resources:
repositories:
- repository: 1es
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

variables:
Configuration: Release
buildNumber: $[ counter('build', 4000) ] # Start higher than the versions from the previous pipeline. Every build (pr or branch) will increment.

extends:
template: v1/1ES.Official.PipelineTemplate.yml@1es
parameters:
pool:
name: 1es-pool-azfunc
image: 1es-windows-2022
os: windows

stages:
- stage: WindowsUnitTests
dependsOn: []
jobs:
- template: /eng/ci/templates/test.yml@self

- stage: LinuxUnitTests
dependsOn: []
jobs:
- template: /eng/ci/templates/test.yml@self
pool:
name: 1es-pool-azfunc
image: 1es-ubuntu-22.04
os: linux

- stage: Build
dependsOn: [WindowsUnitTests, LinuxUnitTests]
jobs:
- template: /eng/ci/templates/build.yml@self
37 changes: 37 additions & 0 deletions eng/ci/public.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
trigger:
batch: true
branches:
include:
- dev

resources:
repositories:
- repository: 1es
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
parameters:
pool:
name: 1es-pool-azfunc-public
image: 1es-windows-2022
os: windows

stages:
- stage: WindowsUnitTests
dependsOn: []
jobs:
- template: /eng/ci/templates/test.yml@self
pool:
name: 1es-pool-azfunc-public

- stage: LinuxUnitTests
dependsOn: []
jobs:
- template: /eng/ci/templates/test.yml@self
pool:
name: 1es-pool-azfunc-public
image: 1es-ubuntu-22.04
os: linux
38 changes: 38 additions & 0 deletions eng/ci/templates/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
jobs:
- job:
templateContext:
outputs:
- output: nuget
packagesToPush: "$(Build.ArtifactStagingDirectory)/*.nupkg"
packageParentPath: "$(Build.ArtifactStagingDirectory)"
nuGetFeedType: internal
publishVstsFeed: "e6a70c92-4128-439f-8012-382fe78d6396/c0493cce-bc63-4e11-9fc9-e7c45291f151"
sbomPackageName: "Azure Functions PowerShell Worker"
sbomBuildComponentPath: "$(Build.SourcesDirectory)"
allowPackageConflicts: true
# - output: nuget
# condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'), eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], true))
# packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
# packageParentPath: '$(Build.ArtifactStagingDirectory)'
# nuGetFeedType: 'internal'
# publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df' # AzureFunctionsPreRelease feed
# allowPackageConflicts: true
steps:
- pwsh: ./build.ps1 -NoBuild -Bootstrap
displayName: "Running ./build.ps1 -NoBuild -Bootstrap"

- pwsh: |
$ErrorActionPreference = "Stop"

./build.ps1 -Clean -Configuration Release -BuildNumber "$(buildNumber)"
displayName: "Build worker code"

- task: CopyFiles@2
inputs:
SourceFolder: "$(System.DefaultWorkingDirectory)/package"
Contents: |
**/*.nuspec
**/*.nupkg
TargetFolder: "$(Build.ArtifactStagingDirectory)"
flattenFolders: true
displayName: "Copy package to artifacts directory"
Loading