diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index c388f2b8..ff2f9d10 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -27,7 +27,6 @@ - @@ -37,6 +36,10 @@ + + + + diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs index ef66970a..b07e911e 100644 --- a/src/Dotnet.Script.Core/Scaffolder.cs +++ b/src/Dotnet.Script.Core/Scaffolder.cs @@ -2,12 +2,12 @@ using Dotnet.Script.DependencyModel.Environment; using Dotnet.Script.DependencyModel.Logging; using Dotnet.Script.DependencyModel.Process; -using Newtonsoft.Json.Linq; using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; +using System.Text.Json.Nodes; using System.Text.RegularExpressions; namespace Dotnet.Script.Core @@ -119,7 +119,7 @@ private void CreateOmniSharpConfigurationFile(string currentWorkingDirectory) if (!File.Exists(pathToOmniSharpJson)) { var omniSharpFileTemplate = TemplateLoader.ReadTemplate("omnisharp.json.template"); - JObject settings = JObject.Parse(omniSharpFileTemplate); + var settings = JsonObject.Parse(omniSharpFileTemplate); settings["script"]["defaultTargetFramework"] = _scriptEnvironment.TargetFramework; File.WriteAllText(pathToOmniSharpJson, settings.ToString()); _scriptConsole.WriteSuccess($"...'{pathToOmniSharpJson}' [Created]"); diff --git a/src/Dotnet.Script.Core/Versioning/VersionProvider.cs b/src/Dotnet.Script.Core/Versioning/VersionProvider.cs index f5defd73..b9f9acc6 100644 --- a/src/Dotnet.Script.Core/Versioning/VersionProvider.cs +++ b/src/Dotnet.Script.Core/Versioning/VersionProvider.cs @@ -2,9 +2,8 @@ using System.Linq; using System.Net.Http; using System.Reflection; +using System.Text.Json.Nodes; using System.Threading.Tasks; -using Dotnet.Script.DependencyModel.Logging; -using Newtonsoft.Json.Linq; namespace Dotnet.Script.Core.Versioning { @@ -16,10 +15,10 @@ public class VersionProvider : IVersionProvider private const string UserAgent = "dotnet-script"; private static readonly string RequestUri = "/repos/dotnet-script/dotnet-script/releases/latest"; - /// + /// public async Task GetLatestVersion() { - using(var httpClient = CreateHttpClient()) + using (var httpClient = CreateHttpClient()) { var response = await httpClient.GetStringAsync(RequestUri); return ParseTagName(response); @@ -34,8 +33,8 @@ HttpClient CreateHttpClient() VersionInfo ParseTagName(string json) { - JObject jsonResult = JObject.Parse(json); - return new VersionInfo(jsonResult.SelectToken("tag_name").Value(), isResolved:true); + JsonNode jsonResult = JsonNode.Parse(json); + return new VersionInfo(jsonResult["tag_name"].GetValue(), isResolved: true); } } @@ -43,7 +42,7 @@ VersionInfo ParseTagName(string json) public VersionInfo GetCurrentVersion() { var versionAttribute = typeof(VersionProvider).Assembly.GetCustomAttributes().Single(); - return new VersionInfo(versionAttribute.InformationalVersion, isResolved:true); + return new VersionInfo(versionAttribute.InformationalVersion, isResolved: true); } } } \ No newline at end of file diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj index 5d4bdc9c..2d228cf5 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index 138b3a56..0144d8e3 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -10,7 +10,7 @@ runtime; build; native; contentfiles; analyzers all - + all diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs index 0d56d592..f22e9644 100644 --- a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs +++ b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs @@ -469,7 +469,7 @@ public void ShouldIgnoreGlobalJsonInScriptFolder() public void ShouldIsolateScriptAssemblies() { var (output, _) = ScriptTestRunner.Default.ExecuteFixture("Isolation", "--isolated-load-context"); - Assert.Contains("10.0.0.0", output); + Assert.Contains("2.0.0.0", output); } [Fact] diff --git a/src/Dotnet.Script.Tests/TestFixtures/Isolation/Isolation.csx b/src/Dotnet.Script.Tests/TestFixtures/Isolation/Isolation.csx index 5acb385b..8d2d2427 100644 --- a/src/Dotnet.Script.Tests/TestFixtures/Isolation/Isolation.csx +++ b/src/Dotnet.Script.Tests/TestFixtures/Isolation/Isolation.csx @@ -1,6 +1,3 @@ -#r "nuget:Newtonsoft.Json, 10.0.1" - -using Newtonsoft.Json; - -var version = typeof(JsonConvert).Assembly.GetName().Version; -Console.WriteLine(version); +#r "nuget: Microsoft.Extensions.Logging.Console, 2.0.0" +using Microsoft.Extensions.Logging; +Console.WriteLine(typeof(ConsoleLoggerExtensions).Assembly.GetName().Version); \ No newline at end of file