-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2724 from Azure/dev
Merge dev to main for v2.13.1 release
- Loading branch information
Showing
21 changed files
with
792 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: Smoke Test - .NET in-proc w/ MSSQL on Functions V4 | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main, dev ] | ||
| paths: | ||
| - 'src/**' | ||
| - 'test/SmokeTests/BackendSmokeTests/MSSQL/**' | ||
| pull_request: | ||
| branches: [ main, dev ] | ||
| paths: | ||
| - 'src/**' | ||
| - 'test/SmokeTests/BackendSmokeTests/MSSQL/**' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
| env: | ||
| SA_PASSWORD: NotASecret!12 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Run V4 .NET in-proc w/ MSSQL Smoke Test | ||
| run: test/SmokeTests/e2e-test.ps1 -DockerfilePath test/SmokeTests/BackendSmokeTests/MSSQL/Dockerfile -HttpStartPath api/DurableFunctionsHttpStart -ContainerName MSSQLApp -SetupSQLServer | ||
| shell: pwsh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| # This is a copy of azure-pipelines-release.yml except that it triggers nightly. | ||
| # We want a copy so we can distinguish between nightly artifacts (which may trigger nightly perf tests) and artifacts built on-demand | ||
|
|
||
| schedules: | ||
| - cron: '0 8 * * *' | ||
| displayName: Daily midnight (PDT) build | ||
| branches: | ||
| include: | ||
| - dev | ||
|
|
||
| trigger: none | ||
| pr: none | ||
|
|
||
| pool: | ||
| name: '1ES-Hosted-DurableTaskFramework' | ||
| demands: | ||
| - ImageOverride -equals MMS2022TLS | ||
|
|
||
| variables: | ||
|
|
||
| - name: PackageSuffix | ||
| value: 'ci.$(Build.BuildNumber)' # the "ci" section is to denote this payload is automatically released by the CI | ||
| steps: | ||
|
|
||
| # Configure all the .NET SDK versions we need | ||
| - task: UseDotNet@2 | ||
| displayName: 'Use the .NET Core 2.1 SDK (required for build signing)' | ||
| inputs: | ||
| packageType: 'sdk' | ||
| version: '2.1.x' | ||
|
|
||
| - task: UseDotNet@2 | ||
| displayName: 'Use the .NET Core 3.1 SDK' | ||
| inputs: | ||
| packageType: 'sdk' | ||
| version: '3.1.x' | ||
|
|
||
| - task: UseDotNet@2 | ||
| displayName: 'Use the .NET 6 SDK' | ||
| inputs: | ||
| packageType: 'sdk' | ||
| version: '6.0.x' | ||
|
|
||
| # Use NuGet | ||
| - task: NuGetToolInstaller@1 | ||
| displayName: 'Use NuGet ' | ||
|
|
||
| # dotnet restore | ||
| - task: DotNetCoreCLI@2 | ||
| displayName: 'dotnet restore' | ||
| inputs: | ||
| command: restore | ||
| projects: '**/**/*.csproj' | ||
| feedsToUse: config | ||
| nugetConfigPath: 'nuget.config' | ||
|
|
||
| # Build durable-extension | ||
| - task: VSBuild@1 | ||
| displayName: 'Build Durable Extension' | ||
| inputs: | ||
| solution: '**/WebJobs.Extensions.DurableTask.sln' | ||
| vsVersion: "16.0" | ||
| configuration: Release | ||
|
|
||
| # Authenticode sign all the DLLs with the Microsoft certificate. | ||
| - task: EsrpCodeSigning@1 | ||
| inputs: | ||
| ConnectedServiceName: 'ESRP Service' | ||
| FolderPath: 'src/WebJobs.Extensions.DurableTask/bin/Release' | ||
| Pattern: '*DurableTask.dll' | ||
| signConfigType: 'inlineSignParams' | ||
| inlineOperation: | | ||
| [ | ||
| { | ||
| "KeyCode": "CP-230012", | ||
| "OperationCode": "SigntoolSign", | ||
| "Parameters": { | ||
| "OpusName": "Microsoft", | ||
| "OpusInfo": "http://www.microsoft.com", | ||
| "FileDigest": "/fd \"SHA256\"", | ||
| "PageHash": "/NPH", | ||
| "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256" | ||
| }, | ||
| "ToolName": "sign", | ||
| "ToolVersion": "1.0" | ||
| }, | ||
| { | ||
| "KeyCode": "CP-230012", | ||
| "OperationCode": "SigntoolVerify", | ||
| "Parameters": {}, | ||
| "ToolName": "sign", | ||
| "ToolVersion": "1.0" | ||
| } | ||
| ] | ||
| SessionTimeout: '60' | ||
| MaxConcurrency: '50' | ||
| MaxRetryAttempts: '5' | ||
|
|
||
| # SBOM generator task for additional supply chain protection | ||
| - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 | ||
| displayName: 'Manifest Generator ' | ||
| inputs: | ||
| BuildDropPath: '$(System.DefaultWorkingDirectory)' | ||
|
|
||
| # dotnet pack | ||
| # Packaging needs to be a separate step from build. | ||
| # This will automatically pick up the signed DLLs. | ||
| - task: DotNetCoreCLI@2 | ||
| displayName: 'dotnet pack WebJobs.Extensions.DurableTask.csproj' | ||
| inputs: | ||
| command: pack | ||
| packagesToPack: 'src/**/WebJobs.Extensions.DurableTask.csproj' | ||
| configuration: Release | ||
| packDirectory: 'azure-functions-durable-extension' | ||
| nobuild: true | ||
|
|
||
| # Remove redundant symbol package(s) | ||
| - script: | | ||
| echo *** Searching for .symbols.nupkg files to delete... | ||
| dir /s /b *.symbols.nupkg | ||
| echo *** Deleting .symbols.nupkg files... | ||
| del /S /Q *.symbols.nupkg | ||
| echo *** Listing remaining packages | ||
| dir /s /b *.nupkg | ||
| displayName: 'Remove Redundant Symbols Package(s)' | ||
| continueOnError: true | ||
|
|
||
| # Digitally sign all the nuget packages with the Microsoft certificate. | ||
| # This appears to be an in-place signing job, which is convenient. | ||
| - task: EsrpCodeSigning@1 | ||
| inputs: | ||
| ConnectedServiceName: 'ESRP Service' | ||
| FolderPath: '$(System.DefaultWorkingDirectory)' | ||
| Pattern: '*.nupkg' | ||
| signConfigType: 'inlineSignParams' | ||
| inlineOperation: | | ||
| [ | ||
| { | ||
| "KeyCode": "CP-401405", | ||
| "OperationCode": "NuGetSign", | ||
| "Parameters": {}, | ||
| "ToolName": "sign", | ||
| "ToolVersion": "1.0" | ||
| }, | ||
| { | ||
| "KeyCode": "CP-401405", | ||
| "OperationCode": "NuGetVerify", | ||
| "Parameters": {}, | ||
| "ToolName": "sign", | ||
| "ToolVersion": "1.0" | ||
| } | ||
| ] | ||
| SessionTimeout: '60' | ||
| MaxConcurrency: '50' | ||
| MaxRetryAttempts: '5' | ||
|
|
||
| # zip .NET in-proc perf tests | ||
| - task: DotNetCoreCLI@2 | ||
| displayName: 'Zip .NET in-proc perf tests' | ||
| inputs: | ||
| command: 'publish' | ||
| publishWebProjects: false | ||
| projects: '$(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/**/*.csproj' | ||
| arguments: '-o $(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/Output' | ||
| zipAfterPublish: true | ||
| modifyOutputPath: true | ||
|
|
||
| # Move zip'ed .NET in-proc perf tests to the ADO publishing directory | ||
| - task: CopyFiles@2 | ||
| inputs: | ||
| SourceFolder: '$(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/Output/' | ||
| Contents: '**' | ||
| TargetFolder: '$(System.DefaultWorkingDirectory)/azure-functions-durable-extension/' | ||
|
|
||
| # Make the nuget packages available for download in the ADO portal UI | ||
| - publish: '$(System.DefaultWorkingDirectory)/azure-functions-durable-extension' | ||
| displayName: 'Publish nuget packages to Artifacts' | ||
| artifact: PackageOutput |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/Worker.Extensions.DurableTask/ActivityInputConverter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright (c) .NET Foundation. All rights reserved. | ||
| // Licensed under the MIT License. See License.txt in the project root for license information. | ||
|
|
||
| using System; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Azure.Functions.Worker.Converters; | ||
| using Microsoft.DurableTask.Worker; | ||
| using Microsoft.Extensions.Options; | ||
|
|
||
| namespace Microsoft.Azure.Functions.Worker.Extensions.DurableTask; | ||
|
|
||
| internal class ActivityInputConverter : IInputConverter | ||
| { | ||
| private readonly DurableTaskWorkerOptions options; | ||
|
|
||
| public ActivityInputConverter(IOptions<DurableTaskWorkerOptions> options) | ||
| { | ||
| this.options = options?.Value ?? throw new ArgumentNullException(nameof(options)); | ||
| } | ||
|
|
||
| public ValueTask<ConversionResult> ConvertAsync(ConverterContext context) | ||
| { | ||
| if (context is null) | ||
| { | ||
| throw new ArgumentNullException(nameof(context)); | ||
| } | ||
|
|
||
| if (context.Source is null) | ||
| { | ||
| return new(ConversionResult.Success(null)); | ||
| } | ||
|
|
||
| if (context.Source is not string source) | ||
| { | ||
| throw new InvalidOperationException($"Expected converter source to be a string, received {context.Source?.GetType()}."); | ||
| } | ||
|
|
||
| object? value = this.options.DataConverter.Deserialize(source, context.TargetType); | ||
| return new(ConversionResult.Success(value)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.