Merge branch 'master' into feature/simplified-symbolfinder

OmniSharp · Nov 12, 2019 · 4c2e55a · 4c2e55a
2 parents 260ac30 + e60f710
commit 4c2e55a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/omnisharp.json b/omnisharp.json
@@ -1,6 +1,6 @@
 {
     "script": {
         "enableScriptNuGetReferences": true,
-        "defaultTargetFramework": "netcoreapp2.1"
+        "defaultTargetFramework": "netcoreapp3.0"
       }
 }
diff --git a/test-assets/test-scripts/DotnetCoreScriptSimple/main.csx b/test-assets/test-scripts/DotnetCoreScriptSimple/main.csx
@@ -1,2 +1,2 @@
-#! "netcoreapp2.0"
+#! "netcoreapp3.0"
 Console.WriteLine("Hello world!");
diff --git a/test-assets/test-scripts/DotnetCoreScriptWithNuget/main.csx b/test-assets/test-scripts/DotnetCoreScriptWithNuget/main.csx
@@ -1,4 +1,4 @@
-#! "netcoreapp2.0"
+#! "netcoreapp3.0"
 #r "nuget: Newtonsoft.Json,11.0.2"
 
 using Newtonsoft.Json;

diff --git a/tests/OmniSharp.Script.Tests/WorkspaceInformationTests.cs b/tests/OmniSharp.Script.Tests/WorkspaceInformationTests.cs
@@ -19,7 +19,7 @@ public class WorkspaceInformationTests : AbstractTestFixture
         private static Dictionary<string, string> s_netCoreScriptingConfiguration = new Dictionary<string, string>
         {
             ["script:enableScriptNuGetReferences"] = "true",
-            ["script:defaultTargetFramework"] = "netcoreapp2.1"
+            ["script:defaultTargetFramework"] = "netcoreapp3.0"
         };
 
         public WorkspaceInformationTests(ITestOutputHelper output)