Skip to content

Commit 4a5edf8

Browse files
authored
Merge pull request #2559 from Azure/dev
Merge dev into main for v2.11.0 release
2 parents 1389847 + 3fc88b9 commit 4a5edf8

File tree

87 files changed

+2284
-684
lines changed

Some content is hidden

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

87 files changed

+2284
-684
lines changed

.github/fabricbot.json

-536
This file was deleted.
+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
scheduledSearches:
11+
- description:
12+
frequencies:
13+
- hourly:
14+
hour: 3
15+
filters:
16+
- isIssue
17+
- isOpen
18+
- hasLabel:
19+
label: "Needs: Author Feedback"
20+
- hasLabel:
21+
label: no-recent-activity
22+
- noActivitySince:
23+
days: 3
24+
actions:
25+
- closeIssue
26+
- description:
27+
frequencies:
28+
- hourly:
29+
hour: 3
30+
filters:
31+
- isIssue
32+
- isOpen
33+
- hasLabel:
34+
label: "Needs: Author Feedback"
35+
- noActivitySince:
36+
days: 4
37+
- isNotLabeledWith:
38+
label: no-recent-activity
39+
actions:
40+
- addLabel:
41+
label: no-recent-activity
42+
- addReply:
43+
reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
44+
- description:
45+
frequencies:
46+
- hourly:
47+
hour: 3
48+
filters:
49+
- isIssue
50+
- isOpen
51+
- hasLabel:
52+
label: duplicate
53+
- noActivitySince:
54+
days: 1
55+
actions:
56+
- addReply:
57+
reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
58+
- closeIssue
59+
eventResponderTasks:
60+
- if:
61+
- payloadType: Issues
62+
- and:
63+
- isOpen
64+
- not:
65+
and:
66+
- isAssignedToSomeone
67+
- isLabeled
68+
then:
69+
- addLabel:
70+
label: "Needs: Triage :mag:"
71+
- if:
72+
- payloadType: Issue_Comment
73+
- isAction:
74+
action: Created
75+
- isActivitySender:
76+
issueAuthor: True
77+
- hasLabel:
78+
label: "Needs: Author Feedback"
79+
then:
80+
- addLabel:
81+
label: "Needs: Attention :wave:"
82+
- removeLabel:
83+
label: "Needs: Author Feedback"
84+
description:
85+
- if:
86+
- payloadType: Issues
87+
- not:
88+
isAction:
89+
action: Closed
90+
- hasLabel:
91+
label: no-recent-activity
92+
then:
93+
- removeLabel:
94+
label: no-recent-activity
95+
description:
96+
- if:
97+
- payloadType: Issue_Comment
98+
- hasLabel:
99+
label: no-recent-activity
100+
then:
101+
- removeLabel:
102+
label: no-recent-activity
103+
description:
104+
onFailure:
105+
onSuccess:

.github/workflows/smoketest-python37-v2.yml .github/workflows/smoketest-python37-v4.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Smoke Test - Python 3.7 on Functions V2
1+
name: Smoke Test - Python 3.7 on Functions V4
22

33
on:
44
push:
@@ -17,6 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v2
20-
- name: Run V2 Python 3.7 Smoke Test
20+
- name: Run V4 Python 3.7 Smoke Test
2121
run: test/SmokeTests/e2e-test.ps1 -DockerfilePath test/SmokeTests/OOProcSmokeTests/durablePy/Dockerfile -HttpStartPath api/DurableFunctionsHttpStart -ContainerName pyApp
2222
shell: pwsh

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -296,3 +296,4 @@ functions-extensions/
296296

297297
.vscode/
298298
.ionide/
299+
/src/WebJobs.Extensions.DurableTask/Microsoft.Azure.WebJobs.Extensions.DurableTask.xml

.nuget/NuGet.Config

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<add key="azure-appservice-staging" value="https://www.myget.org/F/azure-appservice-staging/api/v3/index.json" />
77
<add key="azure-appservice" value="https://www.myget.org/F/azure-appservice/api/v3/index.json" />
88
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
9+
<add key="durabletask-test" value="https://durabletaskframework.pkgs.visualstudio.com/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask-test/nuget/v3/index.json" />
910
</packageSources>
10-
</configuration>
11+
</configuration>

WebJobs.Extensions.DurableTask.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{
8989
.github\workflows\smoketest-dotnet-v2.yml = .github\workflows\smoketest-dotnet-v2.yml
9090
.github\workflows\smoketest-dotnet-v3.yml = .github\workflows\smoketest-dotnet-v3.yml
9191
.github\workflows\smoketest-node14-v4.yml = .github\workflows\smoketest-node14-v4.yml
92-
.github\workflows\smoketest-python37-v2.yml = .github\workflows\smoketest-python37-v2.yml
92+
.github\workflows\smoketest-python37-v4.yml = .github\workflows\smoketest-python37-v4.yml
9393
EndProjectSection
9494
EndProject
9595
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DFPerfScenariosV1", "test\DFPerfScenariosV1\DFPerfScenariosV1.csproj", "{65F904AA-0F6F-48CB-BE19-593B7D68152A}"

nuget.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<add key="azure-appservice-staging" value="https://www.myget.org/F/azure-appservice-staging/api/v3/index.json" />
77
<add key="azure-appservice" value="https://www.myget.org/F/azure-appservice/api/v3/index.json" />
88
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
9+
<add key="durabletask-test" value="https://durabletaskframework.pkgs.visualstudio.com/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask-test/nuget/v3/index.json" />
910
</packageSources>
10-
</configuration>
11+
</configuration>

samples/correlation-csharp/FunctionAppCorrelation/local.settings.json

-8
This file was deleted.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32210.308
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedTracingSample", "DistributedTracingSample\DistributedTracingSample.csproj", "{363FCA38-CE94-4EBF-8627-B4519E8D7926}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{363FCA38-CE94-4EBF-8627-B4519E8D7926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{363FCA38-CE94-4EBF-8627-B4519E8D7926}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{363FCA38-CE94-4EBF-8627-B4519E8D7926}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{363FCA38-CE94-4EBF-8627-B4519E8D7926}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {F1489C50-7DEF-46F7-98AA-708941DFA461}
24+
EndGlobalSection
25+
EndGlobal

0 commit comments

Comments
 (0)