diff --git a/IPAddressRange.Test.Core/IPAddressRange.Test.Core.csproj b/IPAddressRange.Test.Core/IPAddressRange.Test.Core.csproj
deleted file mode 100644
index 75d2188..0000000
--- a/IPAddressRange.Test.Core/IPAddressRange.Test.Core.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- netcoreapp1.1
-
-
-
- TRACE;DEBUG;NETCORE;NETCOREAPP1_1
-
-
-
- TRACE;NETCORE;RELEASE;NETCOREAPP1_1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/IPAddressRange.Test/IPAddressRange.Test.csproj b/IPAddressRange.Test/IPAddressRange.Test.csproj
index c474205..ffdee1c 100644
--- a/IPAddressRange.Test/IPAddressRange.Test.csproj
+++ b/IPAddressRange.Test/IPAddressRange.Test.csproj
@@ -1,126 +1,29 @@
-
-
-
+
+
- Debug
- AnyCPU
- {4B6A09CA-5FFA-4C04-81F0-B5E706E3F6D3}
- Library
- Properties
- IPRange.Test
- IPRange.Test
- v4.5
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
+ netcoreapp3.1;net45
+ 7.0
+ false
+
-
- ..\packages\ChainingAssertion.Bin.1.8.1.3\lib\net45\ChainingAssertion.MSTest.dll
-
-
-
- ..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
-
-
- ..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
-
-
- ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
-
-
-
- 3.5
-
-
-
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
- Designer
-
-
-
-
- {d3dea965-247f-4c4c-b3b0-44a039c75a5c}
- IPAddressRange
-
+
+
+
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
- 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/IPAddressRange.Test/Properties/AssemblyInfo.cs b/IPAddressRange.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index ca1484c..0000000
--- a/IPAddressRange.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using 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.
-[assembly: AssemblyTitle("IPRange.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("IPRange.Test")]
-[assembly: AssemblyCopyright("Copyright © 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 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.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a346ce7f-d5b3-4a60-9049-7638fcfe7b9a")]
-
-// 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:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/IPAddressRange.Test/packages.config b/IPAddressRange.Test/packages.config
deleted file mode 100644
index 7b004a8..0000000
--- a/IPAddressRange.Test/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/IPAddressRange.sln b/IPAddressRange.sln
index ce44eec..06cf7f2 100644
--- a/IPAddressRange.sln
+++ b/IPAddressRange.sln
@@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.30404.54
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPAddressRange", "IPAddressRange\IPAddressRange.csproj", "{D3DEA965-247F-4C4C-B3B0-44A039C75A5C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IPAddressRange.Test", "IPAddressRange.Test\IPAddressRange.Test.csproj", "{4B6A09CA-5FFA-4C04-81F0-B5E706E3F6D3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPAddressRange.Test.Core", "IPAddressRange.Test.Core\IPAddressRange.Test.Core.csproj", "{6A4B647D-B2FF-41C4-81BA-9C710AFFBA42}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{2377036E-5896-4E09-949F-4307D0A2F39D}"
ProjectSection(SolutionItems) = preProject
LICENSE = LICENSE
@@ -16,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{237703
RELEASE-NOTES.txt = RELEASE-NOTES.txt
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IPAddressRange.Test", "IPAddressRange.Test\IPAddressRange.Test.csproj", "{9A01AF46-6AE0-425A-BD1E-6575122C6BAB}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -26,12 +24,10 @@ Global
{D3DEA965-247F-4C4C-B3B0-44A039C75A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3DEA965-247F-4C4C-B3B0-44A039C75A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3DEA965-247F-4C4C-B3B0-44A039C75A5C}.Release|Any CPU.Build.0 = Release|Any CPU
- {4B6A09CA-5FFA-4C04-81F0-B5E706E3F6D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B6A09CA-5FFA-4C04-81F0-B5E706E3F6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B6A09CA-5FFA-4C04-81F0-B5E706E3F6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6A4B647D-B2FF-41C4-81BA-9C710AFFBA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6A4B647D-B2FF-41C4-81BA-9C710AFFBA42}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6A4B647D-B2FF-41C4-81BA-9C710AFFBA42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A01AF46-6AE0-425A-BD1E-6575122C6BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A01AF46-6AE0-425A-BD1E-6575122C6BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9A01AF46-6AE0-425A-BD1E-6575122C6BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A01AF46-6AE0-425A-BD1E-6575122C6BAB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index 2993020..a8d6dee 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
version: 1.0.{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
configuration: Debug
platform: Any CPU
environment:
@@ -10,10 +10,10 @@ build:
verbosity: minimal
test_script:
- cmd: >-
- cd IPAddressRange.Test.Core
+ cd IPAddressRange.Test
dotnet test
- cd ..\IPAddressRange.Test\bin\Debug
+ cd ..\IPAddressRange.Test\bin\Debug\net45
- vstest.console /logger:Appveyor IPRange.Test.dll
+ vstest.console /logger:Appveyor IPAddressRange.Test.dll