diff --git a/.gitignore b/.gitignore index 7b0f536..dd481f5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ src/*/bin/ _ReSharper.OrcaMDF DBTests *.linq -OrcaMDF.sln.cache \ No newline at end of file +OrcaMDF.sln.cache +.vs/* diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe deleted file mode 100644 index 2c93698..0000000 Binary files a/.nuget/NuGet.exe and /dev/null differ diff --git a/.nuget/packages.config b/.nuget/packages.config deleted file mode 100644 index e2fc515..0000000 --- a/.nuget/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OrcaMDF.sln b/OrcaMDF.sln index ca3566f..d900b09 100644 --- a/OrcaMDF.sln +++ b/OrcaMDF.sln @@ -1,107 +1,69 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Core", "src\OrcaMDF.Core\OrcaMDF.Core.csproj", "{829A5C51-CB21-4DE2-9021-44F6D804D231}" +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DFD4D47A-31E3-42D2-B586-9D5FF1530E84}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Core.Tests", "src\OrcaMDF.Core.Tests\OrcaMDF.Core.Tests.csproj", "{C6062A74-A3B2-4102-84D4-A658AA8011B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Core", "src\OrcaMDF.Core\OrcaMDF.Core.csproj", "{13515E5C-F19F-4524-8DCF-BF6775D81C75}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.OMS", "src\OrcaMDF.OMS\OrcaMDF.OMS.csproj", "{B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Core.Tests", "src\OrcaMDF.Core.Tests\OrcaMDF.Core.Tests.csproj", "{936B60E0-A1CE-4100-80C5-F0CF97A80C11}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C2766186-FD59-4C3D-98B5-69741ADB9395}" - ProjectSection(SolutionItems) = preProject - .nuget\packages.config = .nuget\packages.config - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Framework", "src\OrcaMDF.Framework\OrcaMDF.Framework.csproj", "{A2B90895-622A-4BFE-BAEB-FF527869ED8C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.RawCore", "src\OrcaMDF.RawCore\OrcaMDF.RawCore.csproj", "{57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Framework.Tests", "src\OrcaMDF.Framework.Tests\OrcaMDF.Framework.Tests.csproj", "{7186BA3B-1C1A-42EE-B194-969E8F9776EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.RawCore.Tests", "src\OrcaMDF.RawCore.Tests\OrcaMDF.RawCore.Tests.csproj", "{C48D6079-9A39-4834-8376-F33A69CC058C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.OMS", "src\OrcaMDF.OMS\OrcaMDF.OMS.csproj", "{EF723E6A-49D6-4B54-809D-E6B115F72D40}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Framework", "src\OrcaMDF.Framework\OrcaMDF.Framework.csproj", "{4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.RawCore", "src\OrcaMDF.RawCore\OrcaMDF.RawCore.csproj", "{8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.Framework.Tests", "src\OrcaMDF.Framework.Tests\OrcaMDF.Framework.Tests.csproj", "{8D1AA5C3-74C2-4041-8F1D-303376D81584}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrcaMDF.RawCore.Tests", "src\OrcaMDF.RawCore.Tests\OrcaMDF.RawCore.Tests.csproj", "{F4B74881-E153-4FA3-B71F-7715C8DEC3B5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Debug|x86.ActiveCfg = Debug|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Release|Any CPU.Build.0 = Release|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {829A5C51-CB21-4DE2-9021-44F6D804D231}.Release|x86.ActiveCfg = Release|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Debug|x86.ActiveCfg = Debug|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Release|Any CPU.Build.0 = Release|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C6062A74-A3B2-4102-84D4-A658AA8011B3}.Release|x86.ActiveCfg = Release|Any CPU - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Debug|Any CPU.ActiveCfg = Debug|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Debug|x86.ActiveCfg = Debug|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Debug|x86.Build.0 = Debug|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Release|Any CPU.ActiveCfg = Release|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Release|Mixed Platforms.Build.0 = Release|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Release|x86.ActiveCfg = Release|x86 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB}.Release|x86.Build.0 = Release|x86 - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Debug|x86.ActiveCfg = Debug|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Release|Any CPU.Build.0 = Release|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4}.Release|x86.ActiveCfg = Release|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Debug|x86.ActiveCfg = Debug|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Release|Any CPU.Build.0 = Release|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C48D6079-9A39-4834-8376-F33A69CC058C}.Release|x86.ActiveCfg = Release|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Release|Any CPU.Build.0 = Release|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C}.Release|x86.ActiveCfg = Release|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Debug|x86.ActiveCfg = Debug|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Release|Any CPU.Build.0 = Release|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {13515E5C-F19F-4524-8DCF-BF6775D81C75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13515E5C-F19F-4524-8DCF-BF6775D81C75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13515E5C-F19F-4524-8DCF-BF6775D81C75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13515E5C-F19F-4524-8DCF-BF6775D81C75}.Release|Any CPU.Build.0 = Release|Any CPU + {936B60E0-A1CE-4100-80C5-F0CF97A80C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {936B60E0-A1CE-4100-80C5-F0CF97A80C11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {936B60E0-A1CE-4100-80C5-F0CF97A80C11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {936B60E0-A1CE-4100-80C5-F0CF97A80C11}.Release|Any CPU.Build.0 = Release|Any CPU + {A2B90895-622A-4BFE-BAEB-FF527869ED8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2B90895-622A-4BFE-BAEB-FF527869ED8C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2B90895-622A-4BFE-BAEB-FF527869ED8C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2B90895-622A-4BFE-BAEB-FF527869ED8C}.Release|Any CPU.Build.0 = Release|Any CPU + {7186BA3B-1C1A-42EE-B194-969E8F9776EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7186BA3B-1C1A-42EE-B194-969E8F9776EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7186BA3B-1C1A-42EE-B194-969E8F9776EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7186BA3B-1C1A-42EE-B194-969E8F9776EF}.Release|Any CPU.Build.0 = Release|Any CPU + {EF723E6A-49D6-4B54-809D-E6B115F72D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF723E6A-49D6-4B54-809D-E6B115F72D40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF723E6A-49D6-4B54-809D-E6B115F72D40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF723E6A-49D6-4B54-809D-E6B115F72D40}.Release|Any CPU.Build.0 = Release|Any CPU + {8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE}.Release|Any CPU.Build.0 = Release|Any CPU + {F4B74881-E153-4FA3-B71F-7715C8DEC3B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4B74881-E153-4FA3-B71F-7715C8DEC3B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4B74881-E153-4FA3-B71F-7715C8DEC3B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4B74881-E153-4FA3-B71F-7715C8DEC3B5}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {13515E5C-F19F-4524-8DCF-BF6775D81C75} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {936B60E0-A1CE-4100-80C5-F0CF97A80C11} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {A2B90895-622A-4BFE-BAEB-FF527869ED8C} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {7186BA3B-1C1A-42EE-B194-969E8F9776EF} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {EF723E6A-49D6-4B54-809D-E6B115F72D40} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {8C2CA79D-3FD5-4C3B-B7FD-9D57C0CBA6FE} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + {F4B74881-E153-4FA3-B71F-7715C8DEC3B5} = {DFD4D47A-31E3-42D2-B586-9D5FF1530E84} + EndGlobalSection EndGlobal diff --git a/src/OrcaMDF.Core.Tests/OrcaMDF.Core.Tests.csproj b/src/OrcaMDF.Core.Tests/OrcaMDF.Core.Tests.csproj index 30a06ef..4f8ca1f 100644 --- a/src/OrcaMDF.Core.Tests/OrcaMDF.Core.Tests.csproj +++ b/src/OrcaMDF.Core.Tests/OrcaMDF.Core.Tests.csproj @@ -1,131 +1,29 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {C6062A74-A3B2-4102-84D4-A658AA8011B3} - Library - Properties - OrcaMDF.Core.Tests - OrcaMDF.Core.Tests - v4.5.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + net461 + false - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {829A5C51-CB21-4DE2-9021-44F6D804D231} - OrcaMDF.Core - - - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C} - OrcaMDF.Framework - + + TestHelper.cs + - - + + - - - - \ No newline at end of file + diff --git a/src/OrcaMDF.Core.Tests/SqlServerSystemTestBase.cs b/src/OrcaMDF.Core.Tests/SqlServerSystemTestBase.cs index 8efd589..efbba93 100644 --- a/src/OrcaMDF.Core.Tests/SqlServerSystemTestBase.cs +++ b/src/OrcaMDF.Core.Tests/SqlServerSystemTestBase.cs @@ -130,7 +130,7 @@ protected void RunQuery(string sql, SqlConnection conn) cmd.ExecuteNonQuery(); } - [TestFixtureTearDown] + [OneTimeTearDown] public void TearDown() { // Delete all collateral files resulting from running this test diff --git a/src/OrcaMDF.Core.Tests/packages.config b/src/OrcaMDF.Core.Tests/packages.config deleted file mode 100644 index 617647a..0000000 --- a/src/OrcaMDF.Core.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OrcaMDF.Core/OrcaMDF.Core.csproj b/src/OrcaMDF.Core/OrcaMDF.Core.csproj index 830ee4e..2e2db3e 100644 --- a/src/OrcaMDF.Core/OrcaMDF.Core.csproj +++ b/src/OrcaMDF.Core/OrcaMDF.Core.csproj @@ -1,208 +1,15 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {829A5C51-CB21-4DE2-9021-44F6D804D231} - Library - Properties - OrcaMDF.Core - OrcaMDF.Core - v4.5.1 - 512 - - - true - $(MSBuildProjectDirectory)\..\..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false + netstandard2.0 + false true - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4d581cdb-a39c-4c0c-ae2c-6a3070b8983c} - OrcaMDF.Framework - + - - - - \ No newline at end of file + diff --git a/src/OrcaMDF.Framework.Tests/OrcaMDF.Framework.Tests.csproj b/src/OrcaMDF.Framework.Tests/OrcaMDF.Framework.Tests.csproj index b37941c..c0e95d7 100644 --- a/src/OrcaMDF.Framework.Tests/OrcaMDF.Framework.Tests.csproj +++ b/src/OrcaMDF.Framework.Tests/OrcaMDF.Framework.Tests.csproj @@ -1,70 +1,22 @@ - - - + - Debug - AnyCPU - {8D1AA5C3-74C2-4041-8F1D-303376D81584} - Library - Properties - OrcaMDF.Framework.Tests - OrcaMDF.Framework.Tests - v4.5.1 - 512 - + net461 + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - - - - - - - + + TestHelper.cs + - - {4d581cdb-a39c-4c0c-ae2c-6a3070b8983c} - OrcaMDF.Framework - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + - - - \ No newline at end of file + diff --git a/src/OrcaMDF.Framework.Tests/packages.config b/src/OrcaMDF.Framework.Tests/packages.config deleted file mode 100644 index b1aa629..0000000 --- a/src/OrcaMDF.Framework.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OrcaMDF.Framework/OrcaMDF.Framework.csproj b/src/OrcaMDF.Framework/OrcaMDF.Framework.csproj index c6f7633..0d2f3c9 100644 --- a/src/OrcaMDF.Framework/OrcaMDF.Framework.csproj +++ b/src/OrcaMDF.Framework/OrcaMDF.Framework.csproj @@ -1,72 +1,7 @@ - - - + - Debug - AnyCPU - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C} - Library - Properties - OrcaMDF.Framework - OrcaMDF.Framework - v4.5.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + netstandard2.0 + false true - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/OrcaMDF.OMS/OrcaMDF.OMS.csproj b/src/OrcaMDF.OMS/OrcaMDF.OMS.csproj index 5e81b60..cb8ccca 100644 --- a/src/OrcaMDF.OMS/OrcaMDF.OMS.csproj +++ b/src/OrcaMDF.OMS/OrcaMDF.OMS.csproj @@ -1,99 +1,18 @@ - - + - Debug - x86 - 8.0.30703 - 2.0 - {B93D138E-C67F-43AE-BB84-6BD1C94B5ADB} WinExe - Properties - OrcaMDF.OMS - OrcaMDF.OMS - v4.5.1 - - - 512 + net461 + false - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - false - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - Form - - - Main.cs - - - - - Main.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - {829A5C51-CB21-4DE2-9021-44F6D804D231} - OrcaMDF.Core - + + + + - - - \ No newline at end of file + diff --git a/src/OrcaMDF.RawCore.Tests/BaseFixture.cs b/src/OrcaMDF.RawCore.Tests/BaseFixture.cs index 18f33aa..b4c72b0 100644 --- a/src/OrcaMDF.RawCore.Tests/BaseFixture.cs +++ b/src/OrcaMDF.RawCore.Tests/BaseFixture.cs @@ -2,9 +2,11 @@ { public class BaseFixture { - protected const string AW2012Path = @"TestDatabases\AWLT2012.mdf"; - protected const string AW2008R2Path = @"TestDatabases\AWLT2008R2.mdf"; - protected const string AW2008Path = @"TestDatabases\AWLT2008.mdf"; - protected const string AW2005Path = @"TestDatabases\AWLT2005.mdf"; + private const string Prefix = @"src\OrcaMDF.RawCore.Tests\TestDatabases\"; + + protected const string AW2012Path = Prefix + @"AWLT2012.mdf"; + protected const string AW2008R2Path = Prefix + @"AWLT2008R2.mdf"; + protected const string AW2008Path = Prefix + @"AWLT2008.mdf"; + protected const string AW2005Path = Prefix + @"AWLT2005.mdf"; } } \ No newline at end of file diff --git a/src/OrcaMDF.RawCore.Tests/OrcaMDF.RawCore.Tests.csproj b/src/OrcaMDF.RawCore.Tests/OrcaMDF.RawCore.Tests.csproj index 309b0e2..282c088 100644 --- a/src/OrcaMDF.RawCore.Tests/OrcaMDF.RawCore.Tests.csproj +++ b/src/OrcaMDF.RawCore.Tests/OrcaMDF.RawCore.Tests.csproj @@ -1,90 +1,27 @@ - - - + - Debug - AnyCPU - {C48D6079-9A39-4834-8376-F33A69CC058C} - Library - Properties - OrcaMDF.RawCore.Tests - OrcaMDF.RawCore.Tests - v4.5.1 - 512 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + net461 + false - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - - - - - - - - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - {4D581CDB-A39C-4C0C-AE2C-6A3070B8983C} - OrcaMDF.Framework - - - {57cfdbd5-8673-4e96-944a-9f9e4c9b50a4} - OrcaMDF.RawCore - + + - + + TestHelper.cs + @@ -100,25 +37,4 @@ PreserveNewest - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - - - - \ No newline at end of file + diff --git a/src/OrcaMDF.RawCore.Tests/packages.config b/src/OrcaMDF.RawCore.Tests/packages.config deleted file mode 100644 index b1aa629..0000000 --- a/src/OrcaMDF.RawCore.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/OrcaMDF.RawCore/OrcaMDF.RawCore.csproj b/src/OrcaMDF.RawCore/OrcaMDF.RawCore.csproj index 9b2dda3..b8481d5 100644 --- a/src/OrcaMDF.RawCore/OrcaMDF.RawCore.csproj +++ b/src/OrcaMDF.RawCore/OrcaMDF.RawCore.csproj @@ -1,95 +1,12 @@ - - - + - Debug - AnyCPU - {57CFDBD5-8673-4E96-944A-9F9E4C9B50A4} - Library - Properties - OrcaMDF.RawCore - OrcaMDF.RawCore - v4.5.1 - 512 - + netstandard2.0 + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {4d581cdb-a39c-4c0c-ae2c-6a3070b8983c} - OrcaMDF.Framework - + - - - - \ No newline at end of file + diff --git a/src/OrcaMDF.Framework/TestHelper.cs b/src/TestHelper.cs similarity index 96% rename from src/OrcaMDF.Framework/TestHelper.cs rename to src/TestHelper.cs index 0ede14a..bfc44dc 100644 --- a/src/OrcaMDF.Framework/TestHelper.cs +++ b/src/TestHelper.cs @@ -1,29 +1,29 @@ -using System; -using System.Reflection; -using System.Runtime.Remoting.Metadata.W3cXsd2001; -using System.Text.RegularExpressions; - -namespace OrcaMDF.Framework -{ - public static class TestHelper - { - public static void GetAllPublicProperties(object obj) - { - var props = obj.GetType().GetProperties(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance); - - foreach(var prop in props) - prop.GetValue(obj, null); - } - - public static byte[] GetBytesFromByteString(string input) - { - // Remove anything but valid hex characters - input = Regex.Replace(input, "[^0-9A-F]", "", RegexOptions.IgnoreCase); - - if(input.Length % 2 != 0) - throw new FormatException("input"); - - return SoapHexBinary.Parse(input).Value; - } - } +using System; +using System.Reflection; +using System.Runtime.Remoting.Metadata.W3cXsd2001; +using System.Text.RegularExpressions; + +namespace OrcaMDF.Framework +{ + public static class TestHelper + { + public static void GetAllPublicProperties(object obj) + { + var props = obj.GetType().GetProperties(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance); + + foreach(var prop in props) + prop.GetValue(obj, null); + } + + public static byte[] GetBytesFromByteString(string input) + { + // Remove anything but valid hex characters + input = Regex.Replace(input, "[^0-9A-F]", "", RegexOptions.IgnoreCase); + + if(input.Length % 2 != 0) + throw new FormatException("input"); + + return SoapHexBinary.Parse(input).Value; + } + } } \ No newline at end of file