From 4d262d3b85003bf7bedda9584b5547a6bf8659eb Mon Sep 17 00:00:00 2001
From: Romfos <Romfos@tut.by>
Date: Mon, 25 Dec 2023 04:07:49 +0300
Subject: [PATCH] Format NSubstitute.csproj layout + remove unusable code for
 net4.5 (#761)

* Format NSubstitute.csproj layout + remove unusable code

* Remove Microsoft.SourceLink.GitHub

* Code review
---
 .../Extensions/ExceptionExtensions.cs         | 41 ++++--------
 src/NSubstitute/NSubstitute.csproj            | 64 ++++++++-----------
 .../ThrowingAsyncExceptions.cs                | 10 ++-
 3 files changed, 43 insertions(+), 72 deletions(-)

diff --git a/src/NSubstitute/Extensions/ExceptionExtensions.cs b/src/NSubstitute/Extensions/ExceptionExtensions.cs
index 030f67fc..30f4f4ed 100644
--- a/src/NSubstitute/Extensions/ExceptionExtensions.cs
+++ b/src/NSubstitute/Extensions/ExceptionExtensions.cs
@@ -1,8 +1,8 @@
-using System;
+using NSubstitute.Core;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using NSubstitute.Core;
 
 // Disable nullability for client API, so it does not affect clients.
 #nullable disable annotations
@@ -78,7 +78,7 @@ public static ConfiguredCall ThrowsForAnyArgs(this object value, Func<CallInfo,
         /// <param name="ex">Exception to throw</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsync(this Task value, Exception ex) =>
-            value.Returns(_ => TaskFromException(ex));
+            value.Returns(_ => Task.FromException(ex));
 
         /// <summary>
         /// Throw an exception for this call.
@@ -87,7 +87,7 @@ public static ConfiguredCall ThrowsAsync(this Task value, Exception ex) =>
         /// <param name="ex">Exception to throw</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsync<T>(this Task<T> value, Exception ex) =>
-            value.Returns(_ => TaskFromException<T>(ex));
+            value.Returns(_ => Task.FromException<T>(ex));
 
         /// <summary>
         /// Throw an exception of the given type for this call.
@@ -108,7 +108,7 @@ public static ConfiguredCall ThrowsAsync<TException>(this Task value)
         /// <param name="createException">Func creating exception object</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsync(this Task value, Func<CallInfo, Exception> createException) =>
-            value.Returns(ci => TaskFromException(createException(ci)));
+            value.Returns(ci => Task.FromException(createException(ci)));
 
         /// <summary>
         /// Throw an exception for this call, as generated by the specified function.
@@ -117,7 +117,7 @@ public static ConfiguredCall ThrowsAsync(this Task value, Func<CallInfo, Excepti
         /// <param name="createException">Func creating exception object</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsync<T>(this Task<T> value, Func<CallInfo, Exception> createException) =>
-            value.Returns(ci => TaskFromException<T>(createException(ci)));
+            value.Returns(ci => Task.FromException<T>(createException(ci)));
 
         /// <summary>
         /// Throw an exception for this call made with any arguments.
@@ -126,7 +126,7 @@ public static ConfiguredCall ThrowsAsync<T>(this Task<T> value, Func<CallInfo, E
         /// <param name="ex">Exception to throw</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsyncForAnyArgs(this Task value, Exception ex) =>
-            value.ReturnsForAnyArgs(_ => TaskFromException(ex));
+            value.ReturnsForAnyArgs(_ => Task.FromException(ex));
 
         /// <summary>
         /// Throw an exception for this call made with any arguments.
@@ -135,7 +135,7 @@ public static ConfiguredCall ThrowsAsyncForAnyArgs(this Task value, Exception ex
         /// <param name="ex">Exception to throw</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsyncForAnyArgs<T>(this Task<T> value, Exception ex) =>
-            value.ReturnsForAnyArgs(_ => TaskFromException<T>(ex));
+            value.ReturnsForAnyArgs(_ => Task.FromException<T>(ex));
 
         /// <summary>
         /// Throws an exception of the given type for this call made with any arguments.
@@ -156,7 +156,7 @@ public static ConfiguredCall ThrowsAsyncForAnyArgs<TException>(this Task value)
         /// <param name="createException">Func creating exception object</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsyncForAnyArgs(this Task value, Func<CallInfo, Exception> createException) =>
-            value.ReturnsForAnyArgs(ci => TaskFromException(createException(ci)));
+            value.ReturnsForAnyArgs(ci => Task.FromException(createException(ci)));
 
         /// <summary>
         /// Throws an exception for this call made with any arguments, as generated by the specified function.
@@ -165,7 +165,7 @@ public static ConfiguredCall ThrowsAsyncForAnyArgs(this Task value, Func<CallInf
         /// <param name="createException">Func creating exception object</param>
         /// <returns></returns>
         public static ConfiguredCall ThrowsAsyncForAnyArgs<T>(this Task<T> value, Func<CallInfo, Exception> createException) =>
-            value.ReturnsForAnyArgs(ci => TaskFromException<T>(createException(ci)));
+            value.ReturnsForAnyArgs(ci => Task.FromException<T>(createException(ci)));
 
 #if NET5_0_OR_GREATER
         /// <summary>
@@ -242,26 +242,7 @@ private static object FromException(object value, Exception exception)
                 return specificFromExceptionMethod.Invoke(null, new object[] { exception });
             }
 
-            return TaskFromException(exception);
+            return Task.FromException(exception);
         }
-
-        private static Task TaskFromException(Exception ex)
-        {
-#if NET45
-            return new Task(() => throw ex);
-#else
-            return Task.FromException(ex);
-#endif
-        }
-
-        private static Task<T> TaskFromException<T>(Exception ex)
-        {
-#if NET45
-            return new Task<T>(() => throw ex);
-#else
-            return Task<T>.FromException<T>(ex);
-#endif
-        }
-
     }
 }
diff --git a/src/NSubstitute/NSubstitute.csproj b/src/NSubstitute/NSubstitute.csproj
index f6ffa0d3..39749dde 100644
--- a/src/NSubstitute/NSubstitute.csproj
+++ b/src/NSubstitute/NSubstitute.csproj
@@ -1,8 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <AssemblyOriginatorKeyFile>nsubstitute.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <DocumentationFile>..\..\bin\$(Configuration)\NSubstitute\$(TargetFramework)\NSubstitute.xml</DocumentationFile>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Description>NSubstitute is a friendly substitute for .NET mocking libraries. It has a simple, succinct syntax to help developers write clearer tests. NSubstitute is designed for Arrange-Act-Assert (AAA) testing and with Test Driven Development (TDD) in mind.</Description>
-    <Version>3.0.0</Version>
+    <Version>5.0.0</Version>
     <Authors>Anthony Egerton;David Tchepak;Alexandr Nikitin;Oleksandr Povar</Authors>
     <AssemblyName>NSubstitute</AssemblyName>
     <PackageId>NSubstitute</PackageId>
@@ -14,44 +25,15 @@
 		<RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\..\docs\images\nsubstitute-100x100.png" Pack="true" PackagePath="icon.png" Visible="false" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="5.1.1-*" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetIsNet5OrNewer)' != 'true'">
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <AssemblyOriginatorKeyFile>nsubstitute.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DocumentationFile>..\..\bin\$(Configuration)\NSubstitute\$(TargetFramework)\NSubstitute.xml</DocumentationFile>
-    <NoWarn>$(NoWarn);1701;1702;1705;1591</NoWarn>
+  <PropertyGroup Condition="'$(TargetIsNet5OrNewer)' == 'true'">
+    <DefineConstants>$(DefineConstants);SYSTEM_DIAGNOSTICS_CODEANALYSIS_NULLABILITY</DefineConstants>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Nullable Condition="'$(TargetIsNet5OrNewer)' == 'true'">enable</Nullable>
+  <PropertyGroup Condition="'$(TargetIsNet5OrNewer)' != 'true'">
     <!-- Nullability does not work nicely for older versions of .NET, so just disable nullability for those versions. -->
     <!-- CS8632 - The annotation for nullable reference types should only be used in code within a '#nullable' annotations context. -->
-    <NoWarn Condition="'$(TargetIsNet5OrNewer)' != 'true'">$(NoWarn);CS8632</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetIsNet5OrNewer)' == 'true'">
-    <DefineConstants>$(DefineConstants);SYSTEM_DIAGNOSTICS_CODEANALYSIS_NULLABILITY</DefineConstants>
+    <NoWarn>$(NoWarn);CS8632</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(CI)' == 'True'">
@@ -61,7 +43,17 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+
   <ItemGroup>
-     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <None Include="..\..\docs\images\nsubstitute-100x100.png" Pack="true" PackagePath="icon.png" Visible="false" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Castle.Core" Version="5.1.1-*" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetIsNet5OrNewer)' != 'true'">
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" />
   </ItemGroup>
+  
 </Project>
diff --git a/tests/NSubstitute.Acceptance.Specs/ThrowingAsyncExceptions.cs b/tests/NSubstitute.Acceptance.Specs/ThrowingAsyncExceptions.cs
index 12be33c8..792cd3c3 100644
--- a/tests/NSubstitute.Acceptance.Specs/ThrowingAsyncExceptions.cs
+++ b/tests/NSubstitute.Acceptance.Specs/ThrowingAsyncExceptions.cs
@@ -1,10 +1,9 @@
-#if !NET45
+using NSubstitute.Acceptance.Specs.Infrastructure;
+using NSubstitute.ExceptionExtensions;
+using NUnit.Framework;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using NSubstitute.Acceptance.Specs.Infrastructure;
-using NSubstitute.ExceptionExtensions;
-using NUnit.Framework;
 
 namespace NSubstitute.Acceptance.Specs
 {
@@ -338,5 +337,4 @@ public static TException AssertFaultedTaskException<TException>(Func<Task> act)
             return actual.Exception!.InnerExceptions.First() as TException;
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file