Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
airbreather committed Aug 26, 2019
2 parents f4b62c7 + 2cac885 commit 43437b7
Show file tree
Hide file tree
Showing 38 changed files with 750 additions and 651 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
root = true

[*.cs]
end_of_line = LF
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* text=auto
*.cs diff=csharp
201 changes: 163 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,42 @@
# Created by http://www.gitignore.io

### VisualStudio ###
## 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
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Roslyn cache directories
*.ide/
# 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/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

#NUNIT
# NUNIT
*.VisualState.xml
TestResult.xml

Expand All @@ -37,14 +45,29 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c

# Benchmark Results
BenchmarkDotNet.Artifacts/

# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

# StyleCop
StyleCopReport.xml

# Files built by Visual Studio
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
Expand All @@ -69,14 +92,21 @@ _Chutzpah*
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/
Expand All @@ -89,7 +119,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
Expand All @@ -98,9 +128,18 @@ _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_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
Expand All @@ -112,9 +151,6 @@ AutoTest.Net/
# Installshield output folder
[Ee]xpress/

# VisualStudio
.vs/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
Expand All @@ -131,39 +167,67 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# 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
**/packages/*
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# If using the old MSBuild-Integrated Package Restore, uncomment this:
#!**/packages/repositories.config

# Windows Azure Build Output
!**/[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

# Windows Store app package directory
# 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
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# 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/

# RIA/Silverlight projects
Generated_Code/
Expand All @@ -175,31 +239,92 @@ _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/

# Data generated from unit tests
NetTopologySuite.Samples.Shapefiles/ZMtest.shp
NetTopologySuite.Samples.Shapefiles/ZMtest.shx
NetTopologySuite.Samples.Shapefiles/ZMtest.dbf
NetTopologySuite.Samples.Shapefiles/__empty.dbf
NetTopologySuite.Samples.Shapefiles/__empty.shp
NetTopologySuite.Samples.Shapefiles/__empty.shx
/NetTopologySuite/Algorithm/HCoordinate_DD.cs
/NetTopologySuite/Algorithm/CGAlgorithmsAP.cs
/NetTopologySuite.IO/NetTopologySuite.IO.GeoTools/NetTopologySuite.IO.GeoTools.csproj.DotSettings
NetTopologySuite.Samples.Shapefiles/tmp*.shp
NetTopologySuite.Samples.Shapefiles/tmp*.shx
NetTopologySuite.Samples.Shapefiles/tmp*.dbf
NetTopologySuite.Samples.Shapefiles/test_arcview.shp
NetTopologySuite.Samples.Shapefiles/test_buffer.shp
# 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
.cr/

# 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/
38 changes: 38 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
language: csharp
mono: none
dotnet: 2.2
dist: xenial


before_install:
- sudo apt-get install -y libsqlite3-mod-spatialite


script:
- dotnet build -c Release
- dotnet test -c Release --no-build
- dotnet pack -c Release --no-build -p:NoWarn=NU5105


deploy:


- on:
branch: master
provider: script
script:
- dotnet nuget push **/*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY
skip_cleanup: true


- on:
branch: develop
provider: script
script:
- dotnet nuget push **/*.nupkg -s https://www.myget.org/F/nettopologysuite/api/v2/package -k $MYGET_API_KEY
skip_cleanup: true

env:
global:
- secure: b3Z4ExmvAj93JJWLNmfzbxIOIthAgYzy5JEtz06S0nNxHMphuFlZrv3F9L1dwQ7/7HgO/2ibqAXv1paWElcEfYAJjlJkbA5NVBeGajOIGV22gHqmgMPF+WgDIOP34g2GPLmk8pD+RbVTCuOhfl+9SsyNEP0XRMERIM8FJm9chhlT/IRTfEq5+Xq/Xi3laDebMSNaYDwvdzBi3LLajWV+LzumKTyS2mx6JFJPAh7mOFjsKWda43O1sJyjaiqoWfLq+G+9Usfw+8IDQXz37dpuWiVPtZ1SdYNlUsNHBVM2LTQWPKQlzwUnCTw1JmKU5JotDM8g4P1NKsCyZV8EOF7bbqXGEtzycm1UtaIj3PfKlVPEZyp/5twH4f4h4SmSq4iwVJYuKXg45oepmQUMFkPfzb1V0QC9+oJL2iD+157NhLWyXPu5/VJMH3oj7xvPDhhy4fWkACmqmU5KVWHlHH8JDDuB/wQqnm5FRtX3WwVW/Bql+pHbDcUIm5ruO3Ev2LQ/GczomKsRADpKV4ZlMYxXNAWX+rpvS9aCswiXLO/mGnqgL71z+ybzJwwM/svG3HiA6FGfeeVBHSie5RMrxqf+jV6tgobmroI5lhytp50o7n4HToVzNB8Z3QIAGs8M5Z7N2ca1msnk9Dy+9RnThA6qPqoQipQy8dd3O2Eu+uNFxxE=
- secure: J4RkLqnhs0GmdHP0z1UPcDrW2LGJy3r00bWcdw3wcIXtdKUNRvJSr3AVh8XxXJav9Q659uUnrhYVCd8PSlRRWBaZAvizj3eUQNtqL9YnHhM/TaadRx8wCL/MF/P5ktGBSeCS4Ys0QoqaqQDarJhbOEnHXWK3LCbDbZGNHTfJmF1BL0MxhCP6PaCsP9uuBphxRRhjcPe9cRkZ7TQY0v6AH/BQr0PMmccofesJfewvPvwBYqeaiyucNgc+30v+pwzfxaDjoYDhjdEN1zlfQYYQgyURfnn4a9GjMZWbwDq18OUp61VIl6xFeqSR40mdJvK6aA+0PIOnJaxf43ZqnMhjeGV4ggI8kLHY4NkBJnDVhuI4Dz2B0WchyjVAfvQXV2F9EQF/Ro+cQ/rXXQtkLwa6nUJxdYDa1PgbFLTSIJQGiv9iCm+GpbCxjPf2evCM0M3K2naM6iTyNoD0xNFkcec3RimFIZbeHLTybNL+I52Wb5LHWobO9NCuHQWMeuhRiOMpSkCAaCxEyzXymc/ZGC54Jfxu1p9T8KZvd8unj9tHXvizuaAGOxfpd+HGpdteg4Kmia5YgwjqQj3memDcsSc1Rvz7tEl2CUn0VW59TWbEjAHsj0yX2P+L5XkjfvFA7nL99Dm8HYO7KBzOAc95LDjrGyraXyUY5mVrDIkLCbGR/FE=
10 changes: 10 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>

<PropertyGroup>
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)</SolutionDir>

<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)nts.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

</Project>
Loading

0 comments on commit 43437b7

Please sign in to comment.