Skip to content

Commit 88a9db1

Browse files
MaddyDevMaddyDev
authored
update sdk and xunit (#890)
1 parent 5ab2b06 commit 88a9db1

File tree

6 files changed

+76
-72
lines changed

6 files changed

+76
-72
lines changed

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<PackageVersion Include="System.Runtime.Caching" Version="7.0.0" />
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
1515
<PackageVersion Include="Moq" Version="4.18.4" />
16-
<PackageVersion Include="xunit" Version="2.4.2" />
17-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageVersion Include="xunit" Version="2.5.0" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
1818
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="4.0.1" />
1919
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2020
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.300",
3+
"version": "6.0.411",
44
"rollForward": "latestFeature"
55
}
66
}

‎performance/packages.lock.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,42 +1820,42 @@
18201820
},
18211821
"xunit.analyzers": {
18221822
"type": "Transitive",
1823-
"resolved": "1.0.0",
1824-
"contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ=="
1823+
"resolved": "1.2.0",
1824+
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
18251825
},
18261826
"xunit.assert": {
18271827
"type": "Transitive",
1828-
"resolved": "2.4.2",
1829-
"contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==",
1828+
"resolved": "2.5.0",
1829+
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
18301830
"dependencies": {
18311831
"NETStandard.Library": "1.6.1"
18321832
}
18331833
},
18341834
"xunit.core": {
18351835
"type": "Transitive",
1836-
"resolved": "2.4.2",
1837-
"contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==",
1836+
"resolved": "2.5.0",
1837+
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
18381838
"dependencies": {
1839-
"xunit.extensibility.core": "[2.4.2]",
1840-
"xunit.extensibility.execution": "[2.4.2]"
1839+
"xunit.extensibility.core": "[2.5.0]",
1840+
"xunit.extensibility.execution": "[2.5.0]"
18411841
}
18421842
},
18431843
"xunit.extensibility.core": {
18441844
"type": "Transitive",
1845-
"resolved": "2.4.2",
1846-
"contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==",
1845+
"resolved": "2.5.0",
1846+
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
18471847
"dependencies": {
18481848
"NETStandard.Library": "1.6.1",
18491849
"xunit.abstractions": "2.0.3"
18501850
}
18511851
},
18521852
"xunit.extensibility.execution": {
18531853
"type": "Transitive",
1854-
"resolved": "2.4.2",
1855-
"contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==",
1854+
"resolved": "2.5.0",
1855+
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
18561856
"dependencies": {
18571857
"NETStandard.Library": "1.6.1",
1858-
"xunit.extensibility.core": "[2.4.2]"
1858+
"xunit.extensibility.core": "[2.5.0]"
18591859
}
18601860
},
18611861
"microsoft.azure.webjobs.extensions.sql": {
@@ -1893,8 +1893,8 @@
18931893
"Microsoft.NET.Test.Sdk": "[17.6.3, )",
18941894
"Moq": "[4.18.4, )",
18951895
"Newtonsoft.Json": "[13.0.3, )",
1896-
"xunit": "[2.4.2, )",
1897-
"xunit.runner.visualstudio": "[2.4.5, )"
1896+
"xunit": "[2.5.0, )",
1897+
"xunit.runner.visualstudio": "[2.5.0, )"
18981898
}
18991899
},
19001900
"Microsoft.ApplicationInsights": {
@@ -2092,20 +2092,20 @@
20922092
},
20932093
"xunit": {
20942094
"type": "CentralTransitive",
2095-
"requested": "[2.4.2, )",
2096-
"resolved": "2.4.2",
2097-
"contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==",
2095+
"requested": "[2.5.0, )",
2096+
"resolved": "2.5.0",
2097+
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
20982098
"dependencies": {
2099-
"xunit.analyzers": "1.0.0",
2100-
"xunit.assert": "2.4.2",
2101-
"xunit.core": "[2.4.2]"
2099+
"xunit.analyzers": "1.2.0",
2100+
"xunit.assert": "2.5.0",
2101+
"xunit.core": "[2.5.0]"
21022102
}
21032103
},
21042104
"xunit.runner.visualstudio": {
21052105
"type": "CentralTransitive",
2106-
"requested": "[2.4.5, )",
2107-
"resolved": "2.4.5",
2108-
"contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw=="
2106+
"requested": "[2.5.0, )",
2107+
"resolved": "2.5.0",
2108+
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
21092109
}
21102110
}
21112111
}

‎test-outofproc/packages.lock.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
},
7070
"xunit": {
7171
"type": "Direct",
72-
"requested": "[2.4.2, )",
73-
"resolved": "2.4.2",
74-
"contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==",
72+
"requested": "[2.5.0, )",
73+
"resolved": "2.5.0",
74+
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
7575
"dependencies": {
76-
"xunit.analyzers": "1.0.0",
77-
"xunit.assert": "2.4.2",
78-
"xunit.core": "[2.4.2]"
76+
"xunit.analyzers": "1.2.0",
77+
"xunit.assert": "2.5.0",
78+
"xunit.core": "[2.5.0]"
7979
}
8080
},
8181
"xunit.runner.visualstudio": {
8282
"type": "Direct",
83-
"requested": "[2.4.5, )",
84-
"resolved": "2.4.5",
85-
"contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw=="
83+
"requested": "[2.5.0, )",
84+
"resolved": "2.5.0",
85+
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
8686
},
8787
"Azure.Core": {
8888
"type": "Transitive",
@@ -1605,42 +1605,42 @@
16051605
},
16061606
"xunit.analyzers": {
16071607
"type": "Transitive",
1608-
"resolved": "1.0.0",
1609-
"contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ=="
1608+
"resolved": "1.2.0",
1609+
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
16101610
},
16111611
"xunit.assert": {
16121612
"type": "Transitive",
1613-
"resolved": "2.4.2",
1614-
"contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==",
1613+
"resolved": "2.5.0",
1614+
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
16151615
"dependencies": {
16161616
"NETStandard.Library": "1.6.1"
16171617
}
16181618
},
16191619
"xunit.core": {
16201620
"type": "Transitive",
1621-
"resolved": "2.4.2",
1622-
"contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==",
1621+
"resolved": "2.5.0",
1622+
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
16231623
"dependencies": {
1624-
"xunit.extensibility.core": "[2.4.2]",
1625-
"xunit.extensibility.execution": "[2.4.2]"
1624+
"xunit.extensibility.core": "[2.5.0]",
1625+
"xunit.extensibility.execution": "[2.5.0]"
16261626
}
16271627
},
16281628
"xunit.extensibility.core": {
16291629
"type": "Transitive",
1630-
"resolved": "2.4.2",
1631-
"contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==",
1630+
"resolved": "2.5.0",
1631+
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
16321632
"dependencies": {
16331633
"NETStandard.Library": "1.6.1",
16341634
"xunit.abstractions": "2.0.3"
16351635
}
16361636
},
16371637
"xunit.extensibility.execution": {
16381638
"type": "Transitive",
1639-
"resolved": "2.4.2",
1640-
"contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==",
1639+
"resolved": "2.5.0",
1640+
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
16411641
"dependencies": {
16421642
"NETStandard.Library": "1.6.1",
1643-
"xunit.extensibility.core": "[2.4.2]"
1643+
"xunit.extensibility.core": "[2.5.0]"
16441644
}
16451645
},
16461646
"microsoft.azure.functions.worker.extensions.sql": {

‎test/Common/SupportedLanguagesTestAttribute.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ public SqlInlineDataAttribute(params object[] args)
4646
public override IEnumerable<object[]> GetData(MethodInfo testMethod)
4747
{
4848
if (testMethod == null) { throw new ArgumentNullException(nameof(testMethod)); }
49-
if (this.testData.Count == 0) { throw new EmptyException(nameof(testMethod)); }
49+
if (this.testData.Count == 0)
50+
{
51+
throw new Exception("Collection was empty" + Environment.NewLine +
52+
"Collection: " + nameof(testMethod));
53+
}
5054

5155
UnsupportedLanguagesAttribute unsupportedLangAttr = testMethod.GetCustomAttribute<UnsupportedLanguagesAttribute>();
5256
if (unsupportedLangAttr != null)

‎test/packages.lock.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@
7575
},
7676
"xunit": {
7777
"type": "Direct",
78-
"requested": "[2.4.2, )",
79-
"resolved": "2.4.2",
80-
"contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==",
78+
"requested": "[2.5.0, )",
79+
"resolved": "2.5.0",
80+
"contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==",
8181
"dependencies": {
82-
"xunit.analyzers": "1.0.0",
83-
"xunit.assert": "2.4.2",
84-
"xunit.core": "[2.4.2]"
82+
"xunit.analyzers": "1.2.0",
83+
"xunit.assert": "2.5.0",
84+
"xunit.core": "[2.5.0]"
8585
}
8686
},
8787
"xunit.runner.visualstudio": {
8888
"type": "Direct",
89-
"requested": "[2.4.5, )",
90-
"resolved": "2.4.5",
91-
"contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw=="
89+
"requested": "[2.5.0, )",
90+
"resolved": "2.5.0",
91+
"contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw=="
9292
},
9393
"Azure.Core": {
9494
"type": "Transitive",
@@ -1800,42 +1800,42 @@
18001800
},
18011801
"xunit.analyzers": {
18021802
"type": "Transitive",
1803-
"resolved": "1.0.0",
1804-
"contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ=="
1803+
"resolved": "1.2.0",
1804+
"contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw=="
18051805
},
18061806
"xunit.assert": {
18071807
"type": "Transitive",
1808-
"resolved": "2.4.2",
1809-
"contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==",
1808+
"resolved": "2.5.0",
1809+
"contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==",
18101810
"dependencies": {
18111811
"NETStandard.Library": "1.6.1"
18121812
}
18131813
},
18141814
"xunit.core": {
18151815
"type": "Transitive",
1816-
"resolved": "2.4.2",
1817-
"contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==",
1816+
"resolved": "2.5.0",
1817+
"contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==",
18181818
"dependencies": {
1819-
"xunit.extensibility.core": "[2.4.2]",
1820-
"xunit.extensibility.execution": "[2.4.2]"
1819+
"xunit.extensibility.core": "[2.5.0]",
1820+
"xunit.extensibility.execution": "[2.5.0]"
18211821
}
18221822
},
18231823
"xunit.extensibility.core": {
18241824
"type": "Transitive",
1825-
"resolved": "2.4.2",
1826-
"contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==",
1825+
"resolved": "2.5.0",
1826+
"contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==",
18271827
"dependencies": {
18281828
"NETStandard.Library": "1.6.1",
18291829
"xunit.abstractions": "2.0.3"
18301830
}
18311831
},
18321832
"xunit.extensibility.execution": {
18331833
"type": "Transitive",
1834-
"resolved": "2.4.2",
1835-
"contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==",
1834+
"resolved": "2.5.0",
1835+
"contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==",
18361836
"dependencies": {
18371837
"NETStandard.Library": "1.6.1",
1838-
"xunit.extensibility.core": "[2.4.2]"
1838+
"xunit.extensibility.core": "[2.5.0]"
18391839
}
18401840
},
18411841
"microsoft.azure.webjobs.extensions.sql": {

0 commit comments

Comments
 (0)