Upgrading unit tests projects

Jint.Tests.Ecma/EcmaTest.cs

@@ -14,11 +14,14 @@ namespace Jint.Tests.Ecma
 
         public EcmaTest()
         {
-            var assemblyPath = new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath;
+            var assemblyPath = new Uri(typeof(EcmaTest).GetTypeInfo().Assembly.CodeBase).LocalPath;
             var assemblyDirectory = new FileInfo(assemblyPath).Directory;
 
-            BasePath = assemblyDirectory.Parent.Parent.FullName;
-
+#if NET451
+            BasePath = assemblyDirectory.Parent.Parent.Parent.Parent.FullName;
+#else
+            BasePath = assemblyDirectory.Parent.Parent.Parent.FullName;
+#endif
         }
 
         protected void RunTestCode(string code, bool negative)
@@ -46,7 +49,7 @@ namespace Jint.Tests.Ecma
                 {
                     // exception is expected
                 }
-                
+
             }
             else
             {
@@ -74,11 +77,11 @@ namespace Jint.Tests.Ecma
             {
                 throw new ArgumentException("Could not find source file: " + fullName);
             }
-            
+
             string code = File.ReadAllText(fullName);
 
             RunTestCode(code, negative);
-            
+
         }
     }
 

Jint.Tests.Ecma/Jint.Tests.Ecma.xproj

@@ -4,7 +4,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>2cc1f6a6-7dcc-4c7c-a619-ace1a4296446</ProjectGuid>
@@ -13,9 +12,14 @@
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <DnxInvisibleFolder Include="TestCases\" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

Jint.Tests.Ecma/project.json

@@ -1,13 +1,22 @@
 {
   "version": "1.0.0-*",
-
+  "testRunner": "xunit",
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "Jint": "*",
+    "xunit": "2.2.0-*",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
   },
-
   "frameworks": {
-    "netstandard1.6": {
-      "imports": "dnxcore50"
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
+        }
+      }
+    },
+    "net451": {
+      "buildOptions": { }
     }
   }
-}
+}

Jint.Tests/Jint.Tests.xproj

@@ -4,7 +4,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>9fbcab58-fe6d-4804-92b8-7cf886113708</ProjectGuid>
@@ -13,9 +12,11 @@
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

Jint.Tests/Parser/JavascriptParserTests.cs

@@ -14,6 +14,22 @@ namespace Jint.Tests.Parser
     {
         private readonly JavaScriptParser _parser = new JavaScriptParser();
 
+        private string GetEmbeddedFile(string filename)
+        {
+            const string prefix = "Jint.Tests.Parser.Scripts.";
+
+            var assembly = typeof(JavascriptParserTests).GetTypeInfo().Assembly;
+            var scriptPath = prefix + filename;
+
+            using (var stream = assembly.GetManifestResourceStream(scriptPath))
+            {
+                using (var sr = new StreamReader(stream))
+                {
+                    return sr.ReadToEnd();
+                }
+            }
+        }
+
         [Theory]
         [InlineData("jQuery.js", "1.9.1")]
         [InlineData("underscore.js", "1.5.2")]
@@ -24,29 +40,15 @@ namespace Jint.Tests.Parser
         [InlineData("handlebars.js", "2.0.0")]
         public void ShouldParseScriptFile(string file, string version)
         {
-            const string prefix = "Jint.Tests.Parser.Scripts.";
 
-            var assembly = Assembly.GetExecutingAssembly();
-            var scriptPath = prefix + file;
+            var parser = new JavaScriptParser();
+            var source = GetEmbeddedFile(file);
             var sw = new Stopwatch();
-
-            using (var stream = assembly.GetManifestResourceStream(scriptPath))
-            {
-                if (stream != null)
-                {
-                    using (var sr = new StreamReader(stream))
-                    {
-                        var source = sr.ReadToEnd();
-                        sw.Restart();
-                        var parser = new JavaScriptParser();
-                        var program = parser.Parse(source);
-                        Console.WriteLine("Parsed {0} {1} ({3} KB) in {2} ms", file, version, sw.ElapsedMilliseconds, (int)source.Length/1024);
-                        Assert.NotNull(program);
-                    }
-                }
-            }
+            var program = parser.Parse(source);
+            Console.WriteLine("Parsed {0} {1} ({3} KB) in {2} ms", file, version, sw.ElapsedMilliseconds, (int)source.Length/1024);
+            Assert.NotNull(program);
         }
-        
+
         [Fact]
         public void ShouldParseThis()
         {

Jint.Tests/ReplaceCulture.cs

@@ -0,0 +1,95 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Threading;
+using Xunit.Sdk;
+
+namespace Jint.Tests
+{
+    /// <summary>
+    /// Replaces the current culture and UI culture for the test.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method)]
+    public class ReplaceCultureAttribute : BeforeAfterTestAttribute
+    {
+        private CultureInfo _originalCulture;
+        private CultureInfo _originalUICulture;
+
+        /// <summary>
+        /// Replaces the current culture and UI culture based on specified value.
+        /// </summary>
+        public ReplaceCultureAttribute(string currentCulture) : this(currentCulture, currentCulture)
+        {
+        }
+
+        /// <summary>
+        /// Replaces the current culture and UI culture based on specified values.
+        /// </summary>
+        public ReplaceCultureAttribute(string currentCulture, string currentUICulture)
+        {
+            Culture = new CultureInfo(currentCulture);
+            UICulture = new CultureInfo(currentUICulture);
+        }
+
+#if NET451
+        /// <summary>
+        /// The <see cref="Thread.CurrentCulture"/> for the test. Defaults to en-GB.
+        /// </summary>
+        /// <remarks>
+        /// en-GB is used here as the default because en-US is equivalent to the InvariantCulture. We
+        /// want to be able to find bugs where we're accidentally relying on the Invariant instead of the
+        /// user's culture.
+        /// </remarks>
+#else
+        /// <summary>
+        /// The <see cref="CultureInfo.CurrentCulture"/> for the test. Defaults to en-GB.
+        /// </summary>
+        /// <remarks>
+        /// en-GB is used here as the default because en-US is equivalent to the InvariantCulture. We
+        /// want to be able to find bugs where we're accidentally relying on the Invariant instead of the
+        /// user's culture.
+        /// </remarks>
+#endif
+        public CultureInfo Culture { get; }
+
+#if NET451
+        /// <summary>
+        /// The <see cref="Thread.CurrentUICulture"/> for the test. Defaults to en-US.
+        /// </summary>
+#else
+        /// <summary>
+        /// The <see cref="CultureInfo.CurrentUICulture"/> for the test. Defaults to en-US.
+        /// </summary>
+#endif
+        public CultureInfo UICulture { get; }
+
+        public override void Before(MethodInfo methodUnderTest)
+        {
+            _originalCulture = CultureInfo.CurrentCulture;
+            _originalUICulture = CultureInfo.CurrentUICulture;
+
+#if NET451
+            Thread.CurrentThread.CurrentCulture = Culture;
+            Thread.CurrentThread.CurrentUICulture = UICulture;
+#else
+            CultureInfo.CurrentCulture = Culture;
+            CultureInfo.CurrentUICulture = UICulture;
+#endif
+
+        }
+
+        public override void After(MethodInfo methodUnderTest)
+        {
+#if NET451
+            Thread.CurrentThread.CurrentCulture = _originalCulture;
+            Thread.CurrentThread.CurrentUICulture = _originalUICulture;
+#else
+            CultureInfo.CurrentCulture = _originalCulture;
+            CultureInfo.CurrentUICulture = _originalUICulture;
+#endif
+        }
+    }
+}

Jint.Tests/Runtime/EngineTests.cs

@@ -38,22 +38,20 @@ namespace Jint.Tests.Runtime
             _engine.Execute(source);
         }
 
-        [Theory]
-        [InlineData("Scratch.js")]
-        public void ShouldInterpretScriptFile(string file)
+        private string GetEmbeddedFile(string filename)
         {
             const string prefix = "Jint.Tests.Runtime.Scripts.";
 
-            var assembly = Assembly.GetExecutingAssembly();
-            var scriptPath = prefix + file;
+            var assembly = typeof(EngineTests).GetTypeInfo().Assembly;
+            var scriptPath = prefix + filename;
 
             using (var stream = assembly.GetManifestResourceStream(scriptPath))
-                if (stream != null)
-                    using (var sr = new StreamReader(stream))
-                    {
-                        var source = sr.ReadToEnd();
-                        RunTest(source);
-                    }
+            {
+                using (var sr = new StreamReader(stream))
+                {
+                    return sr.ReadToEnd();
+                }
+            }
         }
 
         [Theory]
@@ -977,11 +975,10 @@ namespace Jint.Tests.Runtime
         }
 
         [Fact]
+        [ReplaceCulture("fr-FR")]
         public void ShouldBeCultureInvariant()
         {
             // decimals in french are separated by commas
-            Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("fr-FR");
-
             var engine = new Engine();
 
             var result = engine.Execute("1.2 + 2.1").GetCompletionValue().AsNumber();
@@ -1040,19 +1037,27 @@ namespace Jint.Tests.Runtime
         [Fact]
         public void UtcShouldUseUtc()
         {
-            const string customName = "Custom Time";
-            var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(7, 11, 0), customName, customName, customName, null, false);
+            var customTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Central Europe Standard Time");
+
             var engine = new Engine(cfg => cfg.LocalTimeZone(customTimeZone));
 
             var result = engine.Execute("Date.UTC(1970,0,1)").GetCompletionValue().AsNumber();
             Assert.Equal(0, result);
         }
 
+#if NET451
         [Fact]
+#else
+        [Fact(Skip = "CreateCustomTimeZone not available on netstandard")]
+#endif
         public void ShouldUseLocalTimeZoneOverride()
         {
+#if NET451
             const string customName = "Custom Time";
             var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(0, 11, 0), customName, customName, customName, null, false);
+#else
+        var customTimeZone = TimeZoneInfo.Utc;
+#endif
 
             var engine = new Engine(cfg => cfg.LocalTimeZone(customTimeZone));
 
@@ -1094,8 +1099,12 @@ namespace Jint.Tests.Runtime
         [InlineData("1970-01-01T00:00:00.000-00:00")]
         public void ShouldParseAsUtc(string date)
         {
+#if NET451
             const string customName = "Custom Time";
             var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(7, 11, 0), customName, customName, customName, null, false);
+#else
+            var customTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Tonga Standard Time");
+#endif
             var engine = new Engine(cfg => cfg.LocalTimeZone(customTimeZone));
 
             engine.SetValue("d", date);
@@ -1104,7 +1113,11 @@ namespace Jint.Tests.Runtime
             Assert.Equal(0, result);
         }
 
+#if NET451
         [Theory]
+#else
+        [Theory(Skip = "CreateCustomTimeZone not available on netstandard")]
+#endif
         [InlineData("1970/01")]
         [InlineData("1970/01/01")]
         [InlineData("1970/01/01T00:00")]
@@ -1123,10 +1136,14 @@ namespace Jint.Tests.Runtime
         [InlineData("1970-01-01T00:00:00.000+00:11")]
         public void ShouldParseAsLocalTime(string date)
         {
-            const string customName = "Custom Time";
             const int timespanMinutes = 11;
             const int msPriorMidnight = -timespanMinutes * 60 * 1000;
+#if NET451
+            const string customName = "Custom Time";
             var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(0, timespanMinutes, 0), customName, customName, customName, null, false);
+#else
+    var customTimeZone = TimeZoneInfo.Utc;
+#endif
             var engine = new Engine(cfg => cfg.LocalTimeZone(customTimeZone)).SetValue("d", date);
 
             var result = engine.Execute("Date.parse(d);").GetCompletionValue().AsNumber();
@@ -1150,8 +1167,7 @@ namespace Jint.Tests.Runtime
         [Theory, MemberData("TestDates")]
         public void TestDateToISOStringFormat(DateTime testDate)
         {
-            const string customName = "Custom Time";
-            var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(+13, 0, 0), customName, customName, customName, null, false);
+            var customTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Tonga Standard Time");
 
             var engine = new Engine(ctx => ctx.LocalTimeZone(customTimeZone));
             var testDateTimeOffset = new DateTimeOffset(testDate, customTimeZone.GetUtcOffset(testDate));
@@ -1163,17 +1179,22 @@ namespace Jint.Tests.Runtime
         [Theory, MemberData("TestDates")]
         public void TestDateToStringFormat(DateTime testDate)
         {
-            const string customName = "Custom Time";
-            var customTimeZone = TimeZoneInfo.CreateCustomTimeZone(customName, new TimeSpan(+13, 0, 0), customName, customName, customName, null, false);
+            var customTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Tonga Standard Time");
 
             var engine = new Engine(ctx => ctx.LocalTimeZone(customTimeZone));
             var testDateTimeOffset = new DateTimeOffset(testDate, customTimeZone.GetUtcOffset(testDate));
             engine.Execute(
                 string.Format("var d = new Date({0},{1},{2},{3},{4},{5},{6});", testDateTimeOffset.Year, testDateTimeOffset.Month - 1, testDateTimeOffset.Day, testDateTimeOffset.Hour, testDateTimeOffset.Minute, testDateTimeOffset.Second, testDateTimeOffset.Millisecond));
-            Assert.Equal(testDateTimeOffset.ToString("ddd MMM dd yyyy HH:mm:ss 'GMT'zzz"), engine.Execute("d.toString();").GetCompletionValue().ToString());
+
+            var expected = testDateTimeOffset.ToString("ddd MMM dd yyyy HH:mm:ss 'GMT'zzz");
+            var actual = engine.Execute("d.toString();").GetCompletionValue().ToString();
+
+            Assert.Equal(expected, actual);
         }
 
-#endregion //DateParsingAndStrings
+#endregion
+
+        //DateParsingAndStrings
         [Fact]
         public void EmptyStringShouldMatchRegex()
         {
@@ -1186,8 +1207,7 @@ namespace Jint.Tests.Runtime
         [Fact]
         public void ShouldExecuteHandlebars()
         {
-            var url = "http://cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.js";
-            var content = new WebClient().DownloadString(url);
+            var content = GetEmbeddedFile("handlebars.js");
 
             RunTest(content);
 
@@ -1672,8 +1692,9 @@ namespace Jint.Tests.Runtime
         public void DateToStringMethodsShouldUseCurrentTimeZoneAndCulture()
         {
             // Forcing to PDT and FR for tests
-            var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
-            var FR = CultureInfo.GetCultureInfo("fr-FR");
+            // var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
+            var PDT = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+            var FR = new CultureInfo("fr-FR");
 
             var engine = new Engine(options => options.LocalTimeZone(PDT).Culture(FR))
                 .SetValue("log", new Action<object>(Console.WriteLine))
@@ -1715,8 +1736,9 @@ namespace Jint.Tests.Runtime
         public void DateShouldParseToString()
         {
             // Forcing to PDT and FR for tests
-            var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
-            var FR = CultureInfo.GetCultureInfo("fr-FR");
+            // var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
+            var PDT = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+            var FR = new CultureInfo("fr-FR");
 
             new Engine(options => options.LocalTimeZone(PDT).Culture(FR))
                 .SetValue("log", new Action<object>(Console.WriteLine))
@@ -1733,8 +1755,9 @@ namespace Jint.Tests.Runtime
         public void LocaleNumberShouldUseLocalCulture()
         {
             // Forcing to PDT and FR for tests
-            var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
-            var FR = CultureInfo.GetCultureInfo("fr-FR");
+            // var PDT = TimeZoneInfo.CreateCustomTimeZone("Pacific Daylight Time", new TimeSpan(-7, 0, 0), "Pacific Daylight Time", "Pacific Daylight Time");
+            var PDT = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+            var FR = new CultureInfo("fr-FR");
 
             new Engine(options => options.LocalTimeZone(PDT).Culture(FR))
                 .SetValue("log", new Action<object>(Console.WriteLine))

Jint.Tests/Runtime/InteropTests.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
 using Jint.Native;
 using Jint.Native.Object;
 using Jint.Tests.Runtime.Converters;
@@ -15,7 +17,7 @@ namespace Jint.Tests.Runtime
 
         public InteropTests()
         {
-            _engine = new Engine(cfg => cfg.AllowClr(typeof(Shape).Assembly))
+            _engine = new Engine(cfg => cfg.AllowClr(typeof(Shape).GetTypeInfo().Assembly))
                 .SetValue("log", new Action<object>(Console.WriteLine))
                 .SetValue("assert", new Action<bool>(Assert.True))
                 .SetValue("equal", new Action<object, object>(Assert.Equal))
@@ -327,19 +329,19 @@ namespace Jint.Tests.Runtime
         [Fact]
         public void CanUseIndexOnList()
         {
-            var arrayList = new System.Collections.ArrayList(2);
-            arrayList.Add("Mickey Mouse");
-            arrayList.Add("Goofy");
+            var list = new List<object>(2);
+            list.Add("Mickey Mouse");
+            list.Add("Goofy");
 
-            _engine.SetValue("dictionary", arrayList);
+            _engine.SetValue("list", list);
 
             RunTest(@"
-                dictionary[1] = 'Donald Duck';
-                assert(dictionary[1] === 'Donald Duck');
+                list[1] = 'Donald Duck';
+                assert(list[1] === 'Donald Duck');
             ");
 
-            Assert.Equal("Mickey Mouse", arrayList[0]);
-            Assert.Equal("Donald Duck", arrayList[1]);
+            Assert.Equal("Mickey Mouse", list[0]);
+            Assert.Equal("Donald Duck", list[1]);
         }
 
         [Fact]

Jint.Tests/Runtime/Scripts/Scratch.js

@@ -1,6 +0,0 @@
-(function () {
-   
-
-
-
-})();

Jint.Tests/project.json

@@ -1,13 +1,21 @@
 {
   "version": "1.0.0-*",
-
+  "testRunner": "xunit",
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "Jint": "*",
+    "xunit": "2.2.0-*",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
   },
-
+  "buildOptions": { "embed": [ "Runtime/Scripts/*.*", "Parser/Scripts/*.*" ] },
   "frameworks": {
-    "netstandard1.6": {
-      "imports": "dnxcore50"
-    }
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
+        }
+      }
+    },
+    "net451": {}
   }
-}
+}

Jint.sln

@@ -16,6 +16,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Jint.Benchmark", "Jint.Benc
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Jint.Repl", "Jint.Repl\Jint.Repl.xproj", "{BB3AC010-C2CE-41A5-93C6-763600EF67B3}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Jint.Tests", "Jint.Tests\Jint.Tests.xproj", "{9FBCAB58-FE6D-4804-92B8-7CF886113708}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Jint.Tests.Ecma", "Jint.Tests.Ecma\Jint.Tests.Ecma.xproj", "{2CC1F6A6-7DCC-4C7C-A619-ACE1A4296446}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +38,14 @@ Global
 		{BB3AC010-C2CE-41A5-93C6-763600EF67B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB3AC010-C2CE-41A5-93C6-763600EF67B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB3AC010-C2CE-41A5-93C6-763600EF67B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FBCAB58-FE6D-4804-92B8-7CF886113708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FBCAB58-FE6D-4804-92B8-7CF886113708}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FBCAB58-FE6D-4804-92B8-7CF886113708}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FBCAB58-FE6D-4804-92B8-7CF886113708}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC1F6A6-7DCC-4C7C-A619-ACE1A4296446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC1F6A6-7DCC-4C7C-A619-ACE1A4296446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC1F6A6-7DCC-4C7C-A619-ACE1A4296446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC1F6A6-7DCC-4C7C-A619-ACE1A4296446}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Jint/project.json

@@ -32,11 +32,6 @@
      }
     },
     "netstandard1.3": {
-      "buildOptions": {
-        "define": [
-          "NETSTANDARD1_3"
-        ]
-      },
       "dependencies": {
         "NETStandard.Library": "1.6.0",
         "System.Diagnostics.Contracts": "4.0.1",