Merge pull request #7 from martinsmith1968/feature/net-standard

Feature/net standard
martinsmith1968 · Dec 28, 2019 · 9a71db9 · 9a71db9
2 parents 5000eb0 + bcfca30
commit 9a71db9
Show file tree

Hide file tree

Showing 35 changed files with 268 additions and 1,115 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,24 +8,23 @@ env:
     NUNIT_RUNNERS_VERSION=3.10.0
 
 language: csharp
+mono: none
+dotnet: 2.2.102
 
 solution: $APPNAME.sln
 
 install:
-  - nuget restore $APPNAME.sln
-  - nuget install NUnit.Runners -Version $NUNIT_RUNNERS_VERSION -OutputDirectory testrunner
+  - dotnet restore
 
 script:
-  # - xbuild /p:Configuration=$CONFIGURATION $APPNAME.sln
-  - msbuild /p:Configuration=$CONFIGURATION $APPNAME.sln
-  - mono ./testrunner/NUnit.ConsoleRunner.$NUNIT_RUNNERS_VERSION/tools/nunit3-console.exe ./Test.$APPNAME/bin/$CONFIGURATION/Test.$APPNAME.dll
-  - ls -laR ./$APPNAME
-  # https://stackoverflow.com/questions/14797525/differences-between-nuget-packing-a-csproj-vs-nuspec
-  - nuget pack ./$APPNAME/$APPNAME.csproj -Verbosity detailed
+  - dotnet build -c $CONFIGURATION
+  - dotnet test -v normal
+  - dotnet pack -c $CONFIGURATION
+  # - ls -laR ./$APPNAME
 
 deploy:
   skip_cleanup: true
   provider: script
-  script: chmod +x ./deploy.sh && ./deploy.sh $APPNAME $NUGET_API_URL $NUGET_API_KEY
+  script: nuget push $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg -Source $NUGET_API_URL -ApiKey $NUGET_API_KEY
   on:
     branch: master
diff --git a/DNX.Helpers.sln b/DNX.Helpers.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29519.181
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNX.Helpers", "DNX.Helpers\DNX.Helpers.csproj", "{BC278532-83D1-4AC0-BA01-E16F237BCBF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DNX.Helpers", "DNX.Helpers\DNX.Helpers.csproj", "{BC278532-83D1-4AC0-BA01-E16F237BCBF9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.DNX.Helpers", "Test.DNX.Helpers\Test.DNX.Helpers.csproj", "{B3666B7C-ADF3-46B1-8955-D3224F4A9C8D}"
 EndProject
@@ -25,7 +25,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".commands", ".commands", "{FB47A44B-A670-480D-8B11-6D02072596D4}"
 	ProjectSection(SolutionItems) = preProject
 		commands.json = commands.json
-		deploy.sh = deploy.sh
 		GenerateMarkdown.cmd = GenerateMarkdown.cmd
 		NuGet.Pack.cmd = NuGet.Pack.cmd
 		NuGet.Push.cmd = NuGet.Push.cmd

diff --git a/DNX.Helpers/Converters/BuiltInTypes/Build.cmd b/DNX.Helpers/Converters/BuiltInTypes/Build.cmd
@@ -4,32 +4,32 @@ SETLOCAL EnableDelayedExpansion
 
 
 REM  :BuildTemplate C#-Type Descriptive-Name
-REM CALL :BuildTemplate bool        Bool
-REM
-REM CALL :BuildTemplate byte        Byte
-REM CALL :BuildTemplate sbyte       SByte
-REM
-REM CALL :BuildTemplate DateTime    DateTime
-REM
-REM CALL :BuildTemplate short       Int16
-REM CALL :BuildTemplate ushort      UInt16
-REM CALL :BuildTemplate short       Short
-REM CALL :BuildTemplate ushort      UShort
-REM
-REM CALL :BuildTemplate int         Int32
-REM CALL :BuildTemplate uint        UInt32
-REM CALL :BuildTemplate int         Int
-REM CALL :BuildTemplate uint        UInt
-REM
-REM CALL :BuildTemplate long        Int64
-REM CALL :BuildTemplate ulong       UInt64
-REM CALL :BuildTemplate long        Long
-REM CALL :BuildTemplate ulong       ULong
-REM
-REM CALL :BuildTemplate float       Float
-REM CALL :BuildTemplate float       Single
-REM CALL :BuildTemplate double      Double
-REM CALL :BuildTemplate decimal     Decimal
+CALL :BuildTemplate bool        Bool
+
+CALL :BuildTemplate byte        Byte
+CALL :BuildTemplate sbyte       SByte
+
+CALL :BuildTemplate DateTime    DateTime
+
+CALL :BuildTemplate short       Int16
+CALL :BuildTemplate ushort      UInt16
+CALL :BuildTemplate short       Short
+CALL :BuildTemplate ushort      UShort
+
+CALL :BuildTemplate int         Int32
+CALL :BuildTemplate uint        UInt32
+CALL :BuildTemplate int         Int
+CALL :BuildTemplate uint        UInt
+
+CALL :BuildTemplate long        Int64
+CALL :BuildTemplate ulong       UInt64
+CALL :BuildTemplate long        Long
+CALL :BuildTemplate ulong       ULong
+
+CALL :BuildTemplate float       Float
+CALL :BuildTemplate float       Single
+CALL :BuildTemplate double      Double
+CALL :BuildTemplate decimal     Decimal
 
 GOTO :EOF