diff --git a/.gitignore b/.gitignore index 283682e..78db983 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,79 @@ +# Created by https://www.gitignore.io/api/csharp +# Edit at https://www.gitignore.io/?templates=csharp + +### Csharp ### ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user +*.userosscache *.sln.docstates -# Build results +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs -[Dd]ebug*/ +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ -build/ +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ +# Visual Studio 2017 auto generated files +Generated\ Files/ -[Tt]est[Rr]esult +# MSTest test Results +[Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -32,39 +82,81 @@ build/ *.tli *.tlh *.tmp +*.tmp_proj +*_wpftmp.csproj +*.log *.vspscc *.vssscc .builds - *.pidb - -*.log +*.svclog *.scc + +# Chutzpah Test files +_Chutzpah* + # Visual C++ cache files ipch/ *.aps *.ncb +*.opendb *.opensdf *.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb # Visual Studio profiler *.psess *.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ # Guidance Automation Toolkit *.gpState # ReSharper is a .NET coding add-in _ReSharper*/ - *.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml # NCrunch -*.ncrunch* +_NCrunch_* .*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ # Installshield output folder -[Ee]xpress +[Ee]xpress/ # DocProject is a documentation generator add-in DocProject/buildhelp/ @@ -77,32 +169,176 @@ DocProject/Help/Html2 DocProject/Help/html # Click-Once directory -publish +publish/ # Publish Web Output -*.Publish.xml +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ # Others -[Bb]in -[Oo]bj -sql -TestResults -[Tt]est[Rr]esult* -*.Cache -ClientBin -[Ss]tyle[Cc]op.* +ClientBin/ ~$* +*~ *.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs -*.[Pp]ublish.xml +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ -Generated_Code #added for RIA/Silverlight projects +# RIA/Silverlight projects +Generated_Code/ -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ -# NuGet -packages/ \ No newline at end of file +# End of https://www.gitignore.io/api/csharp \ No newline at end of file diff --git a/DataTableProxy.sln b/DataTableProxy.sln index a5c3dfb..bba97c3 100644 --- a/DataTableProxy.sln +++ b/DataTableProxy.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTableProxy", "DataTableProxy\DataTableProxy.csproj", "{887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{B66501E6-D722-47CD-B342-6ADC0AFEAAB0}" @@ -8,33 +10,37 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|x64.ActiveCfg = Debug|Any CPU + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|x64.Build.0 = Debug|Any CPU {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|x86.ActiveCfg = Debug|Any CPU + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Debug|x86.Build.0 = Debug|Any CPU {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|Any CPU.ActiveCfg = Release|Any CPU {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|Any CPU.Build.0 = Release|Any CPU - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|x64.ActiveCfg = Release|Any CPU + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|x64.Build.0 = Release|Any CPU {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|x86.ActiveCfg = Release|Any CPU - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|Any CPU.ActiveCfg = Debug|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x86.ActiveCfg = Debug|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x86.Build.0 = Debug|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|Any CPU.ActiveCfg = Release|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|Mixed Platforms.Build.0 = Release|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x86.ActiveCfg = Release|x86 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x86.Build.0 = Release|x86 + {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817}.Release|x86.Build.0 = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x64.ActiveCfg = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x64.Build.0 = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x86.ActiveCfg = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Debug|x86.Build.0 = Debug|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|Any CPU.Build.0 = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x64.ActiveCfg = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x64.Build.0 = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x86.ActiveCfg = Release|Any CPU + {B66501E6-D722-47CD-B342-6ADC0AFEAAB0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DataTableProxy/DataTableProxy.csproj b/DataTableProxy/DataTableProxy.csproj index 2a157da..d400d23 100644 --- a/DataTableProxy/DataTableProxy.csproj +++ b/DataTableProxy/DataTableProxy.csproj @@ -1,57 +1,25 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817} - Library - Properties - DataTableProxy - DataTableProxy - v4.0 - 512 + netstandard2.0;net4 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + + DataTableProxy + 1.2 + Tom Dietrich + Converts IEnumerables into Datatables for easy binding. + Copyright 2012 + https://github.com/tdietrich513/DataTableProxy + false + Fluent Syntax, IEnumerable extensions and Reflection features. + Utility DataTable IEnumerable - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true - - - - - - - - - - - - - - + - - \ No newline at end of file diff --git a/DataTableProxy/DataTableProxy.nuspec b/DataTableProxy/DataTableProxy.nuspec deleted file mode 100644 index b9072e0..0000000 --- a/DataTableProxy/DataTableProxy.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - DataTableProxy - 1.2 - $title$ - Tom Dietrich - Tom DIetrich - https://github.com/tdietrich513/DataTableProxy - false - Converts IEnumerables into Datatables for easy binding. - Fluent Syntax, IEnumerable extensions and Reflection features. - Copyright 2012 - Utility DataTable IEnumerable - - diff --git a/DataTableProxy/Properties/AssemblyInfo.cs b/DataTableProxy/Properties/AssemblyInfo.cs deleted file mode 100644 index f4ad3c1..0000000 --- a/DataTableProxy/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("DataTableProxy")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DataTableProxy")] -[assembly: AssemblyCopyright("Copyright © 2010")] -[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("d4802de9-a10c-493a-8bc8-b17a56b113cd")] - -// 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.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/Tests/NUnit/nunit-console-runner.dll b/Tests/NUnit/nunit-console-runner.dll deleted file mode 100644 index 1709ce7..0000000 Binary files a/Tests/NUnit/nunit-console-runner.dll and /dev/null differ diff --git a/Tests/NUnit/nunit.core.dll b/Tests/NUnit/nunit.core.dll deleted file mode 100644 index a1dd698..0000000 Binary files a/Tests/NUnit/nunit.core.dll and /dev/null differ diff --git a/Tests/NUnit/nunit.core.interfaces.dll b/Tests/NUnit/nunit.core.interfaces.dll deleted file mode 100644 index 0ac8788..0000000 Binary files a/Tests/NUnit/nunit.core.interfaces.dll and /dev/null differ diff --git a/Tests/NUnit/nunit.framework.dll b/Tests/NUnit/nunit.framework.dll deleted file mode 100644 index 6856e51..0000000 Binary files a/Tests/NUnit/nunit.framework.dll and /dev/null differ diff --git a/Tests/NUnit/nunit.mocks.dll b/Tests/NUnit/nunit.mocks.dll deleted file mode 100644 index 6ee2c1c..0000000 Binary files a/Tests/NUnit/nunit.mocks.dll and /dev/null differ diff --git a/Tests/NUnit/nunit.util.dll b/Tests/NUnit/nunit.util.dll deleted file mode 100644 index 0b315c2..0000000 Binary files a/Tests/NUnit/nunit.util.dll and /dev/null differ diff --git a/Tests/Program.cs b/Tests/Program.cs deleted file mode 100644 index 017bee7..0000000 --- a/Tests/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Reflection; - -namespace Tests -{ - class Program - { - [STAThread] - static void Main(string[] args) - { - string[] my_args = { Assembly.GetExecutingAssembly().Location }; - - int returnCode = NUnit.ConsoleRunner.Runner.Main(my_args); - - if (returnCode != 0) - Console.Beep(); - } - } -} diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0e401ae..0000000 --- a/Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("AssemblyInfo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AssemblyInfo")] -[assembly: AssemblyCopyright("Copyright © 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("6d087f12-61bc-4655-8425-ef1eff4b9fba")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 666d650..8ed4e74 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,87 +1,15 @@ - - + - Debug - x86 - 8.0.30703 - 2.0 - {B66501E6-D722-47CD-B342-6ADC0AFEAAB0} - Exe - Properties - Tests - Tests - v4.0 - Client - 512 + net452;net472;netcoreapp2.0 + false - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - NUnit\nunit-console-runner.dll - - - False - NUnit\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - - - - - - - {887B4D40-9BFD-4D29-8FA8-9C80FDF8A817} - DataTableProxy - + + + + + + + - - \ No newline at end of file diff --git a/Tests/packages.config b/Tests/packages.config deleted file mode 100644 index 1ec7ed4..0000000 --- a/Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file