⬆️ upgrade all the things

fluffynuts · Dec 13, 2023 · d3322b8 · d3322b8
1 parent d9d36f1
commit d3322b8
Show file tree

Hide file tree

Showing 17 changed files with 456 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,6 @@
         "ts-node": "^10.9.1",
         "typescript": "^5.1.6",
         "yafs": "^1.23.0",
-        "zarro": "^1.144.285"
+        "zarro": "^1.166.0"
     }
 }
diff --git a/src/CoreConsumer/CoreConsumer.csproj b/src/CoreConsumer/CoreConsumer.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="microsoft.net.test.sdk" Version="17.7.2" />
-    <PackageReference Include="NExpect" Version="2.0.49" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="microsoft.net.test.sdk" Version="17.8.0" />
+    <PackageReference Include="NExpect" Version="2.0.57" />
+    <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="nunit3testadapter" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/src/CoreTests/CoreTests.csproj b/src/CoreTests/CoreTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="microsoft.net.test.sdk" Version="17.7.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="microsoft.net.test.sdk" Version="17.8.0" />
+    <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="nunit3testadapter" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj b/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj
@@ -12,12 +12,12 @@
 
   <ItemGroup>
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.180" />
-    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.180" />
-    <PackageReference Include="Quackers.TestLogger" Version="1.0.19" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.244" />
+    <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs b/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs
@@ -238,10 +238,10 @@ Func<TAttribute, bool> matcher
                             .Where(o => o.Name == Member)
                             .ToArray();
 
-                        return method.Length switch
+                        return method switch
                         {
-                            0 => CreateMissingMethodResult(controllerType),
-                            1 => VerifyAttribute<TAttribute>(controllerType, method[0], matcher),
+                            [] => CreateMissingMethodResult(controllerType),
+                            [var m] => VerifyAttribute<TAttribute>(controllerType, m, matcher),
                             _ => CreateAmbiguousMethodResult(controllerType, method.Length)
                         };
                     }

diff --git a/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj b/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj
@@ -68,8 +68,8 @@
     <Compile Include="..\PeanutButter\source\Utils\PeanutButter.Utils\UnevenZipException.cs" Link="Imported\UnevenZipException.cs"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.180"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.244"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NExpect\NExpect.csproj"/>

diff --git a/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj b/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.180" />
-    <PackageReference Include="Quackers.TestLogger" Version="1.0.19" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+    <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj b/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj
@@ -65,8 +65,8 @@
     <Compile Include="..\PeanutButter\source\Utils\PeanutButter.Utils\UnevenZipException.cs" Link="Imported\UnevenZipException.cs"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NExpect\NExpect.csproj"/>

diff --git a/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj b/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj
@@ -9,12 +9,12 @@
 
     <ItemGroup>
         <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="nunit" Version="3.13.3" />
+        <PackageReference Include="nunit" Version="4.0.1" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-        <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.180" />
-        <PackageReference Include="PeanutButter.Utils" Version="3.0.180" />
-        <PackageReference Include="Quackers.TestLogger" Version="1.0.19" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+        <PackageReference Include="PeanutButter.Utils" Version="3.0.244" />
+        <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj b/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj
@@ -46,7 +46,7 @@
     <None Include="README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NExpect\NExpect.csproj"/>

diff --git a/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj b/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj
@@ -8,11 +8,11 @@
 </PropertyGroup>
 
 <ItemGroup>
-  <PackageReference Include="nunit" Version="3.13.3" />
+  <PackageReference Include="nunit" Version="4.0.1" />
   <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-  <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.180" />
-  <PackageReference Include="Quackers.TestLogger" Version="1.0.19" />
+  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+  <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+  <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
 </ItemGroup>
 
 <ItemGroup>

diff --git a/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj b/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj
@@ -39,7 +39,7 @@
     <DefineConstants>BUILD_PEANUTBUTTER_INTERNAL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NExpect\NExpect.csproj"/>

diff --git a/src/NExpect.Tests/ArbitraryBehaviorTests.cs b/src/NExpect.Tests/ArbitraryBehaviorTests.cs
@@ -867,26 +867,26 @@ public void ExceptionCollectionPropertyMatchingLikeOtherCollections()
                         Expect(() => throw ex)
                             .To.Throw<AggregateException>()
                             .With.CollectionProperty(e => e.InnerExceptions)
-                            .Containing.Exactly(1)
+                            .Not.Containing.Exactly(1)
                             .Matched.By(e => e.Message == "1");
-                        Expect(() => throw ex)
-                            .To.Throw<AggregateException>()
-                            .With.CollectionProperty(e => e.InnerExceptions)
-                            .Not.Containing.Any
-                            .Matched.By(e => e.Message == "3");
                     },
-                    Throws.Nothing
+                    Throws.Exception.InstanceOf<UnmetExpectationException>()
                 );
                 Assert.That(
                     () =>
                     {
                         Expect(() => throw ex)
                             .To.Throw<AggregateException>()
                             .With.CollectionProperty(e => e.InnerExceptions)
-                            .Not.Containing.Exactly(1)
+                            .Containing.Exactly(1)
                             .Matched.By(e => e.Message == "1");
+                        Expect(() => throw ex)
+                            .To.Throw<AggregateException>()
+                            .With.CollectionProperty(e => e.InnerExceptions)
+                            .Not.Containing.Any
+                            .Matched.By(e => e.Message == "3");
                     },
-                    Throws.Exception.InstanceOf<UnmetExpectationException>()
+                    Throws.Nothing
                 );
                 Assert.That(
                     () =>

diff --git a/src/NExpect.Tests/NExpect.Tests.csproj b/src/NExpect.Tests/NExpect.Tests.csproj
@@ -5,13 +5,13 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="microsoft.net.test.sdk" Version="17.7.2" />
+    <PackageReference Include="microsoft.net.test.sdk" Version="17.8.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="nunit3testadapter" Version="4.5.0" />
-    <PackageReference Include="PeanutButter.DuckTyping" Version="3.0.180" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.180" />
-    <PackageReference Include="Quackers.TestLogger" Version="1.0.19" />
+    <PackageReference Include="PeanutButter.DuckTyping" Version="3.0.244" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+    <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
     <PackageReference Include="system.valuetuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NExpect/NExpect.csproj b/src/NExpect/NExpect.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>BUILD_PEANUTBUTTER_INTERNAL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\"/>

diff --git a/src/PeanutButter b/src/PeanutButter