From 35fb1e522e0a067f5efac5ba42de391d3806f71a Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 14 Nov 2023 15:21:13 +0100 Subject: [PATCH 1/3] updated to latest Roslyn 4.8.0-3.final --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +- src/Dotnet.Script.Core/ScriptPublisher.cs | 2 +- .../Dotnet.Script.DependencyModel.NuGet.csproj | 2 +- src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj | 4 ++-- src/Dotnet.Script/Dotnet.Script.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 31536514..fc33ff5d 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs index 78b51f1d..15452b66 100644 --- a/src/Dotnet.Script.Core/ScriptPublisher.cs +++ b/src/Dotnet.Script.Core/ScriptPublisher.cs @@ -11,7 +11,7 @@ namespace Dotnet.Script.Core { public class ScriptPublisher { - private const string ScriptingVersion = "4.4.0-1.final"; + private const string ScriptingVersion = "4.8.0-3.final"; private readonly ScriptProjectProvider _scriptProjectProvider; private readonly ScriptEmitter _scriptEmitter; diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj index 20d1b4ab..5d81c138 100644 --- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj +++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj @@ -21,6 +21,6 @@ - + diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj index 19a9fd9b..60cc7930 100644 --- a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj +++ b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index f7af5ba1..f25255a8 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -25,7 +25,7 @@ ../dotnet-script.snk - + From 9d199f1716ac4bf8d2291efc58b637d1202a1558 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 14 Nov 2023 15:21:26 +0100 Subject: [PATCH 2/3] use preview lang version in interactive runner --- src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs b/src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs index 99473fd5..4ffcecf4 100644 --- a/src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs +++ b/src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs @@ -26,7 +26,7 @@ public class InteractiveRunner protected ScriptCompiler ScriptCompiler; protected ScriptConsole Console; private readonly string[] _packageSources; - protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Latest, kind: SourceCodeKind.Script); + protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview, kind: SourceCodeKind.Script); protected InteractiveCommandProvider InteractiveCommandParser = new InteractiveCommandProvider(); protected string CurrentDirectory = Directory.GetCurrentDirectory(); From 35d023e44a7f91446d35607d44bca133ad6d1990 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 14 Nov 2023 19:56:19 +0100 Subject: [PATCH 3/3] updated to .NET 8 stable --- global.json | 2 +- src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx | 1 - src/Dotnet.Script/Dotnet.Script.csproj | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 570112b6..090e95c7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.2.23502.2", + "version": "8.0.100", "rollForward": "latestFeature" } } diff --git a/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx b/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx index 29658f1b..ff851bad 100644 --- a/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx +++ b/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx @@ -1,5 +1,4 @@ #r "sdk:Microsoft.NET.Sdk.Web" -#r "nuget:Microsoft.Extensions.DependencyInjection.Abstractions, 8.0.0-rc.2.23479.6" using Microsoft.AspNetCore.Builder; diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index f25255a8..67bb0123 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -30,7 +30,7 @@ -