Skip to content

Commit 781c2f6

Browse files
Charles-GagnonCharles-Gagnon
authored
Bump xunit packages (#1004)
* Bump packages * Disable xUnit1031 error * Revert worker update * Undo abstractions * missed one * Undo timer update * Add log * Don't cache query type * More logging * fix message * Revert "Don't cache query type" This reverts commit 309c1ec. * undo debug logging * move newline
1 parent dc13cb7 commit 781c2f6

File tree

5 files changed

+75
-80
lines changed

5 files changed

+75
-80
lines changed

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PackageVersion Include="System.Runtime.Caching" Version="6.0.0" />
1616
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
1717
<PackageVersion Include="Moq" Version="4.18.4" />
18-
<PackageVersion Include="xunit" Version="2.5.0" />
19-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
18+
<PackageVersion Include="xunit" Version="2.6.5" />
19+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
2020
<PackageVersion Include="xRetry" Version="1.9.0" />
2121
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="4.0.1" />
2222
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

‎performance/packages.lock.json‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,42 +1833,39 @@
18331833
},
18341834
"xunit.analyzers": {
18351835
"type": "Transitive",
1836-
"resolved": "1.2.0",
1837-
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
1836+
"resolved": "1.9.0",
1837+
"contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw=="
18381838
},
18391839
"xunit.assert": {
18401840
"type": "Transitive",
1841-
"resolved": "2.5.0",
1842-
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
1843-
"dependencies": {
1844-
"NETStandard.Library": "1.6.1"
1845-
}
1841+
"resolved": "2.6.5",
1842+
"contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA=="
18461843
},
18471844
"xunit.core": {
18481845
"type": "Transitive",
1849-
"resolved": "2.5.0",
1850-
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
1846+
"resolved": "2.6.5",
1847+
"contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==",
18511848
"dependencies": {
1852-
"xunit.extensibility.core": "[2.5.0]",
1853-
"xunit.extensibility.execution": "[2.5.0]"
1849+
"xunit.extensibility.core": "[2.6.5]",
1850+
"xunit.extensibility.execution": "[2.6.5]"
18541851
}
18551852
},
18561853
"xunit.extensibility.core": {
18571854
"type": "Transitive",
1858-
"resolved": "2.5.0",
1859-
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
1855+
"resolved": "2.6.5",
1856+
"contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==",
18601857
"dependencies": {
18611858
"NETStandard.Library": "1.6.1",
18621859
"xunit.abstractions": "2.0.3"
18631860
}
18641861
},
18651862
"xunit.extensibility.execution": {
18661863
"type": "Transitive",
1867-
"resolved": "2.5.0",
1868-
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
1864+
"resolved": "2.6.5",
1865+
"contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==",
18691866
"dependencies": {
18701867
"NETStandard.Library": "1.6.1",
1871-
"xunit.extensibility.core": "[2.5.0]"
1868+
"xunit.extensibility.core": "[2.6.5]"
18721869
}
18731870
},
18741871
"microsoft.azure.webjobs.extensions.sql": {
@@ -1909,8 +1906,8 @@
19091906
"Moq": "[4.18.4, )",
19101907
"Newtonsoft.Json": "[13.0.3, )",
19111908
"xRetry": "[1.9.0, )",
1912-
"xunit": "[2.5.0, )",
1913-
"xunit.runner.visualstudio": "[2.5.0, )"
1909+
"xunit": "[2.6.5, )",
1910+
"xunit.runner.visualstudio": "[2.5.6, )"
19141911
}
19151912
},
19161913
"Azure.Identity": {
@@ -2133,20 +2130,20 @@
21332130
},
21342131
"xunit": {
21352132
"type": "CentralTransitive",
2136-
"requested": "[2.5.0, )",
2137-
"resolved": "2.5.0",
2138-
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
2133+
"requested": "[2.6.5, )",
2134+
"resolved": "2.6.5",
2135+
"contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==",
21392136
"dependencies": {
2140-
"xunit.analyzers": "1.2.0",
2141-
"xunit.assert": "2.5.0",
2142-
"xunit.core": "[2.5.0]"
2137+
"xunit.analyzers": "1.9.0",
2138+
"xunit.assert": "2.6.5",
2139+
"xunit.core": "[2.6.5]"
21432140
}
21442141
},
21452142
"xunit.runner.visualstudio": {
21462143
"type": "CentralTransitive",
2147-
"requested": "[2.5.0, )",
2148-
"resolved": "2.5.0",
2149-
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
2144+
"requested": "[2.5.6, )",
2145+
"resolved": "2.5.6",
2146+
"contentHash": "CW6uhMXNaQQNMSG1IWhHkBT+V5eqHqn7MP0zfNMhU9wS/sgKX7FGL3rzoaUgt26wkY3bpf7pDVw3IjXhwfiP4w=="
21502147
}
21512148
}
21522149
}

‎test-outofproc/packages.lock.json‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
},
7070
"xunit": {
7171
"type": "Direct",
72-
"requested": "[2.5.0, )",
73-
"resolved": "2.5.0",
74-
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
72+
"requested": "[2.6.5, )",
73+
"resolved": "2.6.5",
74+
"contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==",
7575
"dependencies": {
76-
"xunit.analyzers": "1.2.0",
77-
"xunit.assert": "2.5.0",
78-
"xunit.core": "[2.5.0]"
76+
"xunit.analyzers": "1.9.0",
77+
"xunit.assert": "2.6.5",
78+
"xunit.core": "[2.6.5]"
7979
}
8080
},
8181
"xunit.runner.visualstudio": {
8282
"type": "Direct",
83-
"requested": "[2.5.0, )",
84-
"resolved": "2.5.0",
85-
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
83+
"requested": "[2.5.6, )",
84+
"resolved": "2.5.6",
85+
"contentHash": "CW6uhMXNaQQNMSG1IWhHkBT+V5eqHqn7MP0zfNMhU9wS/sgKX7FGL3rzoaUgt26wkY3bpf7pDVw3IjXhwfiP4w=="
8686
},
8787
"Azure.Core": {
8888
"type": "Transitive",
@@ -1461,42 +1461,39 @@
14611461
},
14621462
"xunit.analyzers": {
14631463
"type": "Transitive",
1464-
"resolved": "1.2.0",
1465-
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
1464+
"resolved": "1.9.0",
1465+
"contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw=="
14661466
},
14671467
"xunit.assert": {
14681468
"type": "Transitive",
1469-
"resolved": "2.5.0",
1470-
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
1471-
"dependencies": {
1472-
"NETStandard.Library": "1.6.1"
1473-
}
1469+
"resolved": "2.6.5",
1470+
"contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA=="
14741471
},
14751472
"xunit.core": {
14761473
"type": "Transitive",
1477-
"resolved": "2.5.0",
1478-
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
1474+
"resolved": "2.6.5",
1475+
"contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==",
14791476
"dependencies": {
1480-
"xunit.extensibility.core": "[2.5.0]",
1481-
"xunit.extensibility.execution": "[2.5.0]"
1477+
"xunit.extensibility.core": "[2.6.5]",
1478+
"xunit.extensibility.execution": "[2.6.5]"
14821479
}
14831480
},
14841481
"xunit.extensibility.core": {
14851482
"type": "Transitive",
1486-
"resolved": "2.5.0",
1487-
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
1483+
"resolved": "2.6.5",
1484+
"contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==",
14881485
"dependencies": {
14891486
"NETStandard.Library": "1.6.1",
14901487
"xunit.abstractions": "2.0.3"
14911488
}
14921489
},
14931490
"xunit.extensibility.execution": {
14941491
"type": "Transitive",
1495-
"resolved": "2.5.0",
1496-
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
1492+
"resolved": "2.6.5",
1493+
"contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==",
14971494
"dependencies": {
14981495
"NETStandard.Library": "1.6.1",
1499-
"xunit.extensibility.core": "[2.5.0]"
1496+
"xunit.extensibility.core": "[2.6.5]"
15001497
}
15011498
},
15021499
"microsoft.azure.functions.worker.extensions.sql": {

‎test/.editorconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
[*.cs]
44

5+
# xUnit1031: Do not use blocking task operations in test method
6+
# Temporary - will be fixed and set back to error
7+
dotnet_diagnostic.xUnit1031.severity = none
8+
59
# Disabled
610
dotnet_diagnostic.CA1309.severity = silent # Use ordinal StringComparison - this isn't important for tests and just adds clutter
711
dotnet_diagnostic.CA1305.severity = silent # Specify IFormatProvider - this isn't important for tests and just adds clutter
812
dotnet_diagnostic.CA1707.severity = silent # Identifiers should not contain underscores - this helps make test names more readable
913
dotnet_diagnostic.CA2201.severity = silent # Do not raise reserved exception types - tests can throw whatever they want
1014
dotnet_diagnostic.CS0659.severity = silent # overrides Object.Equals but does not override Object.GetHashCode() - not necessary for our tests
1115
dotnet_diagnostic.CA1711.severity = silent # Identifiers should not have incorrect suffix - Fine for tests
12-
dotnet_diagnostic.CA1825.severity = silent # Avoid zero-length array allocations
16+
dotnet_diagnostic.CA1825.severity = silent # Avoid zero-length array allocations

‎test/packages.lock.json‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,20 @@
8585
},
8686
"xunit": {
8787
"type": "Direct",
88-
"requested": "[2.5.0, )",
89-
"resolved": "2.5.0",
90-
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
88+
"requested": "[2.6.5, )",
89+
"resolved": "2.6.5",
90+
"contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==",
9191
"dependencies": {
92-
"xunit.analyzers": "1.2.0",
93-
"xunit.assert": "2.5.0",
94-
"xunit.core": "[2.5.0]"
92+
"xunit.analyzers": "1.9.0",
93+
"xunit.assert": "2.6.5",
94+
"xunit.core": "[2.6.5]"
9595
}
9696
},
9797
"xunit.runner.visualstudio": {
9898
"type": "Direct",
99-
"requested": "[2.5.0, )",
100-
"resolved": "2.5.0",
101-
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
99+
"requested": "[2.5.6, )",
100+
"resolved": "2.5.6",
101+
"contentHash": "CW6uhMXNaQQNMSG1IWhHkBT+V5eqHqn7MP0zfNMhU9wS/sgKX7FGL3rzoaUgt26wkY3bpf7pDVw3IjXhwfiP4w=="
102102
},
103103
"Azure.Core": {
104104
"type": "Transitive",
@@ -1812,42 +1812,39 @@
18121812
},
18131813
"xunit.analyzers": {
18141814
"type": "Transitive",
1815-
"resolved": "1.2.0",
1816-
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
1815+
"resolved": "1.9.0",
1816+
"contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw=="
18171817
},
18181818
"xunit.assert": {
18191819
"type": "Transitive",
1820-
"resolved": "2.5.0",
1821-
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
1822-
"dependencies": {
1823-
"NETStandard.Library": "1.6.1"
1824-
}
1820+
"resolved": "2.6.5",
1821+
"contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA=="
18251822
},
18261823
"xunit.core": {
18271824
"type": "Transitive",
1828-
"resolved": "2.5.0",
1829-
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
1825+
"resolved": "2.6.5",
1826+
"contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==",
18301827
"dependencies": {
1831-
"xunit.extensibility.core": "[2.5.0]",
1832-
"xunit.extensibility.execution": "[2.5.0]"
1828+
"xunit.extensibility.core": "[2.6.5]",
1829+
"xunit.extensibility.execution": "[2.6.5]"
18331830
}
18341831
},
18351832
"xunit.extensibility.core": {
18361833
"type": "Transitive",
1837-
"resolved": "2.5.0",
1838-
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
1834+
"resolved": "2.6.5",
1835+
"contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==",
18391836
"dependencies": {
18401837
"NETStandard.Library": "1.6.1",
18411838
"xunit.abstractions": "2.0.3"
18421839
}
18431840
},
18441841
"xunit.extensibility.execution": {
18451842
"type": "Transitive",
1846-
"resolved": "2.5.0",
1847-
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
1843+
"resolved": "2.6.5",
1844+
"contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==",
18481845
"dependencies": {
18491846
"NETStandard.Library": "1.6.1",
1850-
"xunit.extensibility.core": "[2.5.0]"
1847+
"xunit.extensibility.core": "[2.6.5]"
18511848
}
18521849
},
18531850
"microsoft.azure.webjobs.extensions.sql": {

0 commit comments

Comments
 (0)