Skip to content

Commit 9b771d6

Browse files
v-imohammadmathewcjviau
authored
Pushing commit from v3.x to release/3.0 (#10292)
* Adding runtime site name to valid JWT audiences (slot scenarios). (#10186) * Defaulting SwtAuthenticationEnabled to False (#10196) * Regenerate .gitignore via dotnet cli (#10206) * [v3.x] Add 1ES CI pipelines (#10247) * Onboard v3.x to 1ES templates * update nuget feeds * Revert nuget.config feeds. Remove unused tools * Fix buildNumber * Use .net 8 SDK, fix version propagation * Fix update build number * Install additional .NET SDKs * Fix/suppress cred scan hits in test files * Remove performance app from legacy ci * update 1es tests * Test release * Fix non-e2e env * Fix webhost bin config path * fix TestHelpers * Fix missing variable * Set AzureWebJobsEventHubPath in test env * Fix .net 3.1 missing for tests * Remove test change * Fix .net 3.1 missing for tests * Address test secrets being flagged (#10264) * Release Prep for 3.23.0 (#10291) --------- Co-authored-by: Mathew Charles <[email protected]> Co-authored-by: Jacob Viau <[email protected]>
1 parent 23e71b5 commit 9b771d6

File tree

91 files changed

+1280
-3364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1280
-3364
lines changed

.gitignore

Lines changed: 495 additions & 26 deletions
Large diffs are not rendered by default.

.nuget/NuGet.Config

Lines changed: 0 additions & 9 deletions
This file was deleted.

.nuget/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
"processId": "${command:pickProcess}"
3535
}
3636
]
37-
}
37+
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"azure-pipelines.1ESPipelineTemplatesSchemaFile": true
3+
}

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
"problemMatcher": "$msCompile"
1313
}
1414
]
15-
}
15+
}

NuGet.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
56
<add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
67
<add key="azure-appservice-test" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/azure-appservice-test%40Local/nuget/v3/index.json" />
78
<add key="Microsoft.Azure.Functions.PowerShellWorker" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json" />
@@ -10,4 +11,4 @@
1011
<!-- dotnet-tools is required for Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit -->
1112
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"/>
1213
</packageSources>
13-
</configuration>
14+
</configuration>

azure-pipelines.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
buildNumberSuffix: $[variables.buildNumberSuffixTemp]
5050
packSuffixSwitch: $[variables.packSuffixSwitchTemp]
5151
emgSuffixSwitch: $[variables.emgSuffixSwitchTemp]
52-
majorVersion: $[dependencies.InitializePipeline.outputs['Initialize.MajorVersion']]
53-
minorVersion: $[dependencies.InitializePipeline.outputs['Initialize.MinorVersion']]
54-
patchVersion: $[dependencies.InitializePipeline.outputs['Initialize.PatchVersion']]
5552
pool:
5653
name: '1ES-Hosted-AzFunc'
5754
demands:
@@ -68,7 +65,7 @@ jobs:
6865
displayName: "Build artifacts"
6966
inputs:
7067
filePath: '$(Build.Repository.LocalPath)\build\build-extensions.ps1'
71-
arguments: '-buildNumber "$(buildNumberSuffix)" -majorMinorVersion "$(majorVersion).$(minorVersion)" -patchVersion "$(patchVersion)" -suffix "$(suffix)" -commitHash "$(Build.SourceVersion)"'
68+
arguments: '-buildNumber "$(buildNumberSuffix)" -suffix "$(suffix)" -commitHash "$(Build.SourceVersion)"'
7269
- task: PowerShell@2
7370
condition: eq(variables['RUNBUILDFORINTEGRATIONTESTS'], 'True')
7471
displayName: "Update host references"
@@ -112,14 +109,6 @@ jobs:
112109
publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df'
113110
allowPackageConflicts: true
114111

115-
- task: DotNetCoreCLI@2
116-
displayName: 'Build performance package'
117-
inputs:
118-
command: 'custom'
119-
custom: 'pack'
120-
arguments: '-o WebJobs.Script.Performance.App'
121-
projects: |
122-
**\WebJobs.Script.Performance.App.csproj
123112
- task: DotNetCoreCLI@2
124113
displayName: 'Build Abstractions and ExtensionsMetadataGenerator'
125114
inputs:
@@ -325,13 +314,6 @@ jobs:
325314
Verbosity: 'Information'
326315
- publish: $(Build.Repository.LocalPath)\packages
327316
artifact: NugetPackages
328-
- task: ManifestGeneratorTask@0
329-
displayName: 'SBOM Generation Task - Performance'
330-
inputs:
331-
BuildDropPath: '$(Build.Repository.LocalPath)\WebJobs.Script.Performance.App'
332-
Verbosity: 'Information'
333-
- publish: $(Build.Repository.LocalPath)\WebJobs.Script.Performance.App
334-
artifact: Performance
335317

336318
- job: RunUnitTests
337319
pool:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Get major, minor and patchVersions
2+
$version = @{}
3+
[xml]$XMLContents = [xml](Get-Content -Path "$PSScriptRoot\common.props")
4+
$XMLContents.GetElementsByTagName("MajorVersion") | ForEach-Object {
5+
$version.Major = $_.InnerText
6+
}
7+
8+
$XMLContents.GetElementsByTagName("MinorVersion") | ForEach-Object {
9+
$version.Minor = $_.InnerText
10+
}
11+
12+
$XMLContents.GetElementsByTagName("PatchVersion") | ForEach-Object {
13+
$version.Patch = $_.InnerText
14+
}
15+
16+
return $version

build/build-extensions.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
param (
22
[string]$buildNumber,
3-
[string]$majorMinorVersion,
4-
[string]$patchVersion,
53
[string]$suffix = "",
64
[string]$commitHash = "N/A",
75
[string]$hashesForHardlinksFile = "hashesForHardlinks.txt"
86
)
97

8+
$version = & $PSScriptRoot\Get-AzureFunctionsVersion.ps1
9+
$majorMinorVersion = "$($version.Major).$($version.Minor)"
10+
$patchVersion = $version.Patch
11+
1012
$extensionVersion = "$majorMinorVersion.$patchVersion"
1113
Write-Host "ExtensionVersion is $extensionVersion"
1214
Write-Host "BuildNumber is $buildNumber"

0 commit comments

Comments
 (0)