From c95d865b9dd3e9a475c9acf4569f08148d175189 Mon Sep 17 00:00:00 2001 From: Greg Burri Date: Sun, 21 Mar 2021 22:43:43 +0100 Subject: [PATCH] Update unit tests to .NET 5. --- Parasitemia/ParasitemiaCore/AssemblyInfo.fs | 41 ------- .../ParasitemiaCore/ParasitemiaCore.fsproj | 7 +- .../ParasitemiaUI/ParasitemiaUI.fsproj | 2 + .../ParasitemiaCore.Tests/AssemblyInfo.fs | 43 ------- .../ParasitemiaCore.Tests.fsproj | 109 +++--------------- .../ParasitemiaCore.Tests/packages.config | 12 -- 6 files changed, 26 insertions(+), 188 deletions(-) delete mode 100644 Parasitemia/ParasitemiaCore/AssemblyInfo.fs delete mode 100644 Parasitemia/Tests/ParasitemiaCore.Tests/AssemblyInfo.fs delete mode 100644 Parasitemia/Tests/ParasitemiaCore.Tests/packages.config diff --git a/Parasitemia/ParasitemiaCore/AssemblyInfo.fs b/Parasitemia/ParasitemiaCore/AssemblyInfo.fs deleted file mode 100644 index e5eace6..0000000 --- a/Parasitemia/ParasitemiaCore/AssemblyInfo.fs +++ /dev/null @@ -1,41 +0,0 @@ -namespace ParasitemiaCore.AssemblyInfo - -open System.Reflection -open System.Runtime.CompilerServices -open System.Runtime.InteropServices - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[] -[] -[] -[] -[] -[] -[] -[] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [] -[] -[] - -do - () \ No newline at end of file diff --git a/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj b/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj index 4309643..14fc5a9 100644 --- a/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj +++ b/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj @@ -3,10 +3,15 @@ Library net5.0 + 1.0.12 + 1.0.0.12 + 1.0.0.12 + Greg Burri + + CHUV & HES-SO - diff --git a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj index 4f37773..d22fd41 100644 --- a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj +++ b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj @@ -7,6 +7,8 @@ 1.0.0.12 1.0.0.12 1.0.12 + Greg Burri + CHUV & HES-SO diff --git a/Parasitemia/Tests/ParasitemiaCore.Tests/AssemblyInfo.fs b/Parasitemia/Tests/ParasitemiaCore.Tests/AssemblyInfo.fs deleted file mode 100644 index 931f17d..0000000 --- a/Parasitemia/Tests/ParasitemiaCore.Tests/AssemblyInfo.fs +++ /dev/null @@ -1,43 +0,0 @@ -namespace ParasitemiaCore.Tests.AssemblyInfo - -open System.Reflection -open System.Runtime.CompilerServices -open System.Runtime.InteropServices - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[] -[] -[] -[] -[] -[] -[] -[] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [] -[] -[] - -[] - -do - () \ No newline at end of file diff --git a/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj b/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj index 6c4f0ee..eaa52d3 100644 --- a/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj +++ b/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj @@ -1,100 +1,27 @@ - - - - - + + - Debug - AnyCPU - 2.0 - {2ab542e3-5f90-48ca-9442-32b2780b3e4a} Library - ParasitemiaCore.Tests - ParasitemiaCore.Tests - v4.8 - 4.4.1.0 - true - ParasitemiaCore.Tests - - - + net5.0 - - true - full - false - false - bin\Debug\ - DEBUG;TRACE - 3 - bin\Debug\ParasitemiaCore.Tests.XML - AnyCPU - - - pdbonly - true - true - bin\Release\ - TRACE - 3 - - - AnyCPU - - - 11 - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - + - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + - - ..\..\packages\FSharp.Core.4.7.2\lib\net45\FSharp.Core.dll - - - - - - ParasitemiaCore - {0f8a85f4-9328-40c3-b8ff-44fb39ceb01f} - True - - - True - - - ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config b/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config deleted file mode 100644 index 46d27dd..0000000 --- a/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file -- 2.43.0