Merge pull request #1 from loresoft/netcore

Netcore upgrade
loresoft · May 4, 2018 · 3ad06ad · 3ad06ad
2 parents 10c61c1 + 6153ba9
commit 3ad06ad
Show file tree

Hide file tree

Showing 214 changed files with 6,506 additions and 5,225 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,22 +1,63 @@
-# Auto detect text files and perform LF normalization
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
 * text=auto
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
 
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -236,9 +236,10 @@ _Pvt_Extensions
 .fake/
 
 # Custom
-/Build
+/artifacts
 /Tools
 /*.txt
 /xunit.xml
 *.GhostDoc.xml
-*.csv
+*.csv
+coverage.xml
diff --git a/Database/restore.tracker.cmd b/Database/restore.tracker.cmd
diff --git a/FluentCommand.sln b/FluentCommand.sln
@@ -0,0 +1,91 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2015
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand", "src\FluentCommand\FluentCommand.csproj", "{4D5F125D-8DD5-496B-959E-78F55D8BE946}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{228D7B65-A886-4D86-AED0-F3CB0C61819B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.Entities", "test\FluentCommand.Entities\FluentCommand.Entities.csproj", "{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.SQLite.Tests", "test\FluentCommand.SQLite.Tests\FluentCommand.SQLite.Tests.csproj", "{0F3235EA-8397-4D99-AB07-DF7987409DD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.SqlServer.Tests", "test\FluentCommand.SqlServer.Tests\FluentCommand.SqlServer.Tests.csproj", "{5DE2495F-EC9E-49C5-8211-5ACB44A780A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.Batch", "src\FluentCommand.Batch\FluentCommand.Batch.csproj", "{9DEC5471-EEFE-48EC-8D7A-BEE501087F38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.Batch.Tests", "test\FluentCommand.Batch.Tests\FluentCommand.Batch.Tests.csproj", "{CCC34DD0-4706-44CB-AC03-A0E607F449A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{38D98603-4878-4CFA-ACF5-5BEC1218B149}"
+	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
+		build\common.props = build\common.props
+		build\sourcelink.props = build\sourcelink.props
+		build\version.props = build\version.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.Tests", "test\FluentCommand.Tests\FluentCommand.Tests.csproj", "{A003BB6E-286D-4F52-B980-992816892CEE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.PostgreSQL.Tests", "test\FluentCommand.PostgreSQL.Tests\FluentCommand.PostgreSQL.Tests.csproj", "{CFCFEA34-ABFA-490E-85BF-A7DC12392245}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand.EntityFactory", "src\FluentCommand.EntityFactory\FluentCommand.EntityFactory.csproj", "{F05DE8E6-1CBB-4304-8D41-68D9BB5DF6B6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4D5F125D-8DD5-496B-959E-78F55D8BE946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D5F125D-8DD5-496B-959E-78F55D8BE946}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D5F125D-8DD5-496B-959E-78F55D8BE946}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D5F125D-8DD5-496B-959E-78F55D8BE946}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F3235EA-8397-4D99-AB07-DF7987409DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F3235EA-8397-4D99-AB07-DF7987409DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F3235EA-8397-4D99-AB07-DF7987409DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F3235EA-8397-4D99-AB07-DF7987409DD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DE2495F-EC9E-49C5-8211-5ACB44A780A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE2495F-EC9E-49C5-8211-5ACB44A780A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DE2495F-EC9E-49C5-8211-5ACB44A780A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DE2495F-EC9E-49C5-8211-5ACB44A780A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DEC5471-EEFE-48EC-8D7A-BEE501087F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DEC5471-EEFE-48EC-8D7A-BEE501087F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DEC5471-EEFE-48EC-8D7A-BEE501087F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DEC5471-EEFE-48EC-8D7A-BEE501087F38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCC34DD0-4706-44CB-AC03-A0E607F449A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCC34DD0-4706-44CB-AC03-A0E607F449A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCC34DD0-4706-44CB-AC03-A0E607F449A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCC34DD0-4706-44CB-AC03-A0E607F449A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A003BB6E-286D-4F52-B980-992816892CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A003BB6E-286D-4F52-B980-992816892CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A003BB6E-286D-4F52-B980-992816892CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A003BB6E-286D-4F52-B980-992816892CEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFCFEA34-ABFA-490E-85BF-A7DC12392245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFCFEA34-ABFA-490E-85BF-A7DC12392245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFCFEA34-ABFA-490E-85BF-A7DC12392245}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFCFEA34-ABFA-490E-85BF-A7DC12392245}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F05DE8E6-1CBB-4304-8D41-68D9BB5DF6B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F05DE8E6-1CBB-4304-8D41-68D9BB5DF6B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F05DE8E6-1CBB-4304-8D41-68D9BB5DF6B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F05DE8E6-1CBB-4304-8D41-68D9BB5DF6B6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A1DC06EF-CBFB-4EE7-883D-4BF0369F2654} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+		{0F3235EA-8397-4D99-AB07-DF7987409DD4} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+		{5DE2495F-EC9E-49C5-8211-5ACB44A780A8} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+		{CCC34DD0-4706-44CB-AC03-A0E607F449A2} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+		{A003BB6E-286D-4F52-B980-992816892CEE} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+		{CFCFEA34-ABFA-490E-85BF-A7DC12392245} = {228D7B65-A886-4D86-AED0-F3CB0C61819B}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F155C146-9B35-439E-ADB6-420C772E18F9}
+	EndGlobalSection
+EndGlobal
diff --git a/Master.proj b/Master.proj
@@ -2,129 +2,68 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <BuildFolder>$(MSBuildProjectDirectory)\Build</BuildFolder>
-    <ToolFolder>$(MSBuildProjectDirectory)\Tools</ToolFolder>
-    <SourceFolder>$(MSBuildProjectDirectory)\Source</SourceFolder>
+    <BuildFolder>$(MSBuildProjectDirectory)\artifacts</BuildFolder>
+    <ToolFolder>$(MSBuildProjectDirectory)\tools</ToolFolder>
+    <SourceFolder>$(MSBuildProjectDirectory)\src</SourceFolder>
+    <TestFolder>$(MSBuildProjectDirectory)\test</TestFolder>
 
+    <CoverallsPath>$(ToolFolder)\coveralls.net\tools</CoverallsPath>
     <MSBuildCommunityTasksPath>$(ToolFolder)\MSBuildTasks\tools</MSBuildCommunityTasksPath>
-    <XUnitTasksPath>$(ToolFolder)\xunit.runner.console\tools</XUnitTasksPath>
   </PropertyGroup>
 
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
 
-  <!-- Version Number -->
   <PropertyGroup>
-    <BuildNumber Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
-    <BuildNumber Condition=" '$(BUILD_NUMBER)' != '' ">$(BUILD_NUMBER)</BuildNumber>
-    <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
-
     <BuildConfiguration  Condition=" '$(BuildConfiguration)' == '' ">Release</BuildConfiguration>
-
-    <Major Condition=" '$(Major)' == '' ">1</Major>
-    <Minor Condition=" '$(Minor)' == '' ">0</Minor>
-    <Revision Condition=" '$(Revision)' == '' ">0</Revision>
-
-    <AssemblyVersion>$(Major).0.0.0</AssemblyVersion>
-    <AssemblyFileVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyFileVersion>
-    <AssemblyInformationalVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyInformationalVersion>
-    <PackageVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</PackageVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SolutionFiles Include="*.sln"/>
+  </ItemGroup>
+
   <Target Name="Clean">
     <DeleteTree Directories="**\obj\**;**\bin\**" />
     <DeleteTree Directories="$(BuildFolder)" ContinueOnError="true" />
   </Target>
 
-  <Target Name="Version">
-    <Time>
-      <Output TaskParameter="Year" PropertyName="Year" />
-    </Time>
-
-    <Message Text="Version: $(Major).$(Minor).$(Build).$(Revision)"/>
-
-    <AssemblyInfo CodeLanguage="CS"
-                  OutputFile="Source\GlobalAssemblyInfo.net45.cs"
-                  AssemblyProduct="FluentCommand (.NET 4.5)"
-                  AssemblyDescription="Fluent Wrapper for DbCommand. Built for .NET 4.5"
-                  AssemblyConfiguration="$(BuildConfiguration)"
-                  AssemblyCompany="LoreSoft"
-                  AssemblyCopyright="Copyright © $(Year) LoreSoft"
-                  AssemblyVersion="$(AssemblyVersion)"
-                  AssemblyFileVersion="$(AssemblyFileVersion)"
-                  AssemblyInformationalVersion="$(AssemblyInformationalVersion)"
-                  GenerateClass="true" />
-
-    <AssemblyInfo CodeLanguage="CS"
-                  OutputFile="Source\GlobalAssemblyInfo.net40.cs"
-                  AssemblyProduct="FluentCommand (.NET 4.0)"
-                  AssemblyDescription="Fluent Wrapper for DbCommand. Built for .NET 4.0"
-                  AssemblyConfiguration="$(BuildConfiguration)"
-                  AssemblyCompany="LoreSoft"
-                  AssemblyCopyright="Copyright © $(Year) LoreSoft"
-                  AssemblyVersion="$(AssemblyVersion)"
-                  AssemblyFileVersion="$(AssemblyFileVersion)"
-                  AssemblyInformationalVersion="$(AssemblyInformationalVersion)"
-                  GenerateClass="true" />
-  </Target>
-
-  <Target Name="Compile" DependsOnTargets="Clean;Version">
-
-    <NuGetRestore Solution="$(SourceFolder)\FluentCommand.net45.sln" />
-    <MSBuild Projects="$(SourceFolder)\FluentCommand.net45.sln"
-             Properties="Configuration=$(BuildConfiguration)"/>
-
-    <NuGetRestore Solution="$(SourceFolder)\FluentCommand.net40.sln" />
-    <MSBuild Projects="$(SourceFolder)\FluentCommand.net40.sln"
-             Properties="Configuration=$(BuildConfiguration)"/>
+  <Target Name="Compile" DependsOnTargets="Clean">
+    <exec Command="dotnet build &quot;%(SolutionFiles.Identity)&quot; --configuration $(BuildConfiguration)" />
   </Target>
 
   <Target Name="Test" DependsOnTargets="Compile">
     <ItemGroup>
-      <TestAssemblies Include="$(SourceFolder)\**\*.Tests\bin\$(BuildConfiguration)\**\*.Tests.dll"/>
+      <TestAssemblies Include="$(TestFolder)\**\*.Tests.csproj"/>
     </ItemGroup>
-
-    <Message Text="$(XUnitTasksPath)\xunit.console.exe &quot;%(TestAssemblies.Identity)&quot; -appveyor"/>
 
-    <exec Command="$(XUnitTasksPath)\xunit.console.exe &quot;%(TestAssemblies.Identity)&quot; -appveyor"/>
+    <exec Command="dotnet test &quot;%(TestAssemblies.Identity)&quot; --configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover"
+          WorkingDirectory="$(TestFolder)\%(TestAssemblies.RecursiveDir)"/>
   </Target>
 
-  <Target Name="Package" DependsOnTargets="Test">
-    <MakeDir Directories="$(BuildFolder)" Condition="!EXISTS($(BuildFolder))" />
-
+  <Target Name="Coverage" DependsOnTargets="Test">
     <ItemGroup>
-      <NuGetFiles Include="$(SourceFolder)\**\*.nuspec"/>
+      <CoverageFiles Include="$(TestFolder)\**\coverage.xml"/>
     </ItemGroup>
 
-    <NuGetPack File="%(NuGetFiles.Identity)"
-               OutputDirectory="$(BuildFolder)"
-               Version="$(PackageVersion)"
-               Symbols="true"  />
-  </Target>
+    <Message Text="Coverage File: %(CoverageFiles.Identity)"/>
 
-  <Target Name="Publish" DependsOnTargets="Package">
+    <exec Command="$(CoverallsPath)\csmacnz.coveralls.exe --opencover --input &quot;%(CoverageFiles.Identity)&quot; --jobId $(APPVEYOR_JOB_ID)"
+          WorkingDirectory="$(TestFolder)\%(CoverageFiles.RecursiveDir)"
+          Condition=" '$(APPVEYOR)' == 'True' "/>
+  </Target>
 
-    <!-- 
-      Requires API key to be set ...
-      nuget.exe setapikey <myget-key> -Source https://www.myget.org/F/loresoft/
-    -->
+  <Target Name="Package" DependsOnTargets="Coverage">
+    <MakeDir Directories="$(BuildFolder)" Condition="!EXISTS($(BuildFolder))" />
 
     <ItemGroup>
-      <NuGetPackages Include="$(BuildFolder)\*.nupkg" Exclude="$(BuildFolder)\*.symbols.nupkg"/>
-      <NuGetSymbols Include="$(BuildFolder)\*.symbols.nupkg" />
+      <ProjectFiles Include="$(SourceFolder)\**\*.csproj"/>
     </ItemGroup>
 
-    <!-- Push to MyGet on Build -->
-    <NuGetPush File="%(NuGetPackages.Identity)"
-               Source="https://www.myget.org/F/loresoft/" />
-
-    <!-- Push to Symbols on Build -->
-    <NuGetPush File="%(NuGetSymbols.Identity)"
-               Source="https://nuget.symbolsource.org/MyGet/loresoft" />
+    <exec Command="dotnet pack &quot;%(ProjectFiles.Identity)&quot; --output &quot;$(BuildFolder)&quot; --include-symbols --include-source --configuration $(BuildConfiguration)"
+          WorkingDirectory="$(SourceFolder)\%(ProjectFiles.RecursiveDir)"/>
 
   </Target>
 
-  <Target Name="Build">
-    <CallTarget Targets="Package" />
+  <Target Name="Build" DependsOnTargets="Package">
   </Target>
 
-</Project>
+</Project>