Merge branch 'main' into try-xunit.v3

Bertk · Dec 18, 2024 · 968f4b9 · 968f4b9
2 parents b6da7fa + b8b989b
commit 968f4b9
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 53 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.10",
+      "version": "5.4.1",
       "commands": [
         "reportgenerator"
       ]
     },
     "cyclonedx": {
-      "version": "4.0.0",
+      "version": "4.2.0",
       "commands": [
         "dotnet-CycloneDX"
       ]
     },
     "nbgv": {
-      "version": "3.6.143",
+      "version": "3.7.112",
       "commands": [
         "nbgv"
       ]

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,29 +3,29 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" />
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" />
+    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.3.0.106239" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" />
     <GlobalPackageReference Include="System.CommandLine.Generator" Version="2.0.0-beta4.23307.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Google.Protobuf" Version="3.28.2" />
-    <PackageVersion Include="Grpc.AspNetCore" Version="2.66.0" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.66.0" />
-    <PackageVersion Include="Grpc.Tools" Version="2.66.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
+    <PackageVersion Include="Google.Protobuf" Version="3.29.1" />
+    <PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.67.0" />
+    <PackageVersion Include="Grpc.Tools" Version="2.68.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
@@ -35,12 +35,12 @@
     <PackageVersion Include="xunit.v3.runner.console" Version="1.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="System.ServiceModel.Duplex" Version="6.0.0" />

diff --git a/README.md b/README.md
@@ -11,14 +11,14 @@ Arcade-light is inspired from [dotnet/arcade](https://github.com/dotnet/arcade)
 ```json
 {
   "sdk": {
-    "version": "8.0.201",
+    "version": "8.0.403",
     "rollForward": "latestFeature"
   },
   "tools": {
-    "dotnet": "8.0.201"
+    "dotnet": "8.0.403"
   },
   "msbuild-sdks": {
-    "DotNetDev.ArcadeLight.Sdk": "1.7.1"
+    "DotNetDev.ArcadeLight.Sdk": "1.7.5"
   }
 }
 ```
@@ -56,7 +56,7 @@ Arcade-light is inspired from [dotnet/arcade](https://github.com/dotnet/arcade)
   </PropertyGroup>
 
   <ItemGroup>
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
   </ItemGroup>
   ...
 <\Project>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <!-- Libs -->
-    <XUnitVersion>2.4.2</XUnitVersion>
+    <XUnitVersion>2.9.2</XUnitVersion>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,12 +1,12 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.101",
     "rollForward": "latestFeature"
   },
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12"
+    "dotnet": "9.0.101"
   },
   "msbuild-sdks": {
-    "DotNetDev.ArcadeLight.Sdk": "1.8.0-beta.1.g139065984d"
+    "DotNetDev.ArcadeLight.Sdk": "1.7.5"
   }
 }
diff --git a/src/NewTypes/NewTypes/NewTypes.csproj b/src/NewTypes/NewTypes/NewTypes.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <NoWarn>$(NoWarn);CA1515</NoWarn>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 

diff --git a/src/NewTypes/NewTypes/Pets/Cat.cs b/src/NewTypes/NewTypes/Pets/Cat.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Pets
+namespace NewTypes.Pets
 {
     public class Cat : IPet
     {

diff --git a/src/NewTypes/NewTypes/Pets/Dog.cs b/src/NewTypes/NewTypes/Pets/Dog.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Pets
+namespace NewTypes.Pets
 {
     public class Dog : IPet
     {

diff --git a/src/NewTypes/NewTypes/Pets/IPet.cs b/src/NewTypes/NewTypes/Pets/IPet.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Pets
+namespace NewTypes.Pets
 {
     public interface IPet
     {

diff --git a/src/NewTypes/NewTypes/Program.cs b/src/NewTypes/NewTypes/Program.cs
@@ -1,17 +1,20 @@
 using System;
 using System.Collections.Generic;
+using NewTypes.Pets;
 
-namespace Pets
+namespace NewTypes
 {
     public static class Program
     {
         public static void Main(string[] args)
         {
-            List<IPet> pets = new List<IPet>
-            {
+            ArgumentNullException.ThrowIfNull(args);
+
+            List<IPet> pets =
+            [
                 new Dog(),
                 new Cat()
-            };
+            ];
 
             foreach (IPet pet in pets)
             {

diff --git a/src/NewTypes/NewTypesTests/PetTests.cs b/src/NewTypes/NewTypesTests/PetTests.cs
@@ -1,8 +1,7 @@
-using System;
-using Pets;
+using NewTypes.Pets;
 using Xunit;
 
-namespace PetsUnitTest
+namespace NewTypes.Tests
 {
 
     public class PetTests

diff --git a/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs b/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using RazorPagesTestSample.Data;
+using RazorPagesTestSample.Tests.Utilities;
 using Xunit;
 
 namespace RazorPagesTestSample.Tests.UnitTests

diff --git a/src/RazorPages/RazorPagesTestSample.Tests/Utilities/Utilities.cs b/src/RazorPages/RazorPagesTestSample.Tests/Utilities/Utilities.cs
@@ -1,15 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using RazorPagesTestSample.Data;
 
-namespace RazorPagesTestSample.Tests
+namespace RazorPagesTestSample.Tests.Utilities
 {
-    public static class TestUtilities
+    internal static class TestUtilities
     {
         #region snippet1
         public static DbContextOptions<AppDbContext> TestDbContextOptions()

diff --git a/src/RazorPages/RazorPagesTestSample/Program.cs b/src/RazorPages/RazorPagesTestSample/Program.cs
@@ -23,7 +23,7 @@ public static void Main(string[] args)
                 IServiceProvider services = scope.ServiceProvider;
                 AppDbContext db = services.GetRequiredService<AppDbContext>();
 
-                db.Database.EnsureCreated();
+                _ = db.Database.EnsureCreated();
 
                 if (!db.Messages.Any())
                 {
@@ -50,7 +50,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder.UseStartup<Startup>();
+                    _ = webBuilder.UseStartup<Startup>();
                 });
     }
 }
diff --git a/src/RazorPages/RazorPagesTestSample/RazorPagesTestSample.csproj b/src/RazorPages/RazorPagesTestSample/RazorPagesTestSample.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <NoWarn>$(NoWarn);CA1515;IDE0079</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>