Merge pull request #1522 from bUnit-dev/release/v1.31

egil · web-flow · commit 77cfacff0486 · 2024-08-16T14:50:56.000Z
Release of new minor version v1.31
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,7 @@ jobs:
             9.0.x
 
       - name: 🛠️ Update changelog
-        uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
+        uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
         with:
           version: ${{ env.NBGV_SemVer2 }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+### Fixed
+
+- `UploadFile` should only throw an exception when the file size exceeds the maximum allowed size. Reported by [@candritzky](https://github.com/candritzky). Fixed by [@linkdotnet](https://github.com/linkdotnet).
+
 ## [1.30.3] - 2024-07-21
 
 ### Fixed
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -52,7 +52,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Label="Code Analyzers">
 		<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.29.0.95321" PrivateAssets="All" />
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup Label="Implicit usings"
diff --git a/benchmark/bunit.benchmarks/bunit.benchmarks.csproj b/benchmark/bunit.benchmarks/bunit.benchmarks.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -63,7 +63,7 @@ See the full changelog at https://github.com/bUnit-dev/bUnit/releases
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="All" />
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" PrivateAssets="All" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/bunit.generators/bunit.generators.csproj b/src/bunit.generators/bunit.generators.csproj
@@ -80,6 +80,6 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="All" />
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" PrivateAssets="All" />
 	</ItemGroup>
 </Project>
diff --git a/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs b/src/bunit.web/Extensions/InputFile/InputFileExtensions.cs
@@ -38,9 +38,9 @@ public static void UploadFiles(
 			uploadTask.GetAwaiter().GetResult();
 		}
 
-		if (uploadTask.Exception is { InnerException: not null } e)
+		if (uploadTask.Exception?.InnerException is IOException e)
 		{
-			ExceptionDispatchInfo.Capture(e.InnerException).Throw();
+			ExceptionDispatchInfo.Capture(e).Throw();
 		}
 	}
 }
diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
@@ -47,9 +47,15 @@ protected internal override Task<object> HandleAsync(JSRuntimeInvocation invocat
 			if (!invocation.Identifier.Equals(JsFunctionsPrefix + "dispose", StringComparison.Ordinal))
 			{
 				// Assert expectations about the internals of the <Virtualize> component
+#if !NET9_0_OR_GREATER
 				Debug.Assert(invocation.Identifier.Equals(JsFunctionsPrefix + "init", StringComparison.Ordinal), "Received an unexpected invocation identifier from the <Virtualize> component.");
 				Debug.Assert(invocation.Arguments.Count == 3, "Received an unexpected amount of arguments from the <Virtualize> component.");
 				Debug.Assert(invocation.Arguments[0] is not null, "Received an unexpected null argument, expected an DotNetObjectReference<VirtualizeJsInterop> instance.");
+#else
+				Debug.Assert(invocation.Identifier.Equals(JsFunctionsPrefix + "init", StringComparison.Ordinal));
+				Debug.Assert(invocation.Arguments.Count == 3);
+				Debug.Assert(invocation.Arguments[0] is not null);
+#endif
 
 				InvokeOnSpacerBeforeVisible(invocation.Arguments[0]!);
 
diff --git a/src/bunit.web/Rendering/BunitHtmlParser.cs b/src/bunit.web/Rendering/BunitHtmlParser.cs
@@ -105,7 +105,11 @@ private static (IElement? Context, string? MatchedElement) GetParseContextFromTa
 		int startIndex,
 		IDocument document)
 	{
+#if !NET9_0_OR_GREATER
 		Debug.Assert(document.Body is not null, "Body of the document should never be null at this point.");
+#else
+		Debug.Assert(document.Body is not null);
+#endif
 
 		IElement? result = null;
 
diff --git a/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs b/src/bunit.web/TestDoubles/Localization/PlaceholderStringLocalization.cs
@@ -17,7 +17,9 @@ public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
 	/// <summary>
 	/// Will throw exception to prompt the user.
 	/// </summary>
+#pragma warning disable S2325 // "WithCulture" is public API and can't be changed
 	public IStringLocalizer WithCulture(CultureInfo culture)
+#pragma warning restore S2325
 		=> throw new MissingMockStringLocalizationException(nameof(WithCulture), culture);
 
 	/// <summary>
diff --git a/tests/bunit.generators.tests/bunit.generators.tests.csproj b/tests/bunit.generators.tests/bunit.generators.tests.csproj
@@ -15,8 +15,8 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="Verify.SourceGenerators" Version="2.2.0" />
-		<PackageReference Include="Verify.Xunit" Version="25.3.0" />
+		<PackageReference Include="Verify.SourceGenerators" Version="2.3.0" />
+		<PackageReference Include="Verify.Xunit" Version="26.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
diff --git a/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs b/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs
@@ -3,6 +3,7 @@
 
 namespace Xunit;
 
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
 public sealed class RepeatAttribute : DataAttribute
 {
 	public int Count { get; }
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
@@ -14,8 +14,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Serilog" Version="4.0.0" />
-		<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
 		<PackageReference Include="xunit.extensibility.execution" Version="2.9.0" />
 		<PackageReference Include="xunit.abstractions" Version="2.0.3" />		
 		<PackageReference Include="xunit.assert" Version="2.9.0" />
diff --git a/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs b/tests/bunit.web.tests/TestDoubles/NavigationManager/FakeNavigationManagerTest.cs
@@ -356,7 +356,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 			builder.CloseComponent();
 		}
 
-		private void InterceptNavigation(LocationChangingContext context)
+		private static void InterceptNavigation(LocationChangingContext context)
 		{
 			throw new NotSupportedException("Don't intercept");
 		}
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.30",
+  "version": "1.31",
   "assemblyVersion": {
     "precision": "revision"
   },

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ public static void UploadFiles(`
`38`	`38`	`uploadTask.GetAwaiter().GetResult();`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (uploadTask.Exception is { InnerException: not null } e)`
	`41`	`+ if (uploadTask.Exception?.InnerException is IOException e)`
`42`	`42`	`{`
`43`		`- ExceptionDispatchInfo.Capture(e.InnerException).Throw();`
	`43`	`+ ExceptionDispatchInfo.Capture(e).Throw();`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`