From 828fad12f687e9fb950b47e8b632ae11351e85bd Mon Sep 17 00:00:00 2001 From: Ivo Stoilov Date: Thu, 22 Dec 2022 15:13:47 +0200 Subject: [PATCH 1/3] Support for macOS o added preview framework target --- Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj | 4 ++++ .../Telerik.JustMock.DemoLibSigned.csproj | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj index a1c7ca6a..f8e361b2 100644 --- a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj +++ b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj @@ -8,6 +8,10 @@ false false + + $(NetCoreSupportedVersions);$(PreviewTargetFramework) + $(TargetFrameworks);$(PreviewTargetFramework) + true full diff --git a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj index c0cb234c..20fb7339 100644 --- a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj +++ b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj @@ -9,6 +9,10 @@ false false + + $(NetCoreSupportedVersions);$(PreviewTargetFramework) + $(TargetFrameworks);$(PreviewTargetFramework) + true full From 14e4067322de7e2fd9e886f7e7bef696abb11b1f Mon Sep 17 00:00:00 2001 From: Ivo Stoilov Date: Mon, 27 Mar 2023 17:08:59 +0300 Subject: [PATCH 2/3] Support for macOS o ignored all known .Net 7 issues --- .../Telerik.JustMock.MSTest2.Tests.csproj | 3 +++ Telerik.JustMock.Tests/InteropFixture.cs | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj index 891d8db7..861709bd 100644 --- a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj +++ b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj @@ -65,6 +65,9 @@ $(DefineConstants);NETCORE31;NET50 + + $(DefineConstants);NETCORE31;NET50;NET70 + Debug AnyCPU diff --git a/Telerik.JustMock.Tests/InteropFixture.cs b/Telerik.JustMock.Tests/InteropFixture.cs index 988cb78d..db3f579f 100644 --- a/Telerik.JustMock.Tests/InteropFixture.cs +++ b/Telerik.JustMock.Tests/InteropFixture.cs @@ -81,7 +81,18 @@ public abstract class UnsafeClassRef public delegate void DoDelegate(ref IntPtr arg); - [TestMethod, TestCategory("Interop")] +#if NET70 +#if XUNIT + [TestMethod(Skip = SkipReason.Value)] +#elif NUNIT + [TestMethod, Ignore("")] +#else + [TestMethod, Ignore] +#endif +#else + [TestMethod] +#endif + [TestCategory("Interop")] public void ShouldPassPointersByRef() { var mock = Mock.Create(); From 5dd4bde5ff9b86196cc2e90d9a3c0a3d72f26e01 Mon Sep 17 00:00:00 2001 From: Ivo Stoilov Date: Tue, 30 May 2023 13:29:31 +0300 Subject: [PATCH 3/3] Infrastructure as a code o updated target .NET Framework version --- Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj | 4 ++-- .../Telerik.JustMock.DemoLibSigned.csproj | 4 ++-- .../Telerik.JustMock.MSTest2.Tests.csproj | 2 +- .../Telerik.JustMock.XUnit.Tests.csproj | 2 +- Telerik.JustMock/Directory.Build.targets | 7 +++++++ Telerik.JustMock/Telerik.JustMock.csproj | 6 +++--- 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 Telerik.JustMock/Directory.Build.targets diff --git a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj index f8e361b2..5c19e2e3 100644 --- a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj +++ b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj @@ -1,6 +1,6 @@  - net45;netcoreapp2.1;netcoreapp3.1;net5.0 + net45;net472;netcoreapp2.1;netcoreapp3.1;net5.0 Debug;Release;ReleaseFree;DebugFree Telerik.JustMock.DemoLib Telerik.JustMock.DemoLib @@ -96,7 +96,7 @@ false - + diff --git a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj index 20fb7339..84ce93a7 100644 --- a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj +++ b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj @@ -1,6 +1,6 @@ - net45;netcoreapp2.1;netcoreapp3.1;net5.0 + net45;net472;netcoreapp2.1;netcoreapp3.1;net5.0 Debug;Release;DebugFree;ReleaseFree Telerik.JustMock.DemoLibSigned Telerik.JustMock.DemoLibSigned @@ -73,7 +73,7 @@ true snkey.snk - + diff --git a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj index 861709bd..c63b8690 100644 --- a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj +++ b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj @@ -1,7 +1,7 @@  netcoreapp2.1;netcoreapp3.1;net5.0 - net451;$(NetCoreSupportedVersions) + net451;net472;$(NetCoreSupportedVersions) Debug;Release;ReleaseFree;DebugFree Telerik.JustMock.MSTest2.Tests Telerik.JustMock.Tests diff --git a/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj b/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj index 12bd7a19..58baaacf 100644 --- a/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj +++ b/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj @@ -1,6 +1,6 @@  - net452;netcoreapp2.1;netcoreapp3.1 + net452;net472;netcoreapp2.1;netcoreapp3.1 Debug;Release;DebugFree;ReleaseFree Telerik.JustMock.XUnit.Tests Telerik.JustMock.Tests diff --git a/Telerik.JustMock/Directory.Build.targets b/Telerik.JustMock/Directory.Build.targets new file mode 100644 index 00000000..2906a4b2 --- /dev/null +++ b/Telerik.JustMock/Directory.Build.targets @@ -0,0 +1,7 @@ + + + + true + + + \ No newline at end of file diff --git a/Telerik.JustMock/Telerik.JustMock.csproj b/Telerik.JustMock/Telerik.JustMock.csproj index a5be0198..b0395b0a 100644 --- a/Telerik.JustMock/Telerik.JustMock.csproj +++ b/Telerik.JustMock/Telerik.JustMock.csproj @@ -1,7 +1,7 @@  netcoreapp2.0 - net45;$(NetCoreSupportedVersions) + net45;net472;$(NetCoreSupportedVersions) Debug;Release;ReleaseFree;DebugFree Telerik.JustMock Telerik.JustMock @@ -54,7 +54,7 @@ prompt MinimumRecommendedRules.ruleset - + $(DefineConstants);FEATURE_REMOTING;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE @@ -84,7 +84,7 @@ - +