Skip to content

Commit 2e8dee2

Browse files
jviaujviau
committed
Merge branch 'main' into mediator
2 parents c353795 + d31f502 commit 2e8dee2

30 files changed

+173
-93
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## v1.0.1
4+
5+
### Microsoft.DurableTask.Client
6+
7+
- Fix incorrect bounds check on `PurgeResult`
8+
- Address typo for `DurableTaskClient.GetInstancesAsync` (incorrectly pluralized)
9+
- Added `GetInstanceAsync`
10+
- Hide `GetInstancesAsync` from editor
11+
312
## v1.0.0
413

514
- Added `SuspendInstanceAsync` and `ResumeInstanceAsync` to `DurableTaskClient`.

‎azure-pipelines-release.yml‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@ pool:
77
demands:
88
- ImageOverride -equals MMS2022TLS
99

10+
variables:
11+
project: 'src/dirs.proj'
12+
1013
steps:
1114
- checkout: self
1215
submodules: true
1316

1417
- task: UseDotNet@2
15-
displayName: 'Use the .NET Core 2.1 SDK (required for build signing)'
16-
inputs:
17-
packageType: 'sdk'
18-
version: '2.1.x'
19-
20-
- task: UseDotNet@2
21-
displayName: 'Use the .NET 6 SDK'
18+
displayName: 'Install .NET SDK'
2219
inputs:
2320
packageType: 'sdk'
2421
useGlobalJson: true
@@ -29,27 +26,27 @@ steps:
2926
inputs:
3027
command: restore
3128
verbosityRestore: Minimal
32-
projects: 'src/dirs.proj'
29+
projects: $(project)
3330

3431
# Build source directory
3532
- task: DotNetCoreCLI@2
3633
displayName: 'Build'
3734
inputs:
3835
command: build
3936
arguments: --no-restore -c release -p:FileVersionRevision=$(Build.BuildId) -p:ContinuousIntegrationBuild=true
40-
projects: 'src/dirs.proj'
37+
projects: $(project)
4138

4239
# Authenticode sign all the DLLs with the Microsoft certificate.
4340
# This appears to be an in-place signing job, which is convenient.
44-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
41+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
4542
displayName: 'ESRP CodeSigning: Authenticode'
4643
inputs:
4744
ConnectedServiceName: 'ESRP Service'
4845
FolderPath: 'out/bin'
4946
Pattern: 'Microsoft.DurableTask.*.dll'
5047
signConfigType: inlineSignParams
5148
inlineOperation: |
52-
[
49+
[
5350
{
5451
"KeyCode": "CP-230012",
5552
"OperationCode": "SigntoolSign",
@@ -88,34 +85,34 @@ steps:
8885
configuration: release
8986
nobuild: true
9087
packDirectory: $(build.artifactStagingDirectory)
91-
packagesToPack: 'src/dirs.proj'
88+
packagesToPack: $(project)
9289

9390
# Digitally sign all the nuget packages with the Microsoft certificate.
9491
# This appears to be an in-place signing job, which is convenient.
95-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
92+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
9693
displayName: 'ESRP CodeSigning: Nupkg'
9794
inputs:
9895
ConnectedServiceName: 'ESRP Service'
9996
FolderPath: $(build.artifactStagingDirectory)
10097
Pattern: '*.nupkg'
10198
signConfigType: inlineSignParams
10299
inlineOperation: |
103-
[
100+
[
104101
{
105-
"KeyCode": "CP-401405",
106-
"OperationCode": "NuGetSign",
107-
"Parameters": {},
108-
"ToolName": "sign",
109-
"ToolVersion": "1.0"
102+
"KeyCode": "CP-401405",
103+
"OperationCode": "NuGetSign",
104+
"Parameters": {},
105+
"ToolName": "sign",
106+
"ToolVersion": "1.0"
110107
},
111108
{
112-
"KeyCode": "CP-401405",
113-
"OperationCode": "NuGetVerify",
114-
"Parameters": {},
115-
"ToolName": "sign",
116-
"ToolVersion": "1.0"
109+
"KeyCode": "CP-401405",
110+
"OperationCode": "NuGetVerify",
111+
"Parameters": {},
112+
"ToolName": "sign",
113+
"ToolVersion": "1.0"
117114
}
118-
]
115+
]
119116
120117
# Make the nuget packages available for download in the ADO portal UI
121118
- publish: $(build.artifactStagingDirectory)

‎eng/targets/Release.props‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
3+
<!--
4+
Release.props: props relating to the release integrity of our product.
5+
- Nuget packaging props
6+
- Versioning props
7+
-->
8+
9+
<!-- Common NuGet settings -->
10+
<PropertyGroup>
11+
<Authors>Microsoft</Authors>
12+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
13+
<RepositoryUrl>https://github.com/microsoft/durabletask-dotnet</RepositoryUrl>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
16+
<PackageTags>Microsoft Durable Task Orchestration Workflow Activity Reliable DTFx</PackageTags>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<VersionPrefix>1.0.1</VersionPrefix>
21+
</PropertyGroup>
22+
23+
</Project>

‎eng/targets/Release.targets‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
3+
<!--
4+
Release.targets: targets relating to the release integrity of our product.
5+
- Nuget packaging targets
6+
- Versioning targets
7+
-->
8+
9+
<PropertyGroup>
10+
<ReleaseNotesFile Condition="'$(ReleaseNotesFile)' == ''">RELEASENOTES.md</ReleaseNotesFile>
11+
<BeforePack>$(BeforePack);GetReleaseNotes;AddCommonReleaseNotes</BeforePack>
12+
<PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
13+
</PropertyGroup>
14+
15+
<!-- Embed the SBOM manifest, which is generated as part of the "official" build -->
16+
<ItemGroup Condition="'$(Configuration)'=='Release'">
17+
<Content Include="..\..\_manifest\**" Pack="true" PackagePath="content/SBOM">
18+
<Pack>true</Pack>
19+
<PackagePath>content/SBOM</PackagePath>
20+
</Content>
21+
</ItemGroup>
22+
23+
<ItemGroup Condition="Exists('README.md')">
24+
<Content Include="README.md" Pack="true" PackagePath="/" />
25+
</ItemGroup>
26+
27+
<!-- This target lets us define a release notes file per package. -->
28+
<Target Name="GetReleaseNotes" Condition="'$(PackageReleaseNotes)' == '' and Exists('$(ReleaseNotesFile)')">
29+
<PropertyGroup>
30+
<PackageReleaseNotes>$([System.IO.File]::ReadAllText('$(ReleaseNotesFile)'))</PackageReleaseNotes>
31+
</PropertyGroup>
32+
</Target>
33+
34+
<Target Name="AddCommonReleaseNotes">
35+
<PropertyGroup>
36+
<PackageReleaseNotes>
37+
See $(RepositoryUrl)/releases/tag/v$(Version)
38+
39+
$(PackageReleaseNotes)
40+
</PackageReleaseNotes>
41+
</PropertyGroup>
42+
</Target>
43+
44+
</Project>

‎samples/ConsoleApp/ConsoleApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0-rc.1" />
12-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0-rc.1" />
11+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0" />
12+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎samples/ConsoleApp/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ await context.CallActivityAsync<string>("SayHello", "Seattle"),
7979
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1000));
8080
OrchestrationMetadata instance = await client.WaitForInstanceCompletionAsync(
8181
instanceId,
82-
cts.Token,
83-
getInputsAndOutputs: true);
82+
getInputsAndOutputs: true,
83+
cts.Token);
8484

8585
Console.WriteLine($"Instance completed: {instance}");

‎samples/NetFxConsoleApp/NetFxConsoleApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
10-
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0-rc.1" />
11-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0-rc.1" />
10+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0" />
11+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎samples/NetFxConsoleApp/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ await context.CallActivityAsync<string>("SayHello", "Seattle"),
4949
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1000));
5050
OrchestrationMetadata instance = await client.WaitForInstanceCompletionAsync(
5151
instanceId,
52-
cts.Token,
53-
getInputsAndOutputs: true);
52+
getInputsAndOutputs: true,
53+
cts.Token);
5454

5555
Console.WriteLine($"Instance completed: {instance}");
5656
}

‎samples/WebAPI/Controllers/OrderProcessingController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ await this.durableTaskClient.ScheduleNewProcessOrderOrchestratorInstanceAsync(
4545
[HttpGet("{orderId}")]
4646
public async Task<ActionResult> GetOrderStatus(string orderId)
4747
{
48-
OrchestrationMetadata? metadata = await this.durableTaskClient.GetInstanceMetadataAsync(
48+
OrchestrationMetadata? metadata = await this.durableTaskClient.GetInstancesAsync(
4949
instanceId: orderId,
5050
getInputsAndOutputs: true);
5151

‎samples/WebAPI/WebAPI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0-rc.1" />
13-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0-rc.1" />
12+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0" />
13+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
1414
<PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
1515
</ItemGroup>
1616

0 commit comments

Comments
 (0)