Merge pull request #204 from tbolon/corefx

Migrate to .NET Core

.gitignore

@@ -14,6 +14,12 @@ bin
 *.suo
 *.cache
 Thumbs.db
+.vs
+project.lock.json
+*.project.lock.json
+
+# packages
+src/packages/
 
 # Other useful stuff
 *.bak
@@ -28,11 +34,12 @@ httpd.parse.errors
 
 # Office Temp Files
 ~$*
+
+# NUnit test results
+TestResult.xml
 
-# If you have a deploy folder
-# deploy
-# deploy/*
+# build directory
+build/
 
 # Exclude ALL DLLs? (
-# *.dll
-/build/TestResult.xml
+# *.dll

.travis.yml

@@ -1,12 +1,23 @@
 ---
 language: csharp
-mono:
- - latest
- - 4.2.3
-solution: src/DotLiquid.sln
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty # Ubuntu 14.04
+      sudo: required
+      dotnet: 1.0.0-preview2-003121
+      mono: none
+      env: DOTNETCORE=1
+
 before_install:
   - sudo apt-get install nunit-console
 script:
- - xbuild /p:Configuration=Release src/DotLiquid.sln
- - nunit-console src/DotLiquid.Tests/bin/Release/DotLiquid.Tests.dll
+  - dotnet restore
+  - dotnet build src/DotLiquid/project.json --configuration Release --framework netstandard1.3
+  - dotnet build src/DotLiquid.Website/project.json --configuration Release --framework netcoreapp1.0
+  - dotnet build src/DotLiquid.Tests/project.json --configuration Release --framework netcoreapp1.0
+  - dotnet build src/DotLiquid.Website.Tests/project.json --configuration Release --framework netcoreapp1.0
+  - dotnet test src/DotLiquid.Tests --framework netcoreapp1.0 --where "cat != windows"
+  - dotnet test src/DotLiquid.Website.Tests --framework netcoreapp1.0 --where "cat != windows"
 

appveyor.yml

@@ -1,4 +1,4 @@
-# Build script for dotliquid, see https://www.appveyor.com/docs/appveyor-yml for reference
+# Build script for dotliquid, see https://www.appveyor.com/docs/appveyor-yml for reference
 version: 2.0.{build}
 
 branches:
@@ -13,14 +13,31 @@ assembly_info:
   file: AssemblyInfo.*
   assembly_version: "{version}"
   assembly_file_version: "{version}"
-  assembly_informational_version: "{version}-$(GIT_HASH)"
+  assembly_informational_version: "{version}-$(APPVEYOR_REPO_COMMIT)"
+
+install:
+  - cmd: dotnet restore
 
 build:
   verbosity: minimal # quiet|minimal|normal|detailed
   project: src/DotLiquid.sln
   publish_nuget: true
   publish_nuget_symbols: true
 
+after_build:
+  - cmd: md build\pkg
+  - cmd: nuget pack src/DotLiquid/DotLiquid.nuspec -Symbols -Version "%APPVEYOR_BUILD_VERSION%" -OutputDirectory build\pkg
+
+test:
+  assemblies:
+    # Disabled: ‍‍Could not load file or assembly 'nunit.framework' or one of its dependencies. The system cannot find the file specified.
+    # - '**\bin\Release\netcoreapp1.0\*.Tests.dll'
+    - '**\bin\Release\net451\win7-x64\*.Tests.dll'
+  categories:
+    except:
+      - windows
+
+
 artifacts:
 - path: build\pkg\*.nupkg
   name: Nuget Package

src/DotLiquid.Tests/ContextTests.cs

@@ -137,7 +137,7 @@ public object ToLiquid()
 
         private Context _context;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             _context = new Context();

src/DotLiquid.Tests/CultureHelper.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+
+namespace DotLiquid
+{
+    internal static class CultureHelper
+    {
+        public static IDisposable SetCulture(string name)
+        {
+            var scope = new CultureScope(CultureInfo.CurrentCulture);
+
+#if CORE
+            CultureInfo.CurrentCulture = new CultureInfo(name);
+#else
+            System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
+#endif
+            return scope;
+        }
+
+        private class CultureScope : IDisposable
+        {
+            private readonly CultureInfo culture;
+
+            public CultureScope(CultureInfo culture)
+            {
+                this.culture = culture;
+            }
+
+            public void Dispose()
+            {
+#if CORE
+                CultureInfo.CurrentCulture = this.culture;
+#else
+                System.Threading.Thread.CurrentThread.CurrentCulture =  this.culture;
+#endif
+            }
+        }
+    }
+}