Skip to content

Commit 18a2125

Browse files
jviaujviau
committed
Merge branch 'main' into primary-ctors
2 parents df25197 + a0eddf4 commit 18a2125

30 files changed

+312
-86
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
# Changelog
22

3+
# v1.2.1
4+
5+
- Fix typo in `PurgeInstanceAsync` in `DurableTaskClient` (https://github.com/microsoft/durabletask-dotnet/pull/264)
6+
- Fix `TaskFailureDetails.IsCausedBy` to support custom exceptions and 3rd party exceptions ([#273](https://github.com/microsoft/durabletask-dotnet/pull/273))
7+
- Microsoft.Azure.DurableTask.Core dependency increased to `2.16.2`
8+
9+
# v1.2.0
10+
11+
- Adds support to recursively terminate/purge sub-orchestrations in `GrpcDurableTaskClient` (https://github.com/microsoft/durabletask-dotnet/pull/262)
12+
13+
# v1.1.1
14+
15+
- Microsoft.Azure.DurableTask.Core dependency increased to `2.16.1`
16+
317
# v1.1.0
418

519
- Microsoft.Azure.DurableTask.Core dependency increased to `2.16.0`
620

7-
821
## v1.1.0-preview.2
922

1023
- Microsoft.Azure.DurableTask.Core dependency increased to `2.16.0-preview.2`

‎azure-pipelines-release.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@ steps:
3131
submodules: true
3232

3333
- task: UseDotNet@2
34-
displayName: 'Install .NET SDK'
34+
displayName: 'Install .NET 6 SDK (ESRP)' # This is needed for ESRP.
35+
inputs:
36+
packageType: 'sdk'
37+
version: '6.x'
38+
39+
- task: UseDotNet@2
40+
displayName: 'Install .NET SDK (Build)' # This is needed for the build.
3541
inputs:
3642
packageType: 'sdk'
3743
useGlobalJson: true

‎doc/release_process.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Release Process
2+
3+
1. Rev versions as appropriate following semver.
4+
- Repo-wide versions can be found in `eng/targets/Release.props`
5+
- Individual packages can version independently by adding the `<VersionPrefix>` and `<VersionSuffix>` properties directly in their `.csproj`.
6+
- We follow an approach of just releasing everything, even if the package has no changes. _Unless_ we intentionally do not want to release a package.
7+
2. Ensure appropriate `RELEASENOTES.md` are updated in the repository.
8+
- These are per-package and contain only that packages changes.
9+
- The contents will be included in the `.nupkg` and show up in nuget.org's release notes tab.
10+
- Clear these files after a release.
11+
3. Ensure `CHANGELOG.md` in repo root is updated.
12+
4. Tag the release.
13+
- `git tag v<version>`, `git push <remote> -u <tag>`
14+
5. Draft github release for new tag.
15+
6. Kick off [ADO release build](https://dev.azure.com/durabletaskframework/Durable%20Task%20Framework%20CI/_build?definitionId=29) (use the tag as the build target, enter `refs/tags/<tag>`)
16+
7. Validate signing, package contents (if build changes were made.)
17+
8. Create ADO release.
18+
- From successful ADO release build, click 3 dots in top right -> 'Release'.
19+
9. Release to ADO feed.
20+
10. Release to nuget once validated (and dependencies are also released to nuget.)
21+
11. Publish github draft release.
22+
12. Delete contents of all `RELEASENOTES.md` files.

‎eng/proto‎

‎eng/targets/Release.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<PropertyGroup>
20-
<VersionPrefix>1.1.0</VersionPrefix>
20+
<VersionPrefix>1.2.2</VersionPrefix>
2121
<VersionSuffix></VersionSuffix>
2222
</PropertyGroup>
2323

‎misc/misc.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<None Include="$(RepoRoot)nuget.config" />
2323
<None Include="$(EngRoot)**" LinkBase="eng" />
2424
<None Include="$(RepoRoot).github/**" LinkBase="github" />
25+
<None Include="$(RepoRoot)doc/**" LinkBase="doc" />
2526
</ItemGroup>
2627

2728
</Project>

‎samples/AzureFunctionsApp/AzureFunctionsApp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
12-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.0-preview.2" />
11+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
12+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.0" />
1313
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
14-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.0-preview2" OutputItemType="Analyzer" />
14+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.2" OutputItemType="Analyzer" />
1515
<PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
1616
</ItemGroup>
1717

‎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" />
12-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
11+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.1.0" />
12+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.1.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎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" />
11-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
10+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.1.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎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" />
13-
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
12+
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.1.0" />
13+
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.1.0" />
1414
<PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
1515
</ItemGroup>
1616

0 commit comments

Comments
 (0)