Fix warnings

nsubstitute · Nov 19, 2023 · b193fde · b193fde
1 parent 74b5de9
commit b193fde
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 39 deletions.
diff --git a/NSubstitute.sln b/NSubstitute.sln
@@ -1,7 +1,6 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSubstitute", "src\NSubstitute\NSubstitute.csproj", "{F59BF5FC-52D8-492E-BDE8-244C183B4C92}"
 EndProject
@@ -10,13 +9,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0E2B9095-7548-462F-9BCC-CD6765B3ED60}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A8AF7D01-6CE4-47B2-9E23-689A53991C3D}"
-	ProjectSection(SolutionItems) = preProject
-		build\build.fsx = build\build.fsx
-		build\build.sh = build\build.sh
-		build\ExtractDocs.fsx = build\ExtractDocs.fsx
-		build\packages.config = build\packages.config
-		build\build.cmd = build\build.cmd
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CA2DD4AA-8DCD-42FB-8081-243281AD2956}"
 	ProjectSection(SolutionItems) = preProject
@@ -31,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSubstitute.Acceptance.Spec
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSubstitute.Benchmarks", "tests\NSubstitute.Benchmarks\NSubstitute.Benchmarks.csproj", "{D2D162D4-EF1D-4B40-8736-9228C2FEA16C}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{E9A24A49-9E13-47CA-8886-044BB55FA05C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,6 +43,10 @@ Global
 		{D2D162D4-EF1D-4B40-8736-9228C2FEA16C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2D162D4-EF1D-4B40-8736-9228C2FEA16C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2D162D4-EF1D-4B40-8736-9228C2FEA16C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9A24A49-9E13-47CA-8886-044BB55FA05C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9A24A49-9E13-47CA-8886-044BB55FA05C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9A24A49-9E13-47CA-8886-044BB55FA05C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9A24A49-9E13-47CA-8886-044BB55FA05C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -57,6 +55,7 @@ Global
 		{F59BF5FC-52D8-492E-BDE8-244C183B4C92} = {CFB6BF4B-381D-4884-A8E8-D1FA71315BDE}
 		{8C2300AA-F94C-4005-A359-257C5EAD338E} = {0E2B9095-7548-462F-9BCC-CD6765B3ED60}
 		{D2D162D4-EF1D-4B40-8736-9228C2FEA16C} = {0E2B9095-7548-462F-9BCC-CD6765B3ED60}
+		{E9A24A49-9E13-47CA-8886-044BB55FA05C} = {A8AF7D01-6CE4-47B2-9E23-689A53991C3D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {230E97F1-5246-4D49-8ED9-065F2B154E93}

diff --git a/build/build.fsproj b/build/build.fsproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputPath>buildOutput</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="build.cmd" />
+    <None Include="build.sh" />
     <Compile Include="ExtractDocs.fs" />
     <Compile Include="build.fs" />
   </ItemGroup>
@@ -15,10 +17,10 @@
     <PackageReference Include="Microsoft.Build" Version="17.3.2" />
     <PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.3.2" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.844" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.815" />
     <PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
     <PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
     <PackageReference Include="Fake.Core.Target" Version="6.0.0" />
   </ItemGroup>
+
 </Project>
diff --git a/tests/NSubstitute.Benchmarks/ActivationBenchmark.cs b/tests/NSubstitute.Benchmarks/ActivationBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class ActivationBenchmark
     {

diff --git a/tests/NSubstitute.Benchmarks/ArgumentSpecificationUsageBenchmark.cs b/tests/NSubstitute.Benchmarks/ArgumentSpecificationUsageBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class ArgumentSpecificationUsageBenchmark
     {

diff --git a/tests/NSubstitute.Benchmarks/DispatchConfiguredMatchingCallBenchmark.cs b/tests/NSubstitute.Benchmarks/DispatchConfiguredMatchingCallBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class DispatchConfiguredMatchingCallBenchmark
     {
@@ -17,26 +17,26 @@ public DispatchConfiguredMatchingCallBenchmark()
         {
             _interfaceProxy = Substitute.For<IInterfaceWithSingleMethod>();
             _interfaceProxy.IntMethod("42").Returns(42);
-            _interfaceProxy.When(x => x.VoidMethod("42")).Do(delegate {  });
-            
+            _interfaceProxy.When(x => x.VoidMethod("42")).Do(delegate { });
+
             _abstractClassProxy = Substitute.For<AbstractClassWithSingleMethod>();
             _abstractClassProxy.IntMethod("42").Returns(42);
-            _abstractClassProxy.When(x => x.VoidMethod("42")).Do(delegate {  });
-            
+            _abstractClassProxy.When(x => x.VoidMethod("42")).Do(delegate { });
+
             _classPartialProxy = Substitute.For<ClassWithSingleMethod>();
             _classPartialProxy.IntMethod("42").Returns(42);
-            _classPartialProxy.When(x => x.VoidMethod("42")).Do(delegate {  });
-            
+            _classPartialProxy.When(x => x.VoidMethod("42")).Do(delegate { });
+
             _intDelegateProxy = Substitute.For<IntDelegate>();
             _intDelegateProxy.Invoke("42").Returns(42);
-            
+
             _voidDelegateProxy = Substitute.For<VoidDelegate>();
-            _voidDelegateProxy.When(x => x.Invoke("42")).Do(delegate {  });
+            _voidDelegateProxy.When(x => x.Invoke("42")).Do(delegate { });
         }
 
         [Benchmark]
         public int DispatchInterfaceProxyCall_Int() => _interfaceProxy.IntMethod("42");
-        
+
         [Benchmark]
         public int DispatchAbstractClassProxyCall_Int() => _abstractClassProxy.IntMethod("42");
 
@@ -48,7 +48,7 @@ public DispatchConfiguredMatchingCallBenchmark()
 
         [Benchmark]
         public void DispatchInterfaceProxyCall_Void() => _interfaceProxy.VoidMethod("42");
-        
+
         [Benchmark]
         public void DispatchAbstractClassProxyCall_Void() => _abstractClassProxy.VoidMethod("42");
 

diff --git a/tests/NSubstitute.Benchmarks/DispatchConfiguredNonMatchingCallBenchmark.cs b/tests/NSubstitute.Benchmarks/DispatchConfiguredNonMatchingCallBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class DispatchConfiguredNonMatchingCallBenchmark
     {

diff --git a/tests/NSubstitute.Benchmarks/DispatchNonConfiguredCallBenchmark.cs b/tests/NSubstitute.Benchmarks/DispatchNonConfiguredCallBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class DispatchNonConfiguredCallBenchmark
     {
@@ -24,7 +24,7 @@ public DispatchNonConfiguredCallBenchmark()
 
         [Benchmark]
         public int DispatchInterfaceProxyCall_Int() => _interfaceProxy.IntMethod(null);
-        
+
         [Benchmark]
         public int DispatchAbstractClassProxyCall_Int() => _abstractClassProxy.IntMethod(null);
 
@@ -36,7 +36,7 @@ public DispatchNonConfiguredCallBenchmark()
 
         [Benchmark]
         public void DispatchInterfaceProxyCall_Void() => _interfaceProxy.VoidMethod(null);
-        
+
         [Benchmark]
         public void DispatchAbstractClassProxyCall_Void() => _abstractClassProxy.VoidMethod(null);
 

diff --git a/tests/NSubstitute.Benchmarks/NSubstitute.Benchmarks.csproj b/tests/NSubstitute.Benchmarks/NSubstitute.Benchmarks.csproj
@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <StartupObject>NSubstitute.Benchmarks.Program</StartupObject>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="BenchmarkDotNet.Artifacts\**" />
-    <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
-    <None Remove="BenchmarkDotNet.Artifacts\**" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
     <ProjectReference Include="..\..\src\NSubstitute\NSubstitute.csproj" />
   </ItemGroup>
+
 </Project>
diff --git a/tests/NSubstitute.Benchmarks/ToStringCallBenchmark.cs b/tests/NSubstitute.Benchmarks/ToStringCallBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class ToStringCallBenchmark
     {

diff --git a/tests/NSubstitute.Benchmarks/VerifyReceivedCallBenchmark.cs b/tests/NSubstitute.Benchmarks/VerifyReceivedCallBenchmark.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Benchmarks
 {
-    [ClrJob, CoreJob]
+    [SimpleJob]
     [MemoryDiagnoser]
     public class VerifyReceivedCallBenchmark
     {