From 19bab2b4671080bff70c925d23f7e468cdcebe75 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 15:48:53 -0400 Subject: [PATCH 01/17] Drop support for FakeItEasy < 3.4.2 --- SelfInitializingFakes.sln | 9 +-------- .../SelfInitializingFakes.csproj | 11 +++++------ tests/Acceptance/BinarySerialization.cs | 4 ---- tests/Acceptance/XmlSerialization.cs | 4 ---- .../SelfInitializingFakes.Tests.FIE.3.0.0.csproj | 14 -------------- 5 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 tests/SelfInitializingFakes.Tests.FIE.3.0.0/SelfInitializingFakes.Tests.FIE.3.0.0.csproj diff --git a/SelfInitializingFakes.sln b/SelfInitializingFakes.sln index c1253ce..74a3b9b 100644 --- a/SelfInitializingFakes.sln +++ b/SelfInitializingFakes.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 @@ -28,8 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{71C0B811 tests\SelfInitializingFakes.Tests.ruleset = tests\SelfInitializingFakes.Tests.ruleset EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.3.0.0", "tests\SelfInitializingFakes.Tests.FIE.3.0.0\SelfInitializingFakes.Tests.FIE.3.0.0.csproj", "{8DFB8024-894F-46B3-B62D-B6E21F0B8945}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.Latest", "tests\SelfInitializingFakes.Tests.FIE.Latest\SelfInitializingFakes.Tests.FIE.Latest.csproj", "{ED447D19-E841-46AE-BBDE-56326FF6F4AB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.3.4.2", "tests\SelfInitializingFakes.Tests.FIE.3.4.2\SelfInitializingFakes.Tests.FIE.3.4.2.csproj", "{7F7EC34C-AA06-460B-B0B7-EF429DD99E21}" @@ -48,10 +46,6 @@ Global {08462E29-25C0-4A1F-9275-23B7898E95F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {08462E29-25C0-4A1F-9275-23B7898E95F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {08462E29-25C0-4A1F-9275-23B7898E95F0}.Release|Any CPU.Build.0 = Release|Any CPU - {8DFB8024-894F-46B3-B62D-B6E21F0B8945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DFB8024-894F-46B3-B62D-B6E21F0B8945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DFB8024-894F-46B3-B62D-B6E21F0B8945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DFB8024-894F-46B3-B62D-B6E21F0B8945}.Release|Any CPU.Build.0 = Release|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,7 +68,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {08462E29-25C0-4A1F-9275-23B7898E95F0} = {E5449372-918E-45FB-BD55-7A1BCC98FF1C} - {8DFB8024-894F-46B3-B62D-B6E21F0B8945} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {ED447D19-E841-46AE-BBDE-56326FF6F4AB} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {7F7EC34C-AA06-460B-B0B7-EF429DD99E21} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {FB3705B3-8BD8-4293-9266-6DE11FDACB2B} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index 998ab35..6760201 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -28,19 +28,18 @@ + + + + - + - - - - - $(DefineConstants);FEATURE_BINARY_SERIALIZATION diff --git a/tests/Acceptance/BinarySerialization.cs b/tests/Acceptance/BinarySerialization.cs index bd33a93..f415c2c 100644 --- a/tests/Acceptance/BinarySerialization.cs +++ b/tests/Acceptance/BinarySerialization.cs @@ -75,11 +75,7 @@ public static void SerializeVoidCall( .x(() => { int i; -#if BUG_ASSIGNING_REF_VALUE_CLEARS_INCOMING_VALUE - DateTime dt = new DateTime(2017, 1, 24); -#else DateTime dt = DateTime.MinValue; -#endif A.CallTo(() => realServiceWhileRecording.VoidMethod(A._, out i, ref dt)) .MustHaveHappened(); A.CallTo(() => realServiceWhileRecording.NonVoidMethod()).MustHaveHappened(); diff --git a/tests/Acceptance/XmlSerialization.cs b/tests/Acceptance/XmlSerialization.cs index 68f82f2..aa030e6 100644 --- a/tests/Acceptance/XmlSerialization.cs +++ b/tests/Acceptance/XmlSerialization.cs @@ -71,11 +71,7 @@ public static void SerializeVoidCall( .x(() => { int i; -#if BUG_ASSIGNING_REF_VALUE_CLEARS_INCOMING_VALUE - DateTime dt = new DateTime(2017, 1, 24); -#else DateTime dt = DateTime.MinValue; -#endif A.CallTo(() => realServiceWhileRecording.VoidMethod(A._, out i, ref dt)) .MustHaveHappened(); A.CallTo(() => realServiceWhileRecording.NonVoidMethod()).MustHaveHappened(); diff --git a/tests/SelfInitializingFakes.Tests.FIE.3.0.0/SelfInitializingFakes.Tests.FIE.3.0.0.csproj b/tests/SelfInitializingFakes.Tests.FIE.3.0.0/SelfInitializingFakes.Tests.FIE.3.0.0.csproj deleted file mode 100644 index 81cbaf5..0000000 --- a/tests/SelfInitializingFakes.Tests.FIE.3.0.0/SelfInitializingFakes.Tests.FIE.3.0.0.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net452;netcoreapp1.0 - SelfInitializingFakes.Tests.FIE.3.0.0 - SelfInitializingFakes.Tests.FIE.3.0.0 - $(DefineConstants);BUG_ASSIGNING_REF_VALUE_CLEARS_INCOMING_VALUE - - - - - - - From 3afb8520285656958a82781b82a3fa65ae8b9038 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 15:57:29 -0400 Subject: [PATCH 02/17] Drop support for FakeItEasy < 4.9.2 --- SelfInitializingFakes.sln | 7 ------- .../SelfInitializingFakes.csproj | 6 +----- .../Polyfill.cs | 12 ------------ .../SelfInitializingFakes.Tests.FIE.3.4.2.csproj | 13 ------------- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 tests/SelfInitializingFakes.Tests.FIE.3.4.2/Polyfill.cs delete mode 100644 tests/SelfInitializingFakes.Tests.FIE.3.4.2/SelfInitializingFakes.Tests.FIE.3.4.2.csproj diff --git a/SelfInitializingFakes.sln b/SelfInitializingFakes.sln index 74a3b9b..1e85c08 100644 --- a/SelfInitializingFakes.sln +++ b/SelfInitializingFakes.sln @@ -30,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{71C0B811 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.Latest", "tests\SelfInitializingFakes.Tests.FIE.Latest\SelfInitializingFakes.Tests.FIE.Latest.csproj", "{ED447D19-E841-46AE-BBDE-56326FF6F4AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.3.4.2", "tests\SelfInitializingFakes.Tests.FIE.3.4.2\SelfInitializingFakes.Tests.FIE.3.4.2.csproj", "{7F7EC34C-AA06-460B-B0B7-EF429DD99E21}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.4.9.2", "tests\SelfInitializingFakes.Tests.FIE.4.9.2\SelfInitializingFakes.Tests.FIE.4.9.2.csproj", "{FB3705B3-8BD8-4293-9266-6DE11FDACB2B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.5.5.0", "tests\SelfInitializingFakes.Tests.FIE.5.5.0\SelfInitializingFakes.Tests.FIE.5.5.0.csproj", "{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}" @@ -50,10 +48,6 @@ Global {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Release|Any CPU.Build.0 = Release|Any CPU - {7F7EC34C-AA06-460B-B0B7-EF429DD99E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F7EC34C-AA06-460B-B0B7-EF429DD99E21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F7EC34C-AA06-460B-B0B7-EF429DD99E21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F7EC34C-AA06-460B-B0B7-EF429DD99E21}.Release|Any CPU.Build.0 = Release|Any CPU {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -69,7 +63,6 @@ Global GlobalSection(NestedProjects) = preSolution {08462E29-25C0-4A1F-9275-23B7898E95F0} = {E5449372-918E-45FB-BD55-7A1BCC98FF1C} {ED447D19-E841-46AE-BBDE-56326FF6F4AB} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} - {7F7EC34C-AA06-460B-B0B7-EF429DD99E21} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {FB3705B3-8BD8-4293-9266-6DE11FDACB2B} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} EndGlobalSection diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index 6760201..d30abcf 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -32,11 +32,7 @@ - - - - - + diff --git a/tests/SelfInitializingFakes.Tests.FIE.3.4.2/Polyfill.cs b/tests/SelfInitializingFakes.Tests.FIE.3.4.2/Polyfill.cs deleted file mode 100644 index f426386..0000000 --- a/tests/SelfInitializingFakes.Tests.FIE.3.4.2/Polyfill.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace FakeItEasy -{ - using FakeItEasy.Configuration; - - internal static class Polyfill - { - public static UnorderedCallAssertion MustHaveHappenedTwiceExactly(this IAssertConfiguration configuration) - { - return configuration.MustHaveHappened(Repeated.Exactly.Twice); - } - } -} diff --git a/tests/SelfInitializingFakes.Tests.FIE.3.4.2/SelfInitializingFakes.Tests.FIE.3.4.2.csproj b/tests/SelfInitializingFakes.Tests.FIE.3.4.2/SelfInitializingFakes.Tests.FIE.3.4.2.csproj deleted file mode 100644 index 9547782..0000000 --- a/tests/SelfInitializingFakes.Tests.FIE.3.4.2/SelfInitializingFakes.Tests.FIE.3.4.2.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net452;netcoreapp1.0 - SelfInitializingFakes.Tests.FIE.3.4.2 - SelfInitializingFakes.Tests.FIE.3.4.2 - - - - - - - \ No newline at end of file From c5aa45b202516d9928a13b29e2cc6ae0b50c6882 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 16:04:40 -0400 Subject: [PATCH 03/17] Drop support for FakeItEasy < 5.5.0 --- SelfInitializingFakes.sln | 7 ------- .../SelfInitializingFakes.csproj | 2 +- .../SelfInitializingFakes.Tests.FIE.4.9.2.csproj | 12 ------------ 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj diff --git a/SelfInitializingFakes.sln b/SelfInitializingFakes.sln index 1e85c08..136dfb9 100644 --- a/SelfInitializingFakes.sln +++ b/SelfInitializingFakes.sln @@ -30,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{71C0B811 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.Latest", "tests\SelfInitializingFakes.Tests.FIE.Latest\SelfInitializingFakes.Tests.FIE.Latest.csproj", "{ED447D19-E841-46AE-BBDE-56326FF6F4AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.4.9.2", "tests\SelfInitializingFakes.Tests.FIE.4.9.2\SelfInitializingFakes.Tests.FIE.4.9.2.csproj", "{FB3705B3-8BD8-4293-9266-6DE11FDACB2B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.5.5.0", "tests\SelfInitializingFakes.Tests.FIE.5.5.0\SelfInitializingFakes.Tests.FIE.5.5.0.csproj", "{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}" EndProject Global @@ -48,10 +46,6 @@ Global {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {ED447D19-E841-46AE-BBDE-56326FF6F4AB}.Release|Any CPU.Build.0 = Release|Any CPU - {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB3705B3-8BD8-4293-9266-6DE11FDACB2B}.Release|Any CPU.Build.0 = Release|Any CPU {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,7 +57,6 @@ Global GlobalSection(NestedProjects) = preSolution {08462E29-25C0-4A1F-9275-23B7898E95F0} = {E5449372-918E-45FB-BD55-7A1BCC98FF1C} {ED447D19-E841-46AE-BBDE-56326FF6F4AB} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} - {FB3705B3-8BD8-4293-9266-6DE11FDACB2B} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index d30abcf..53e2a42 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -33,7 +33,7 @@ - + diff --git a/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj b/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj deleted file mode 100644 index 2b2b466..0000000 --- a/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - SelfInitializingFakes.Tests.FIE.4.9.2 - SelfInitializingFakes.Tests.FIE.4.9.2 - - - - - - - \ No newline at end of file From 5811b654ccf5cc70c7a06c1b1b26042cb7b978e7 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 16:16:55 -0400 Subject: [PATCH 04/17] Drop netstandard1.6 target --- .../Infrastructure/ExceptionExtensions.cs | 13 ----- .../SelfInitializingFakes.csproj | 10 +--- tests/Acceptance/Helpers/TypeExtensions.cs | 10 +--- tests/Directory.Build.props | 10 +--- .../ApiApproval.cs | 1 - .../netstandard1.6.approved.txt | 51 ------------------- 6 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard1.6.approved.txt diff --git a/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs b/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs index f513985..f466cde 100644 --- a/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs +++ b/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs @@ -1,31 +1,19 @@ namespace SelfInitializingFakes.Infrastructure { using System; -#if FRAMEWORK_EXCEPTION_DISPATCH_INFO - using System.Runtime.ExceptionServices; -#else using System.Reflection; -#endif /// /// Extension methods for exceptions. /// internal static class ExceptionExtensions { -#if !FRAMEWORK_EXCEPTION_DISPATCH_INFO private static readonly Action PreserveStackTrace = CreatePreserveStackTrace(); -#endif /// /// Re-throws an exception, trying to preserve its stack trace. /// /// The exception to rethrow. -#if FRAMEWORK_EXCEPTION_DISPATCH_INFO - public static void Rethrow(this Exception exception) - { - ExceptionDispatchInfo.Capture(exception).Throw(); - } -#else public static void Rethrow(this Exception exception) { try @@ -48,6 +36,5 @@ private static Action CreatePreserveStackTrace() BindingFlags.Instance | BindingFlags.NonPublic); return (Action)Delegate.CreateDelegate(typeof(Action), null, method); } -#endif } } diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index 53e2a42..59b1d33 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -1,7 +1,7 @@  - net40;netstandard1.6;netstandard2.0 + net40;netstandard2.0 true SelfInitializingFakes SelfInitializingFakes @@ -28,10 +28,6 @@ - - - - @@ -40,10 +36,6 @@ $(DefineConstants);FEATURE_BINARY_SERIALIZATION - - $(DefineConstants);NETFX_CORE;FRAMEWORK_EXCEPTION_DISPATCH_INFO;FRAMEWORK_WEAK_TYPE_CLASS - - diff --git a/tests/Acceptance/Helpers/TypeExtensions.cs b/tests/Acceptance/Helpers/TypeExtensions.cs index 2e8f22b..c60131c 100644 --- a/tests/Acceptance/Helpers/TypeExtensions.cs +++ b/tests/Acceptance/Helpers/TypeExtensions.cs @@ -3,9 +3,6 @@ namespace SelfInitializingFakes.Tests.Acceptance.Helper using System; using System.Collections.Generic; using System.Linq; -#if FRAMEWORK_WEAK_TYPE_CLASS - using System.Reflection; -#endif /// /// Provides extension methods for . @@ -18,12 +15,7 @@ internal static class TypeExtensions /// This type argument. /// A list of all concrete subtypes. public static IEnumerable GetConcreteSubTypesInAssembly(this Type @this) => -#if FRAMEWORK_WEAK_TYPE_CLASS - typeof(FileBasedRecordedCallRepository).GetTypeInfo().Assembly.GetTypes() - .Where(t => @this.GetTypeInfo().IsAssignableFrom(t) && !t.GetTypeInfo().IsAbstract); -#else typeof(FileBasedRecordedCallRepository).Assembly.GetTypes() .Where(t => @this.IsAssignableFrom(t) && !t.IsAbstract); -#endif } -} \ No newline at end of file +} diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index ce5c82f..2e605e5 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,7 +3,7 @@ - net452;netcoreapp1.0;netcoreapp2.0 + net452;netcoreapp2.0 true $(MSBuildThisFileDirectory)\SelfInitializingFakes.Tests.ruleset @@ -21,10 +21,6 @@ - - - - @@ -36,10 +32,6 @@ Conventions/%(Filename)%(Extension) - - $(DefineConstants);FRAMEWORK_WEAK_TYPE_CLASS - - diff --git a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs index 446b078..e7ced32 100644 --- a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs +++ b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs @@ -16,7 +16,6 @@ public class ApiApproval private const string ProjectName = "SelfInitializingFakes"; [InlineData("net40")] - [InlineData("netstandard1.6")] [InlineData("netstandard2.0")] [UseReporter(typeof(DiffReporter))] [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard1.6.approved.txt b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard1.6.approved.txt deleted file mode 100644 index 20e4bcd..0000000 --- a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard1.6.approved.txt +++ /dev/null @@ -1,51 +0,0 @@ -[assembly: System.Runtime.InteropServices.ComVisible(false)] -[assembly: System.Runtime.InteropServices.Guid("08462e29-25c0-4a1f-9275-23b7898e95f0")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v1.6", FrameworkDisplayName="")] -namespace SelfInitializingFakes -{ - public abstract class FileBasedRecordedCallRepository : SelfInitializingFakes.IRecordedCallRepository - { - protected FileBasedRecordedCallRepository(params string[] pathComponents) { } - public System.Collections.Generic.IEnumerable? Load() { } - protected abstract System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream); - public void Save(System.Collections.Generic.IEnumerable calls) { } - protected abstract void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream); - } - public interface IRecordedCallRepository - { - System.Collections.Generic.IEnumerable? Load(); - void Save(System.Collections.Generic.IEnumerable calls); - } - public class PlaybackException : System.Exception - { - public PlaybackException() { } - public PlaybackException(string message) { } - public PlaybackException(string message, System.Exception innerException) { } - } - public class RecordedCall - { - public string Method { get; set; } - public object?[] OutAndRefValues { get; set; } - public object? ReturnValue { get; set; } - } - public class RecordingException : System.Exception - { - public RecordingException() { } - public RecordingException(string message) { } - public RecordingException(string message, System.Exception innerException) { } - } - public sealed class SelfInitializingFake : System.IDisposable - where TService : class - { - public TService Object { get; } - public void Dispose() { } - public static SelfInitializingFakes.SelfInitializingFake For(System.Func serviceFactory, SelfInitializingFakes.IRecordedCallRepository repository) - where TConcreteService : TService { } - } - public class XmlFileRecordedCallRepository : SelfInitializingFakes.FileBasedRecordedCallRepository - { - public XmlFileRecordedCallRepository(params string[] pathComponents) { } - protected override System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream) { } - protected override void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream) { } - } -} \ No newline at end of file From e392ce892d6f273cf3c50d678d88046804808e02 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 16:26:32 -0400 Subject: [PATCH 05/17] Swap net40 target for net45 --- src/SelfInitializingFakes/SelfInitializingFakes.csproj | 6 +++--- tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs | 2 +- .../{net40.approved.txt => net45.approved.txt} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/{net40.approved.txt => net45.approved.txt} (96%) diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index 59b1d33..e583435 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -1,7 +1,7 @@  - net40;netstandard2.0 + net45;netstandard2.0 true SelfInitializingFakes SelfInitializingFakes @@ -32,11 +32,11 @@ - + $(DefineConstants);FEATURE_BINARY_SERIALIZATION - + diff --git a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs index e7ced32..1d7dc1d 100644 --- a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs +++ b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs @@ -15,7 +15,7 @@ public class ApiApproval { private const string ProjectName = "SelfInitializingFakes"; - [InlineData("net40")] + [InlineData("net45")] [InlineData("netstandard2.0")] [UseReporter(typeof(DiffReporter))] [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net40.approved.txt b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net45.approved.txt similarity index 96% rename from tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net40.approved.txt rename to tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net45.approved.txt index ea230fa..dd6bcfc 100644 --- a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net40.approved.txt +++ b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net45.approved.txt @@ -1,6 +1,6 @@ [assembly: System.Runtime.InteropServices.ComVisible(false)] [assembly: System.Runtime.InteropServices.Guid("08462e29-25c0-4a1f-9275-23b7898e95f0")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.0", FrameworkDisplayName=".NET Framework 4")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] namespace SelfInitializingFakes { public class BinaryFileRecordedCallRepository : SelfInitializingFakes.FileBasedRecordedCallRepository From 3e8280941f26b2fd00f1fb1140090c9701aef32e Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 16:28:40 -0400 Subject: [PATCH 06/17] Test netstandard2.0 on netcoreapp2.1 instead of netcoreapp2.0 --- tests/Directory.Build.props | 2 +- .../netstandard2.1.approved.txt | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard2.1.approved.txt diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 2e605e5..001eb91 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,7 +3,7 @@ - net452;netcoreapp2.0 + net452;netcoreapp2.1 true $(MSBuildThisFileDirectory)\SelfInitializingFakes.Tests.ruleset diff --git a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard2.1.approved.txt b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard2.1.approved.txt new file mode 100644 index 0000000..aae0de6 --- /dev/null +++ b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/netstandard2.1.approved.txt @@ -0,0 +1,51 @@ +[assembly: System.Runtime.InteropServices.ComVisible(false)] +[assembly: System.Runtime.InteropServices.Guid("08462e29-25c0-4a1f-9275-23b7898e95f0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")] +namespace SelfInitializingFakes +{ + public abstract class FileBasedRecordedCallRepository : SelfInitializingFakes.IRecordedCallRepository + { + protected FileBasedRecordedCallRepository(params string[] pathComponents) { } + public System.Collections.Generic.IEnumerable? Load() { } + protected abstract System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream); + public void Save(System.Collections.Generic.IEnumerable calls) { } + protected abstract void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream); + } + public interface IRecordedCallRepository + { + System.Collections.Generic.IEnumerable? Load(); + void Save(System.Collections.Generic.IEnumerable calls); + } + public class PlaybackException : System.Exception + { + public PlaybackException() { } + public PlaybackException(string message) { } + public PlaybackException(string message, System.Exception innerException) { } + } + public class RecordedCall + { + public string Method { get; set; } + public object?[] OutAndRefValues { get; set; } + public object? ReturnValue { get; set; } + } + public class RecordingException : System.Exception + { + public RecordingException() { } + public RecordingException(string message) { } + public RecordingException(string message, System.Exception innerException) { } + } + public sealed class SelfInitializingFake : System.IDisposable + where TService : class + { + public TService Object { get; } + public void Dispose() { } + public static SelfInitializingFakes.SelfInitializingFake For(System.Func serviceFactory, SelfInitializingFakes.IRecordedCallRepository repository) + where TConcreteService : TService { } + } + public class XmlFileRecordedCallRepository : SelfInitializingFakes.FileBasedRecordedCallRepository + { + public XmlFileRecordedCallRepository(params string[] pathComponents) { } + protected override System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream) { } + protected override void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream) { } + } +} \ No newline at end of file From 989da6aa72a441e3c440e3f5b5bc436a8a30a835 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 16:30:50 -0400 Subject: [PATCH 07/17] Refrain from rebuilding projects to run tests --- tools/targets/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/targets/Program.cs b/tools/targets/Program.cs index 5b207e7..9f50c09 100644 --- a/tools/targets/Program.cs +++ b/tools/targets/Program.cs @@ -72,12 +72,12 @@ public static void Main(string[] args) "test", DependsOn("build", "testsDirectory"), forEach: testProjects, - action: testProject => Run("dotnet", $"test --configuration Release", testProject.Path)); + action: testProject => Run("dotnet", $"test --configuration Release --no-build --nologo", testProject.Path)); Target( "check-api", DependsOn("build", "testsDirectory"), - () => Run("dotnet", "test --configuration Release tests/SelfInitializingFakes.Tests.Api")); + () => Run("dotnet", "test --configuration Release --no-build --nologo tests/SelfInitializingFakes.Tests.Api")); Target( "approve-api", From 78d7b7a53f03c1e51c6b2733f612e3482e5c693e Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 21:50:00 -0400 Subject: [PATCH 08/17] Add net5.0 target --- .../FileBasedRecordedCallRepository.cs | 2 +- .../Infrastructure/ExceptionExtensions.cs | 2 +- .../Infrastructure/RecordingRule.cs | 2 +- .../SelfInitializingFakes.csproj | 4 +- .../XmlFileRecordedCallRepository.cs | 8 ++- tests/Acceptance/FileBasedSerializers.cs | 4 +- tests/Directory.Build.props | 2 +- .../ApiApproval.cs | 1 + .../SelfInitializingFakes/net5.0.approved.txt | 51 +++++++++++++++++++ 9 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net5.0.approved.txt diff --git a/src/SelfInitializingFakes/FileBasedRecordedCallRepository.cs b/src/SelfInitializingFakes/FileBasedRecordedCallRepository.cs index b169d27..d8357d4 100644 --- a/src/SelfInitializingFakes/FileBasedRecordedCallRepository.cs +++ b/src/SelfInitializingFakes/FileBasedRecordedCallRepository.cs @@ -29,7 +29,7 @@ protected FileBasedRecordedCallRepository(params string[] pathComponents) /// The recorded calls to save. public void Save(IEnumerable calls) { - Directory.CreateDirectory(Path.GetDirectoryName(this.path)); + Directory.CreateDirectory(Path.GetDirectoryName(this.path)!); using var fileStream = File.Open(this.path, FileMode.Create); this.WriteToStream(calls, fileStream); } diff --git a/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs b/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs index f466cde..5b95910 100644 --- a/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs +++ b/src/SelfInitializingFakes/Infrastructure/ExceptionExtensions.cs @@ -33,7 +33,7 @@ private static Action CreatePreserveStackTrace() { var method = typeof(Exception).GetMethod( "InternalPreserveStackTrace", - BindingFlags.Instance | BindingFlags.NonPublic); + BindingFlags.Instance | BindingFlags.NonPublic)!; return (Action)Delegate.CreateDelegate(typeof(Action), null, method); } } diff --git a/src/SelfInitializingFakes/Infrastructure/RecordingRule.cs b/src/SelfInitializingFakes/Infrastructure/RecordingRule.cs index 41d13cd..159925a 100644 --- a/src/SelfInitializingFakes/Infrastructure/RecordingRule.cs +++ b/src/SelfInitializingFakes/Infrastructure/RecordingRule.cs @@ -116,7 +116,7 @@ private RecordedCall BuildRecordedCall(IFakeObjectCall call) ++index; } - return new RecordedCall(call.Method.ToString(), result, outAndRefValues.ToArray()); + return new RecordedCall(call.Method.ToString()!, result, outAndRefValues.ToArray()); } } } diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index e583435..de0558a 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -1,7 +1,7 @@  - net45;netstandard2.0 + net45;netstandard2.0;net5.0 true SelfInitializingFakes SelfInitializingFakes @@ -33,7 +33,7 @@ - $(DefineConstants);FEATURE_BINARY_SERIALIZATION + $(DefineConstants);FEATURE_BINARY_SERIALIZATION;LACKS_ARRAY_EMPTY diff --git a/src/SelfInitializingFakes/XmlFileRecordedCallRepository.cs b/src/SelfInitializingFakes/XmlFileRecordedCallRepository.cs index 43471d9..902f69c 100644 --- a/src/SelfInitializingFakes/XmlFileRecordedCallRepository.cs +++ b/src/SelfInitializingFakes/XmlFileRecordedCallRepository.cs @@ -1,5 +1,6 @@ namespace SelfInitializingFakes { + using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -47,7 +48,12 @@ protected override IEnumerable ReadFromStream(FileStream fileStrea using (var reader = XmlReader.Create(fileStream)) { #pragma warning disable CA3075 // Insecure DTD processing in XML - the framework is for testing, so presumably is run in a safe environment - return (IEnumerable)Serializer.Deserialize(reader); + return (IEnumerable)(Serializer.Deserialize(reader) +#if LACKS_ARRAY_EMPTY + ?? new RecordedCall[0]); +#else + ?? Array.Empty()); +#endif #pragma warning restore CA3075 // Insecure DTD processing in XML } } diff --git a/tests/Acceptance/FileBasedSerializers.cs b/tests/Acceptance/FileBasedSerializers.cs index 77cc5ad..f059eff 100644 --- a/tests/Acceptance/FileBasedSerializers.cs +++ b/tests/Acceptance/FileBasedSerializers.cs @@ -50,7 +50,7 @@ public static void SerializeToDirectoryThatDoesNotExist( .x(() => repositoryPath = Path.Combine(missingChildDirectory, "subsub", "repofile")); $"And a {concreteRepositoryType} targeting that path" - .x(() => repository = (IRecordedCallRepository)Activator.CreateInstance(concreteRepositoryType, repositoryPath)); + .x(() => repository = (IRecordedCallRepository)Activator.CreateInstance(concreteRepositoryType, repositoryPath)!); "And a real service to wrap while recording" .x(() => realServiceWhileRecording = A.Fake()); @@ -91,7 +91,7 @@ public static void CreateFromPathComponents( concreteRepositoryType, baseDirectory, pathComponent1, - pathComponent2)); + pathComponent2)!); "And a real service to wrap while recording" .x(() => realServiceWhileRecording = A.Fake()); diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 001eb91..92cc9a2 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,7 +3,7 @@ - net452;netcoreapp2.1 + net452;netcoreapp2.1;net5.0 true $(MSBuildThisFileDirectory)\SelfInitializingFakes.Tests.ruleset diff --git a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs index 1d7dc1d..849cadf 100644 --- a/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs +++ b/tests/SelfInitializingFakes.Tests.Api/ApiApproval.cs @@ -17,6 +17,7 @@ public class ApiApproval [InlineData("net45")] [InlineData("netstandard2.0")] + [InlineData("net5.0")] [UseReporter(typeof(DiffReporter))] [MethodImpl(MethodImplOptions.NoInlining)] [Theory] diff --git a/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net5.0.approved.txt b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net5.0.approved.txt new file mode 100644 index 0000000..a010c3c --- /dev/null +++ b/tests/SelfInitializingFakes.Tests.Api/ApprovedApi/SelfInitializingFakes/net5.0.approved.txt @@ -0,0 +1,51 @@ +[assembly: System.Runtime.InteropServices.ComVisible(false)] +[assembly: System.Runtime.InteropServices.Guid("08462e29-25c0-4a1f-9275-23b7898e95f0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v5.0", FrameworkDisplayName="")] +namespace SelfInitializingFakes +{ + public abstract class FileBasedRecordedCallRepository : SelfInitializingFakes.IRecordedCallRepository + { + protected FileBasedRecordedCallRepository(params string[] pathComponents) { } + public System.Collections.Generic.IEnumerable? Load() { } + protected abstract System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream); + public void Save(System.Collections.Generic.IEnumerable calls) { } + protected abstract void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream); + } + public interface IRecordedCallRepository + { + System.Collections.Generic.IEnumerable? Load(); + void Save(System.Collections.Generic.IEnumerable calls); + } + public class PlaybackException : System.Exception + { + public PlaybackException() { } + public PlaybackException(string message) { } + public PlaybackException(string message, System.Exception innerException) { } + } + public class RecordedCall + { + public string Method { get; set; } + public object?[] OutAndRefValues { get; set; } + public object? ReturnValue { get; set; } + } + public class RecordingException : System.Exception + { + public RecordingException() { } + public RecordingException(string message) { } + public RecordingException(string message, System.Exception innerException) { } + } + public sealed class SelfInitializingFake : System.IDisposable + where TService : class + { + public TService Object { get; } + public void Dispose() { } + public static SelfInitializingFakes.SelfInitializingFake For(System.Func serviceFactory, SelfInitializingFakes.IRecordedCallRepository repository) + where TConcreteService : TService { } + } + public class XmlFileRecordedCallRepository : SelfInitializingFakes.FileBasedRecordedCallRepository + { + public XmlFileRecordedCallRepository(params string[] pathComponents) { } + protected override System.Collections.Generic.IEnumerable ReadFromStream(System.IO.FileStream fileStream) { } + protected override void WriteToStream(System.Collections.Generic.IEnumerable calls, System.IO.FileStream fileStream) { } + } +} \ No newline at end of file From d5cff607706358fb26c489ad26a92c4631a548e2 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 21:55:44 -0400 Subject: [PATCH 09/17] Test against FakeItEasy 6.2.1 explicitly --- SelfInitializingFakes.sln | 7 +++++++ .../SelfInitializingFakes.Tests.FIE.6.2.1.csproj | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj diff --git a/SelfInitializingFakes.sln b/SelfInitializingFakes.sln index 136dfb9..2714990 100644 --- a/SelfInitializingFakes.sln +++ b/SelfInitializingFakes.sln @@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.5.5.0", "tests\SelfInitializingFakes.Tests.FIE.5.5.0\SelfInitializingFakes.Tests.FIE.5.5.0.csproj", "{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelfInitializingFakes.Tests.FIE.6.2.1", "tests\SelfInitializingFakes.Tests.FIE.6.2.1\SelfInitializingFakes.Tests.FIE.6.2.1.csproj", "{CA0A7917-1C75-42E2-83ED-1176B11457A7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -50,6 +52,10 @@ Global {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Release|Any CPU.Build.0 = Release|Any CPU + {CA0A7917-1C75-42E2-83ED-1176B11457A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA0A7917-1C75-42E2-83ED-1176B11457A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA0A7917-1C75-42E2-83ED-1176B11457A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA0A7917-1C75-42E2-83ED-1176B11457A7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -58,6 +64,7 @@ Global {08462E29-25C0-4A1F-9275-23B7898E95F0} = {E5449372-918E-45FB-BD55-7A1BCC98FF1C} {ED447D19-E841-46AE-BBDE-56326FF6F4AB} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} {27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} + {CA0A7917-1C75-42E2-83ED-1176B11457A7} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A306C694-22A2-4AFB-974B-24B3629C8F28} diff --git a/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj b/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj new file mode 100644 index 0000000..b0d710b --- /dev/null +++ b/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj @@ -0,0 +1,7 @@ + + + + + + + From 300d862311fdff3018ea4ef64c32ab31c730c195 Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 22:06:02 -0400 Subject: [PATCH 10/17] Support FakeItEasy 7.x.y --- src/SelfInitializingFakes/SelfInitializingFakes.csproj | 2 +- .../SelfInitializingFakes.Tests.FIE.Latest.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj index de0558a..51260b3 100644 --- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj +++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj @@ -29,7 +29,7 @@ - + diff --git a/tests/SelfInitializingFakes.Tests.FIE.Latest/SelfInitializingFakes.Tests.FIE.Latest.csproj b/tests/SelfInitializingFakes.Tests.FIE.Latest/SelfInitializingFakes.Tests.FIE.Latest.csproj index d4c5d8e..edce591 100644 --- a/tests/SelfInitializingFakes.Tests.FIE.Latest/SelfInitializingFakes.Tests.FIE.Latest.csproj +++ b/tests/SelfInitializingFakes.Tests.FIE.Latest/SelfInitializingFakes.Tests.FIE.Latest.csproj @@ -6,7 +6,7 @@ - + From 4a9dc57643cc238606b80f69ba9354a2425ef31c Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Tue, 16 Mar 2021 22:18:54 -0400 Subject: [PATCH 11/17] Update release notes for framework and FakeItEasy support --- release_notes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release_notes.md b/release_notes.md index acee1a2..a583e90 100644 --- a/release_notes.md +++ b/release_notes.md @@ -1,3 +1,8 @@ +### Changed Framework and FakeItEasy Support ([#89](https://github.com/blairconrad/SelfInitializingFakes/pull/89)) + +- Now supports FakeItEasy 5.5.0 to 7.x.y (from 3.0.0 to 6.x.y) +- Now supports .NET frameworks net45, netstandard2.0, net5.0 (from net40, netstandard1.6, netstandard2.0) + ## 0.6.0 ### New From 59dc218ee979aa67d52a588b68ccac1bcdbb266e Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Wed, 31 Aug 2022 12:51:06 -0400 Subject: [PATCH 12/17] Run build project on net6.0 --- appveyor.yml | 2 +- tools/targets/Targets.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1ebf732..31226f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: '{build}' -image: Visual Studio 2019 +image: Visual Studio 2022 branches: only: diff --git a/tools/targets/Targets.csproj b/tools/targets/Targets.csproj index 054d6f4..f022c0f 100644 --- a/tools/targets/Targets.csproj +++ b/tools/targets/Targets.csproj @@ -2,7 +2,7 @@ latest Exe - netcoreapp3.1 + net6.0