From d8a0db434c7d12f0f8164fe5a2d980cfd3fae7dd Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Mon, 4 Nov 2024 23:50:11 +0100 Subject: [PATCH 01/15] Initial support for .net 9 --- .github/workflows/main.yml | 9 +++------ global.json | 2 +- src/.vscode/tasks.json | 2 +- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +- src/Dotnet.Script/Dotnet.Script.csproj | 10 ++++------ 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1097e20..1072bdeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,9 +12,8 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Install dotnet-script run: dotnet tool install dotnet-script --global @@ -31,9 +30,8 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Install dotnet-script run: dotnet tool install dotnet-script --global @@ -50,9 +48,8 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Install dotnet-script run: dotnet tool install dotnet-script --global diff --git a/global.json b/global.json index 090e95c7..bbaf16e9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.0-rc.2.24473.5", "rollForward": "latestFeature" } } diff --git a/src/.vscode/tasks.json b/src/.vscode/tasks.json index e35e8bda..d778ce8d 100644 --- a/src/.vscode/tasks.json +++ b/src/.vscode/tasks.json @@ -46,7 +46,7 @@ "-c", "release", "-f", - "net7.0", + "net9.0", "${workspaceFolder}/Dotnet.Script.Tests/DotNet.Script.Tests.csproj" ], "problemMatcher": "$msCompile", diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 6d202df0..6a486f79 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -4,7 +4,7 @@ A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn. 1.5.0 filipw - net8.0;net7.0;net6.0;netstandard2.0 + net9.0;net8.0;netstandard2.0 Dotnet.Script.Core Dotnet.Script.Core script;csx;csharp;roslyn diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index 671dd886..a743d91c 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -1,6 +1,6 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 false true ../dotnet-script.snk diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index 67bb0123..260c1656 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -5,7 +5,7 @@ 1.5.0 filipw Dotnet.Script - net8.0;net7.0;net6.0 + net9.0;net8.0 portable dotnet-script Exe @@ -27,11 +27,9 @@ - - - + + + From f83e2b6ebec178544eca475a1490e4c9cfe5a348 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Wed, 6 Nov 2024 13:36:39 +0100 Subject: [PATCH 02/15] Bump dotnet.build --- build/Build.csx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Build.csx b/build/Build.csx index 684f6602..b779a55b 100644 --- a/build/Build.csx +++ b/build/Build.csx @@ -1,4 +1,4 @@ -#load "nuget:Dotnet.Build, 0.7.1" +#load "nuget:Dotnet.Build, 0.23.0 " #load "nuget:dotnet-steps, 0.0.1" #load "nuget:github-changelog, 0.1.5" #load "BuildContext.csx" From 978664c038c8f3b935307599584e3d1360706bc5 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Wed, 6 Nov 2024 13:49:35 +0100 Subject: [PATCH 03/15] Fix pushing Nuget packages --- build/Build.csx | 3 ++- build/BuildContext.csx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/Build.csx b/build/Build.csx index b779a55b..bc0c9b47 100644 --- a/build/Build.csx +++ b/build/Build.csx @@ -86,7 +86,8 @@ private async Task PublishRelease() Git.Default.RequireCleanWorkingTree(); await ReleaseManagerFor(owner, projectName, BuildEnvironment.GitHubAccessToken) .CreateRelease(Git.Default.GetLatestTag(), pathToReleaseNotes, new[] { new ZipReleaseAsset(pathToGitHubReleaseAsset) }); - NuGet.TryPush(nuGetArtifactsFolder); + + DotNet.TryPush(nuGetArtifactsFolder); } } diff --git a/build/BuildContext.csx b/build/BuildContext.csx index 6cf4505b..1cfeeb07 100644 --- a/build/BuildContext.csx +++ b/build/BuildContext.csx @@ -1,4 +1,4 @@ -#load "nuget:Dotnet.Build, 0.7.1" +#load "nuget:Dotnet.Build, 0.23.0" using static FileUtils; using System.Xml.Linq; @@ -7,7 +7,7 @@ const string GlobalToolPackageId = "dotnet-script"; var owner = "filipw"; var projectName = "dotnet-script"; var root = FileUtils.GetScriptFolder(); -var solutionFolder = Path.Combine(root,"..","src"); +var solutionFolder = Path.Combine(root, "..", "src"); var dotnetScriptProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script"); var dotnetScriptCoreProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Core"); var dotnetScriptDependencyModelProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel"); From 0d7dd22329f325961a15fc9467c23525615587bc Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 00:19:39 +0100 Subject: [PATCH 04/15] Publish .net8 --- build/Build.csx | 4 ++-- build/omnisharp.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Build.csx b/build/Build.csx index bc0c9b47..99658e1f 100644 --- a/build/Build.csx +++ b/build/Build.csx @@ -1,4 +1,4 @@ -#load "nuget:Dotnet.Build, 0.23.0 " +#load "nuget:Dotnet.Build, 0.23.0" #load "nuget:dotnet-steps, 0.0.1" #load "nuget:github-changelog, 0.1.5" #load "BuildContext.csx" @@ -33,7 +33,7 @@ await StepRunner.Execute(Args); private void CreateGitHubReleaseAsset() { - DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, "net6.0"); + DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, "net8.0"); Zip(publishArchiveFolder, pathToGitHubReleaseAsset); } diff --git a/build/omnisharp.json b/build/omnisharp.json index 74b7fc1b..945a3c21 100644 --- a/build/omnisharp.json +++ b/build/omnisharp.json @@ -1,6 +1,6 @@ { "script": { "enableScriptNuGetReferences": true, - "defaultTargetFramework": "net6.0" + "defaultTargetFramework": "net8.0" } } \ No newline at end of file From 20c3eb3a7d7780203ac9698d4924dcf08d208944 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 13:48:52 +0100 Subject: [PATCH 05/15] Add test step for windows --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1072bdeb..ed396be5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,9 @@ jobs: - name: Install dotnet-script run: dotnet tool install dotnet-script --global + - name: Run tests + run: dotnet test -c release src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj + - name: Run build script run: dotnet-script build/Build.csx env: # Or as an environment variable From bb77c95b5d92c1d595d4b6a9d449660080f06079 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 14:14:39 +0100 Subject: [PATCH 06/15] Run net9 tests only --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed396be5..4c013f36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: run: dotnet tool install dotnet-script --global - name: Run tests - run: dotnet test -c release src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj + run: dotnet test -c release -f net9 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj - name: Run build script run: dotnet-script build/Build.csx From e36ed459a214f2bdd2cf1b7f30861d07bb2c1a6e Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 14:21:47 +0100 Subject: [PATCH 07/15] Only run tests for net9 --- 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 a743d91c..159328e9 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -1,6 +1,6 @@ - net9.0;net8.0 + net9.0 false true ../dotnet-script.snk From f8fc4165b9ca86555f80d21877c7ef89cb831d74 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 14:43:32 +0100 Subject: [PATCH 08/15] Run tests for net8.0 and net9.0 in sequence --- .github/workflows/main.yml | 3 --- build/Build.csx | 3 ++- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c013f36..1072bdeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,9 +54,6 @@ jobs: - name: Install dotnet-script run: dotnet tool install dotnet-script --global - - name: Run tests - run: dotnet test -c release -f net9 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj - - name: Run build script run: dotnet-script build/Build.csx env: # Or as an environment variable diff --git a/build/Build.csx b/build/Build.csx index 99658e1f..b1de2829 100644 --- a/build/Build.csx +++ b/build/Build.csx @@ -58,7 +58,8 @@ private void CreateNuGetPackages() private void RunTests() { - DotNet.Test(testProjectFolder); + Command.Execute("dotnet", "test -c release -f net8.0", testProjectFolder); + Command.Execute("dotnet", "test -c release -f net9.0", testProjectFolder); if (BuildEnvironment.IsWindows) { DotNet.Test(testDesktopProjectFolder); diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index 159328e9..a743d91c 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net9.0;net8.0 false true ../dotnet-script.snk From 529733c3754ece513dec7a3fb16db9337d0edb05 Mon Sep 17 00:00:00 2001 From: Filip W Date: Tue, 12 Nov 2024 15:55:50 +0000 Subject: [PATCH 09/15] case sensitivity for tests --- build/Build.csx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.csx b/build/Build.csx index b1de2829..3aa8a709 100644 --- a/build/Build.csx +++ b/build/Build.csx @@ -58,8 +58,8 @@ private void CreateNuGetPackages() private void RunTests() { - Command.Execute("dotnet", "test -c release -f net8.0", testProjectFolder); - Command.Execute("dotnet", "test -c release -f net9.0", testProjectFolder); + Command.Execute("dotnet", "test -c Release -f net8.0", testProjectFolder); + Command.Execute("dotnet", "test -c Release -f net9.0", testProjectFolder); if (BuildEnvironment.IsWindows) { DotNet.Test(testDesktopProjectFolder); From bb2b6bcecf3b3a237b7674f4acce0b634b736f73 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 21:42:51 +0100 Subject: [PATCH 10/15] Bumped deps --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 8 ++++---- .../Dotnet.Script.DependencyModel.NuGet.csproj | 9 ++++----- .../Dotnet.Script.DependencyModel.csproj | 13 ++++--------- .../Dotnet.Script.Desktop.Tests.csproj | 9 +++------ .../Dotnet.Script.Extras.csproj | 12 +++++------- .../Dotnet.Script.Shared.Tests.csproj | 7 ++----- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 1 + src/Dotnet.Script/Dotnet.Script.csproj | 7 +++---- 8 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 6a486f79..4260d682 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -24,9 +24,9 @@ - - - + + + @@ -38,4 +38,4 @@ - + \ No newline at end of file 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 5d81c138..3daa5ba7 100644 --- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj +++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj @@ -1,5 +1,5 @@ - - + + netstandard2.0 MIT @@ -16,11 +16,10 @@ true ../dotnet-script.snk - - + - + \ 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 f32e05eb..f2b4fda9 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -1,5 +1,5 @@ - - + + netstandard2.0 dotnet-script @@ -16,24 +16,19 @@ true ../dotnet-script.snk - - ScriptParser.cs - - - + - - + \ No newline at end of file diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj index cbe23b97..9ffb726d 100644 --- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj +++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj @@ -1,5 +1,5 @@ - - + + net472 true @@ -16,17 +16,14 @@ - - PreserveNewest - - + \ No newline at end of file diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj index 60cc7930..76ea47f6 100644 --- a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj +++ b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj @@ -1,5 +1,5 @@ - - + + Extensions and add ons to C# scripting 0.2.0 @@ -10,10 +10,8 @@ false false - - - + + - - + \ No newline at end of file diff --git a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj index 2b928e99..b6393d04 100644 --- a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj +++ b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj @@ -1,18 +1,15 @@ + - netstandard2.0 true ../dotnet-script.snk - - - - + \ No newline at end of file diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index a743d91c..94e4c796 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -1,3 +1,4 @@ + net9.0;net8.0 diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index 260c1656..39413c29 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -25,11 +25,10 @@ ../dotnet-script.snk - + - - - + + From 54d1eb657899e3197eb9d0b6351635c7f2a4f1aa Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 22:01:34 +0100 Subject: [PATCH 11/15] Fixed scriptingversion --- src/Dotnet.Script.Core/ScriptPublisher.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs index 15452b66..faaf6b05 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.8.0-3.final"; + private const string ScriptingVersion = "4.11.0"; private readonly ScriptProjectProvider _scriptProjectProvider; private readonly ScriptEmitter _scriptEmitter; @@ -57,7 +57,7 @@ public void CreateAssembly(ScriptContext context, LogFactory log // only display published if we aren't auto publishing to temp folder if (!scriptAssemblyPath.StartsWith(FileUtils.GetTempPath())) { - _scriptConsole.WriteSuccess($"Published {context.FilePath} to { scriptAssemblyPath}"); + _scriptConsole.WriteSuccess($"Published {context.FilePath} to {scriptAssemblyPath}"); } } From bc2cf8c3f4448e33aa90e387e54558aa9648eb35 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 22:15:44 +0100 Subject: [PATCH 12/15] Bumped more dependencies --- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +- src/Dotnet.Script/Dotnet.Script.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index 4260d682..c35f0631 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index 94e4c796..fe8fa9ed 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -18,7 +18,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index 39413c29..df6c3d95 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -26,7 +26,7 @@ - + From b63cab3b7c50e98b6d165a91627b286ef665db87 Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Tue, 12 Nov 2024 22:25:22 +0100 Subject: [PATCH 13/15] Bumped more dependencies --- .../Dotnet.Script.Desktop.Tests.csproj | 8 ++++---- .../Dotnet.Script.Shared.Tests.csproj | 2 +- src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj index 9ffb726d..5d609576 100644 --- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj +++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj @@ -6,14 +6,14 @@ ../dotnet-script.snk - - - + + + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj index b6393d04..2365de7b 100644 --- a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj +++ b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj @@ -6,7 +6,7 @@ ../dotnet-script.snk - + diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj index fe8fa9ed..4b8b7da5 100644 --- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj +++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj @@ -11,9 +11,9 @@ runtime; build; native; contentfiles; analyzers all - - - + + + all runtime; build; native; contentfiles; analyzers From a8e9b0024f09ce57773f113089d8a326f2b6a657 Mon Sep 17 00:00:00 2001 From: Filip W Date: Wed, 13 Nov 2024 09:37:10 +0100 Subject: [PATCH 14/15] 9.0.100 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index bbaf16e9..97614a3d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0-rc.2.24473.5", + "version": "9.0.100", "rollForward": "latestFeature" } } From 6b1d92c5468a6ef830ba1224c48bc6ab3cf10f5f Mon Sep 17 00:00:00 2001 From: Bernhard Richter Date: Wed, 13 Nov 2024 12:42:55 +0100 Subject: [PATCH 15/15] Bumped version numbers and updated docs --- README.md | 16 ++++++++-------- src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +- .../Dotnet.Script.DependencyModel.NuGet.csproj | 2 +- .../Dotnet.Script.DependencyModel.csproj | 2 +- .../Dotnet.Script.Extras.csproj | 2 +- src/Dotnet.Script/Dotnet.Script.csproj | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c5bbc109..3482c176 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,19 @@ Run C# scripts from the .NET CLI, define NuGet packages inline and edit/debug th ## NuGet Packages -| Name | Version | Framework(s) | -| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- | -| `dotnet-script` (global tool) | [![Nuget](http://img.shields.io/nuget/v/dotnet-script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet-script/) | `net6.0`,`net7.0`,`net8.0` | -| `Dotnet.Script` (CLI as Nuget) | [![Nuget](http://img.shields.io/nuget/v/dotnet.script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet.script/) | `net6.0`,`net7.0`,`net8.0` | -| `Dotnet.Script.Core` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.Core.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.Core/) | `net6.0`,`net7.0`,`net8.0`,`netstandard2.0` | -| `Dotnet.Script.DependencyModel` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel/) | `netstandard2.0` | -| `Dotnet.Script.DependencyModel.Nuget` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.Nuget.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel.Nuget/) | `netstandard2.0` | +| Name | Version | Framework(s) | +| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | +| `dotnet-script` (global tool) | [![Nuget](http://img.shields.io/nuget/v/dotnet-script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet-script/) | `net8.0`,`net9.0` | +| `Dotnet.Script` (CLI as Nuget) | [![Nuget](http://img.shields.io/nuget/v/dotnet.script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet.script/) | `net8.0`,`net9.0` | +| `Dotnet.Script.Core` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.Core.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.Core/) | `net8.0`,`net9.0`,`netstandard2.0` | +| `Dotnet.Script.DependencyModel` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel/) | `netstandard2.0` | +| `Dotnet.Script.DependencyModel.Nuget` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.Nuget.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel.Nuget/) | `netstandard2.0` | ## Installing ### Prerequisites -The only thing we need to install is [.NET 6.0, .NET 7.0 or .NET 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet). +The only thing we need to install is [.NET 8.0 or .NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet). [Note](https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#manual-install): > If you install the .NET SDK to a non-default location, you need to set the environment variable `DOTNET_ROOT` to the directory that contains the dotnet executable diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj index c35f0631..94dd6e45 100644 --- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj +++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj @@ -2,7 +2,7 @@ A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn. - 1.5.0 + 1.6.0 filipw net9.0;net8.0;netstandard2.0 Dotnet.Script.Core 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 3daa5ba7..c2794916 100644 --- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj +++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj @@ -8,7 +8,7 @@ https://github.com/dotnet-script/dotnet-script.git git script;csx;csharp;roslyn;nuget - 1.5.0 + 1.6.0 A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files. dotnet-script dotnet-script diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj index f2b4fda9..a0be1fb6 100644 --- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj +++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj @@ -11,7 +11,7 @@ https://github.com/dotnet-script/dotnet-script.git git script;csx;csharp;roslyn;omnisharp - 1.5.0 + 1.6.0 latest true ../dotnet-script.snk diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj index 76ea47f6..c79a5f84 100644 --- a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj +++ b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj @@ -2,7 +2,7 @@ Extensions and add ons to C# scripting - 0.2.0 + 0.3.0 netstandard2.0 Dotnet.Script.Extras Dotnet.Script.Extras diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj index df6c3d95..e33e4619 100644 --- a/src/Dotnet.Script/Dotnet.Script.csproj +++ b/src/Dotnet.Script/Dotnet.Script.csproj @@ -2,7 +2,7 @@ Dotnet CLI tool allowing you to run C# (CSX) scripts. - 1.5.0 + 1.6.0 filipw Dotnet.Script net9.0;net8.0