Skip to content

This PR adds support for .Net 9 and removed support #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipw merged 17 commits into from
Nov 13, 2024
Merged

This PR adds support for .Net 9 and removed support #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d8a0db4
Initial support for .net 9
seesharper Nov 4, 2024
f83e2b6
Bump dotnet.build
seesharper Nov 6, 2024
978664c
Fix pushing Nuget packages
seesharper Nov 6, 2024
0d7dd22
Publish .net8
seesharper Nov 11, 2024
20c3eb3
Add test step for windows
seesharper Nov 12, 2024
bb77c95
Run net9 tests only
seesharper Nov 12, 2024
e36ed45
Only run tests for net9
seesharper Nov 12, 2024
f8fc416
Run tests for net8.0 and net9.0 in sequence
seesharper Nov 12, 2024
529733c
case sensitivity for tests
filipw Nov 12, 2024
bb2b6bc
Bumped deps
seesharper Nov 12, 2024
54d1eb6
Fixed scriptingversion
seesharper Nov 12, 2024
bc2cf8c
Bumped more dependencies
seesharper Nov 12, 2024
b63cab3
Bumped more dependencies
seesharper Nov 12, 2024
a39f633
Merge branch 'master' into net9
seesharper Nov 12, 2024
a8e9b00
9.0.100
filipw Nov 13, 2024
6b1d92c
Bumped version numbers and updated docs
seesharper Nov 13, 2024
84325b1
Merge branch 'net9' of https://github.com/filipw/dotnet-script into net9
seesharper Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions build/Build.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
Expand Down Expand Up @@ -86,7 +87,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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions build/BuildContext.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion build/omnisharp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"script": {
"enableScriptNuGetReferences": true,
"defaultTargetFramework": "net6.0"
"defaultTargetFramework": "net8.0"
}
}
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion src/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"-c",
"release",
"-f",
"net7.0",
"net9.0",
"${workspaceFolder}/Dotnet.Script.Tests/DotNet.Script.Tests.csproj"
],
"problemMatcher": "$msCompile",
Expand Down
14 changes: 7 additions & 7 deletions src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
<VersionPrefix>1.5.0</VersionPrefix>
<VersionPrefix>1.6.0</VersionPrefix>
<Authors>filipw</Authors>
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
<AssemblyName>Dotnet.Script.Core</AssemblyName>
<PackageId>Dotnet.Script.Core</PackageId>
<PackageTags>script;csx;csharp;roslyn</PackageTags>
Expand All @@ -24,18 +24,18 @@
<EmbeddedResource Include="**/*.template" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Gapotchenko.FX" Version="2022.2.7" />
<PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2022.2.7" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
<PackageReference Include="Gapotchenko.FX" Version="2024.1.3" />
<PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2024.1.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />
<ProjectReference Include="..\Dotnet.Script.DependencyModel\Dotnet.Script.DependencyModel.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/Dotnet.Script.Core/ScriptPublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,7 +57,7 @@ public void CreateAssembly<TReturn, THost>(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}");
}
}

Expand Down
11 changes: 5 additions & 6 deletions src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand All @@ -8,19 +8,18 @@
<RepositoryUrl>https://github.com/dotnet-script/dotnet-script.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
<Version>1.5.0</Version>
<Version>1.6.0</Version>
<Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
<Authors>dotnet-script</Authors>
<Company>dotnet-script</Company>
<LangVersion>latest</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Dotnet.Script.DependencyModel\ProjectSystem\ScriptParserInternal.cs" Link="ScriptParserInternal.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
</ItemGroup>
</Project>
</Project>
15 changes: 5 additions & 10 deletions src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Authors>dotnet-script</Authors>
Expand All @@ -11,29 +11,24 @@
<RepositoryUrl>https://github.com/dotnet-script/dotnet-script.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
<Version>1.5.0</Version>
<Version>1.6.0</Version>
<LangVersion>latest</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<None Remove="NuGet\NuGet430.exe" />
</ItemGroup>

<ItemGroup>
<Compile Update="ProjectSystem\ScriptParserInternal.cs">
<DependentUpon>ScriptParser.cs</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="ProjectSystem\csproj.template" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NuGet.ProjectModel" Version="6.2.4" />
<PackageReference Include="NuGet.ProjectModel" Version="6.10.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
</ItemGroup>

</Project>
</Project>
17 changes: 7 additions & 10 deletions src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />
<ProjectReference Include="..\Dotnet.Script.DependencyModel\Dotnet.Script.DependencyModel.csproj" />
<ProjectReference Include="..\Dotnet.Script.Shared.Tests\Dotnet.Script.Shared.Tests.csproj" />
</ItemGroup>

<ItemGroup>
<Content Include="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

</Project>
</Project>
14 changes: 6 additions & 8 deletions src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Extensions and add ons to C# scripting</Description>
<VersionPrefix>0.2.0</VersionPrefix>
<VersionPrefix>0.3.0</VersionPrefix>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Dotnet.Script.Extras</AssemblyName>
<PackageId>Dotnet.Script.Extras</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
</ItemGroup>

</Project>
</Project>
9 changes: 3 additions & 6 deletions src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.9.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />
<ProjectReference Include="..\Dotnet.Script.DependencyModel\Dotnet.Script.DependencyModel.csproj" />
</ItemGroup>

</Project>
</Project>
11 changes: 6 additions & 5 deletions src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
Expand All @@ -10,14 +11,14 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Moq" Version="4.20.72" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />
Expand Down
Loading
Loading