Permalink
Browse files

Support for .NET Standard (#28)

* update project to dotnet tooling

* update tests and targets

* adjust for net standard 1.5

* add appveyor.yml

* remove old nuget files

* simplify build

* fix appveyor syntax

* put nugets in correct path

* remove duplicate dnr dependency

* convert to xunit

* update tools xunit

* dotnet restore

* restore needs param

* gitversion.yml

* disable generating versions

* less version generated

* rename back

* make fields read only where necessary

* create dummy version infor file

* Revert "create dummy version infor file"

This reverts commit 528bd80.

* ensure failure when tests fail

* fix test

* use xUnit features to set up db tests

* Update appveyor.yml

* make paket manage dependencies

* packaging with paket

* add owners to nupkg

* simplify sln and removed gitlink for now

* fix fixing sln location

* missing dotnet-xunit

* fix csproj

* commited by mistake

* remove conditional
  • Loading branch information...
tpluscode committed May 25, 2018
1 parent 069e347 commit 217afcffb170eb22bce07647de7816416d0e8375
Showing with 3,437 additions and 2,376 deletions.
  1. +2 −0 .gitignore
  2. +296 −0 .paket/Paket.Restore.targets
  3. BIN .paket/paket.exe
  4. +44 −0 TCode.r2rml4net.sln
  5. +23 −0 appveyor.yml
  6. +1 −0 gitversion.yml
  7. +17 −0 paket.dependencies
  8. +1,505 −0 paket.lock
  9. +0 −29 r2rml4net.nuspec
  10. +0 −55 src/FileVersionExtractor/FileVersionExtractor.csproj
  11. +0 −104 src/FileVersionExtractor/GetAssemblyFileVersion.cs
  12. +0 −73 src/FileVersionExtractor/Properties/AssemblyInfo.cs
  13. +7 −6 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/ColumnMappingStrategyTests.cs
  14. +13 −15 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/DirectMappingStrategyTests.cs
  15. +19 −21 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/ForeignKeyMappingStrategyTests.cs
  16. +46 −25 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/PrimaryKeyMappingStrategyTests.cs
  17. +23 −25 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/R2RMLMappingGeneratorCompleteCaseTests.cs
  18. +16 −18 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/R2RMLMappingGeneratorStrategyTests.cs
  19. +14 −15 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/R2RMLMappingGeneratorTests.cs
  20. +7 −7 src/TCode.r2rml4net.Mapping.Tests/DefaultMappingGenerator/SubjectMappingStrategytests.cs
  21. +11 −11 src/TCode.r2rml4net.Mapping.Tests/GraphTestsExtensions.cs
  22. +36 −36 src/TCode.r2rml4net.Mapping.Tests/Mapping/DotnetrdfR2RMLConfigurationTests.cs
  23. +20 −21 src/TCode.r2rml4net.Mapping.Tests/Mapping/GraphMapConfigurationTests.cs
  24. +54 −51 src/TCode.r2rml4net.Mapping.Tests/Mapping/ObjectMapConfigurationTests.cs
  25. +26 −22 src/TCode.r2rml4net.Mapping.Tests/Mapping/PredicateMapConfigurationTests.cs
  26. +27 −29 src/TCode.r2rml4net.Mapping.Tests/Mapping/PredicateObjectMapConfigurationTests.cs
  27. +12 −14 src/TCode.r2rml4net.Mapping.Tests/Mapping/RefObjectMapConfigurationTests.cs
  28. +35 −34 src/TCode.r2rml4net.Mapping.Tests/Mapping/SubjectMapConfigurationTests.cs
  29. +47 −48 src/TCode.r2rml4net.Mapping.Tests/Mapping/TermMapConfigurationTests.cs
  30. +71 −64 src/TCode.r2rml4net.Mapping.Tests/Mapping/TriplesMapConfigurationTests.cs
  31. +14 −16 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/GraphMapConfigurationTests.cs
  32. +35 −37 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/ObjectMapConfigurationTests.cs
  33. +14 −16 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/PredicateMapConfigurationTests.cs
  34. +45 −47 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/PredicateObjectMapConfigurationTests.cs
  35. +14 −15 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/R2RMLLoaderTests.cs
  36. +27 −29 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/RefObjectMapConfigurationTests.cs
  37. +24 −26 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/SubjectMapConfigurationTests.cs
  38. +27 −29 src/TCode.r2rml4net.Mapping.Tests/MappingLoading/TriplesMapConfigurationTests.cs
  39. +0 −4 src/TCode.r2rml4net.Mapping.Tests/Properties/AssemblyInfo.cs
  40. +10 −11 src/TCode.r2rml4net.Mapping.Tests/RDF/BlankNodeReplaceHandlerTests.cs
  41. +13 −13 src/TCode.r2rml4net.Mapping.Tests/RDF/BlankNodeSubjectReplaceHandlerTests.cs
  42. +10 −199 src/TCode.r2rml4net.Mapping.Tests/TCode.r2rml4net.Mapping.Tests.csproj
  43. +0 −12 src/TCode.r2rml4net.Mapping.Tests/packages.config
  44. +11 −0 src/TCode.r2rml4net.Mapping.Tests/paket.references
  45. +0 −11 src/TCode.r2rml4net.Tests/App.Debug.config
  46. +0 −11 src/TCode.r2rml4net.Tests/App.Release.config
  47. +0 −5 src/TCode.r2rml4net.Tests/App.config
  48. +12 −13 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/DatabaseSchemaAdapterCommonTests.cs
  49. +36 −39 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/DatabaseSchemaAdapterTestsBase.cs
  50. +9 −0 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/SqlServerCollection.cs
  51. +39 −68 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/SqlServerDatabaseSchemaAdapterTests.cs
  52. +38 −0 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/SqlServerFixture.cs
  53. +1 −18 src/TCode.r2rml4net.Tests/DatabaseSchemaReader/TestDbScripts/SqlServer.sql
  54. +4 −0 src/TCode.r2rml4net.Tests/FodyWeavers.xml
  55. +22 −20 src/TCode.r2rml4net.Tests/MappingHelperTests.cs
  56. +60 −53 src/TCode.r2rml4net.Tests/MappingOptionsTests.cs
  57. +10 −11 src/TCode.r2rml4net.Tests/Metadata/TableCollectionTests.cs
  58. +13 −14 src/TCode.r2rml4net.Tests/Metadata/TableMetadataTests.cs
  59. +0 −4 src/TCode.r2rml4net.Tests/Properties/AssemblyInfo.cs
  60. +26 −23 src/TCode.r2rml4net.Tests/RDB/ColumnConstrainedDataRecordTests.cs
  61. +15 −14 src/TCode.r2rml4net.Tests/RDB/DatabaseIdentifiersHelperTests.cs
  62. +33 −32 src/TCode.r2rml4net.Tests/RDF/DefaultSQLValuesMappingStrategyTests.cs
  63. +23 −23 src/TCode.r2rml4net.Tests/SqlQueryBuilder/W3cEffectiveSqlBuilderTests.cs
  64. +10 −128 src/TCode.r2rml4net.Tests/TCode.r2rml4net.Tests.csproj
  65. +14 −16 src/TCode.r2rml4net.Tests/TriplesGeneration/MapProcessorBaseTests.cs
  66. +126 −102 src/TCode.r2rml4net.Tests/TriplesGeneration/RDFTermGeneratorTests.cs
  67. +6 −1 src/TCode.r2rml4net.Tests/TriplesGeneration/TriplesGenerationTestsBase.cs
  68. +33 −30 src/TCode.r2rml4net.Tests/TriplesGeneration/W3CPredicateObjectMapProcessorTests.cs
  69. +19 −20 src/TCode.r2rml4net.Tests/TriplesGeneration/W3CR2RMLProcessorTests.cs
  70. +63 −59 src/TCode.r2rml4net.Tests/TriplesGeneration/W3CRefObjectMapProcessorTests.cs
  71. +39 −36 src/TCode.r2rml4net.Tests/TriplesGeneration/W3CTriplesMapProcessorTests.cs
  72. +0 −2 src/TCode.r2rml4net.Tests/Validation/Bcp47RegexLanguageTagValidatorTests.cs
  73. +22 −21 src/TCode.r2rml4net.Tests/Validation/LanguageTagValidatorTestsBase.cs
  74. +0 −2 src/TCode.r2rml4net.Tests/Validation/SimpleLanguageTagValidatorTests.cs
  75. +21 −22 src/TCode.r2rml4net.Tests/Validation/Wc3SqlVersionValidatorTests.cs
  76. +16 −16 src/TCode.r2rml4net.Tests/XsdDatatypesTests.cs
  77. +0 −13 src/TCode.r2rml4net.Tests/packages.config
  78. +11 −0 src/TCode.r2rml4net.Tests/paket.references
  79. +0 −57 src/TCode.r2rml4net.sln
  80. +9 −0 src/TCode.r2rml4net.sln.DotSettings
  81. +16 −16 src/TCode.r2rml4net/Extensions/UriExtensions.cs
  82. +44 −44 src/TCode.r2rml4net/Properties/ProjectAssemblyInfo.cs
  83. +1 −0 src/TCode.r2rml4net/RDB/DatabaseSchemaReader/DatabaseSchemaAdapter.cs
  84. +1 −1 src/TCode.r2rml4net/RDB/DatabaseSchemaReader/MsSQLServerColumTypeMapper.cs
  85. +1 −1 src/TCode.r2rml4net/RDF/DefaultSQLValuesMappingStrategy.cs
  86. +7 −215 src/TCode.r2rml4net/TCode.r2rml4net.csproj
  87. +0 −17 src/TCode.r2rml4net/packages.config
  88. +5 −0 src/TCode.r2rml4net/paket.references
  89. +16 −0 src/TCode.r2rml4net/paket.template
  90. +0 −21 src/after.TCode.r2rml4net.sln.targets
View
@@ -11,3 +11,5 @@ src/TCode.r2rml4net.Mapping/Properties/AssemblyInfo.cs
AssemblyVersionInfo.cs
src/**/VersionAssemblyInfo.cs
*.Cache
.vs
/paket-files/paket.restore.cached

Large diffs are not rendered by default.

Oops, something went wrong.
View
Binary file not shown.
View
@@ -0,0 +1,44 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TCode.r2rml4net", "src\TCode.r2rml4net\TCode.r2rml4net.csproj", "{7C5D6099-CEA0-4D34-84C7-754A92E51798}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TCode.r2rml4net.Tests", "src\TCode.r2rml4net.Tests\TCode.r2rml4net.Tests.csproj", "{A7938022-C641-4470-B22E-0CBBC2D11D5E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TCode.r2rml4net.Mapping.Tests", "src\TCode.r2rml4net.Mapping.Tests\TCode.r2rml4net.Mapping.Tests.csproj", "{B2B367CA-B338-4176-B97B-FB9B5558C4B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EAAEB3C-B182-4E09-BEF1-576977F217BA}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7C5D6099-CEA0-4D34-84C7-754A92E51798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C5D6099-CEA0-4D34-84C7-754A92E51798}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C5D6099-CEA0-4D34-84C7-754A92E51798}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C5D6099-CEA0-4D34-84C7-754A92E51798}.Release|Any CPU.Build.0 = Release|Any CPU
{A7938022-C641-4470-B22E-0CBBC2D11D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7938022-C641-4470-B22E-0CBBC2D11D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7938022-C641-4470-B22E-0CBBC2D11D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7938022-C641-4470-B22E-0CBBC2D11D5E}.Release|Any CPU.Build.0 = Release|Any CPU
{B2B367CA-B338-4176-B97B-FB9B5558C4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2B367CA-B338-4176-B97B-FB9B5558C4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2B367CA-B338-4176-B97B-FB9B5558C4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2B367CA-B338-4176-B97B-FB9B5558C4B0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8697A159-563A-4207-A5FC-44AB2E9C3D6F}
EndGlobalSection
EndGlobal
View
@@ -0,0 +1,23 @@
image: Visual Studio 2017
install:
- choco install gitversion.portable -pre -y
- dotnet restore TCode.r2rml4net.sln
before_build:
- ps: gitversion /l console /output buildserver /updateassemblyinfo
build_script:
- ps: dotnet build -c Release TCode.r2rml4net.sln
- ps: .paket/paket.exe pack --minimum-from-lock-file --version $env:GitVersion_LegacySemVerPadded .
test_script:
- ps: Get-ChildItem -R -File -Filter '*Tests.csproj' | % {
Push-Location $_.Directory;
dotnet xunit;
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) };
Pop-Location
}
artifacts:
- path: '*.nupkg'
View
@@ -0,0 +1 @@
next-version: 0.5
View
@@ -0,0 +1,17 @@
source https://www.nuget.org/api/v2
storage: none
nuget DatabaseSchemaReader
nuget dotNetRDF >= 2
nuget Freezable.Fody
nuget NullGuard.Fody
nuget Resourcer.Fody
nuget moq
nuget xunit
nuget xunit.extensibility.execution
nuget xunit.runner.visualstudio
nuget Xunit.SkippableFact
clitool dotnet-xunit
nuget SqlLocalDb
nuget System.Data.SqlClient
View
1,505 paket.lock

Large diffs are not rendered by default.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 217afcf

Please sign in to comment.