From 1838770fe002fe80d25fb350080049286a83c7b1 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 26 Sep 2022 12:03:34 +0200 Subject: [PATCH 1/6] Use System.Text.Json in Scaffolder --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 4 ++++ src/Dotnet.Script.Core/Scaffolder.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index c388f2b8..2de91c37 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -37,6 +37,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]"); From 903108d9c23ab99708c4ac4835b89812b1c48c4f Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 26 Sep 2022 12:39:59 +0200 Subject: [PATCH 2/6] Use System.Text.Json in VersionProvider --- .../Versioning/VersionProvider.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 From 8f625eae2a5c6b708be454ca97b3e332a1ffe2f5 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 26 Sep 2022 13:11:43 +0200 Subject: [PATCH 3/6] Use Microsoft.Extensions.Logging.Console for isolation test --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 1 - src/Dotnet.Script.Tests/ScriptExecutionTests.cs | 2 +- .../TestFixtures/Isolation/Isolation.csx | 9 +++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 2de91c37..ff2f9d10 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -27,7 +27,6 @@ - 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 From 9a2bf67fa7e4c2c218099d4cc59ff34acce0bb3a Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 26 Sep 2022 14:10:48 +0200 Subject: [PATCH 4/6] Bump Microsoft.NET.Test.Sdk --- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 8564f7373cee11c5611c7b2d8e2e6826372bccd4 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 26 Sep 2022 18:38:39 +0200 Subject: [PATCH 5/6] Bump Nuget.ProjectModel to 6.3.0 --- .../Dotnet.Script.DependencyModel.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj index 5d4bdc9c..bf95c43a 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -32,7 +32,7 @@ - + From 7df494b77c7d6e77204e2074796fb88d02b7a6ee Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 27 Sep 2022 11:39:37 +0200 Subject: [PATCH 6/6] Use NuGet.ProjectModel 6.2.0 --- .../Dotnet.Script.DependencyModel.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj index bf95c43a..2d228cf5 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -32,7 +32,7 @@ - +