Skip to content

Commit 4e17070

Browse files
seesharperseesharper
authored
Merge branch 'master' into master
2 parents 7f33e6a + 2f9a42d commit 4e17070

File tree

18 files changed

+82
-87
lines changed

18 files changed

+82
-87
lines changed

‎.github/workflows/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212
uses: actions/setup-dotnet@v3
1313
with:
1414
dotnet-version: |
15-
6.0.x
16-
7.0.x
1715
8.0.x
16+
9.0.x
1817
include-prerelease: true
1918
- name: Install dotnet-script
2019
run: dotnet tool install dotnet-script --global
@@ -31,9 +30,8 @@ jobs:
3130
uses: actions/setup-dotnet@v3
3231
with:
3332
dotnet-version: |
34-
6.0.x
35-
7.0.x
3633
8.0.x
34+
9.0.x
3735
include-prerelease: true
3836
- name: Install dotnet-script
3937
run: dotnet tool install dotnet-script --global
@@ -50,9 +48,8 @@ jobs:
5048
uses: actions/setup-dotnet@v3
5149
with:
5250
dotnet-version: |
53-
6.0.x
54-
7.0.x
5551
8.0.x
52+
9.0.x
5653
include-prerelease: true
5754
- name: Install dotnet-script
5855
run: dotnet tool install dotnet-script --global

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ Run C# scripts from the .NET CLI, define NuGet packages inline and edit/debug th
88

99
## NuGet Packages
1010

11-
| Name | Version | Framework(s) |
12-
| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- |
13-
| `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` |
14-
| `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` |
15-
| `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` |
16-
| `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` |
17-
| `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` |
11+
| Name | Version | Framework(s) |
12+
| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
13+
| `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` |
14+
| `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` |
15+
| `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` |
16+
| `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` |
17+
| `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` |
1818

1919
## Installing
2020

2121
### Prerequisites
2222

23-
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).
23+
The only thing we need to install is [.NET 8.0 or .NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet).
2424

2525
[Note](https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#manual-install):
2626
> 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

‎build/Build.csx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load "nuget:Dotnet.Build, 0.7.1"
1+
#load "nuget:Dotnet.Build, 0.23.0"
22
#load "nuget:dotnet-steps, 0.0.1"
33
#load "nuget:github-changelog, 0.1.5"
44
#load "BuildContext.csx"
@@ -33,7 +33,7 @@ await StepRunner.Execute(Args);
3333

3434
private void CreateGitHubReleaseAsset()
3535
{
36-
DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, "net6.0");
36+
DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, "net8.0");
3737
Zip(publishArchiveFolder, pathToGitHubReleaseAsset);
3838
}
3939

@@ -58,7 +58,8 @@ private void CreateNuGetPackages()
5858

5959
private void RunTests()
6060
{
61-
DotNet.Test(testProjectFolder);
61+
Command.Execute("dotnet", "test -c Release -f net8.0", testProjectFolder);
62+
Command.Execute("dotnet", "test -c Release -f net9.0", testProjectFolder);
6263
if (BuildEnvironment.IsWindows)
6364
{
6465
DotNet.Test(testDesktopProjectFolder);
@@ -86,7 +87,8 @@ private async Task PublishRelease()
8687
Git.Default.RequireCleanWorkingTree();
8788
await ReleaseManagerFor(owner, projectName, BuildEnvironment.GitHubAccessToken)
8889
.CreateRelease(Git.Default.GetLatestTag(), pathToReleaseNotes, new[] { new ZipReleaseAsset(pathToGitHubReleaseAsset) });
89-
NuGet.TryPush(nuGetArtifactsFolder);
90+
91+
DotNet.TryPush(nuGetArtifactsFolder);
9092
}
9193
}
9294

‎build/BuildContext.csx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load "nuget:Dotnet.Build, 0.7.1"
1+
#load "nuget:Dotnet.Build, 0.23.0"
22
using static FileUtils;
33
using System.Xml.Linq;
44

@@ -7,7 +7,7 @@ const string GlobalToolPackageId = "dotnet-script";
77
var owner = "filipw";
88
var projectName = "dotnet-script";
99
var root = FileUtils.GetScriptFolder();
10-
var solutionFolder = Path.Combine(root,"..","src");
10+
var solutionFolder = Path.Combine(root, "..", "src");
1111
var dotnetScriptProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script");
1212
var dotnetScriptCoreProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Core");
1313
var dotnetScriptDependencyModelProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel");

‎build/omnisharp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"script": {
33
"enableScriptNuGetReferences": true,
4-
"defaultTargetFramework": "net6.0"
4+
"defaultTargetFramework": "net8.0"
55
}
66
}

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

‎src/.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"-c",
4747
"release",
4848
"-f",
49-
"net7.0",
49+
"net9.0",
5050
"${workspaceFolder}/Dotnet.Script.Tests/DotNet.Script.Tests.csproj"
5151
],
5252
"problemMatcher": "$msCompile",

‎src/Dotnet.Script.Core/Dotnet.Script.Core.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
5-
<VersionPrefix>1.5.0</VersionPrefix>
5+
<VersionPrefix>1.6.0</VersionPrefix>
66
<Authors>filipw</Authors>
7-
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
88
<AssemblyName>Dotnet.Script.Core</AssemblyName>
99
<PackageId>Dotnet.Script.Core</PackageId>
1010
<PackageTags>script;csx;csharp;roslyn</PackageTags>
@@ -24,18 +24,18 @@
2424
<EmbeddedResource Include="**/*.template" />
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="Gapotchenko.FX" Version="2022.2.7" />
28-
<PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2022.2.7" />
29-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
27+
<PackageReference Include="Gapotchenko.FX" Version="2024.1.3" />
28+
<PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2024.1.3" />
29+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
3030
<PackageReference Include="ReadLine" Version="2.0.1" />
3131
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
3232
</ItemGroup>
3333
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
34-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
34+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
3535
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3636
</ItemGroup>
3737
<ItemGroup>
3838
<ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />
3939
<ProjectReference Include="..\Dotnet.Script.DependencyModel\Dotnet.Script.DependencyModel.csproj" />
4040
</ItemGroup>
41-
</Project>
41+
</Project>

‎src/Dotnet.Script.Core/ScriptPublisher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Dotnet.Script.Core
1111
{
1212
public class ScriptPublisher
1313
{
14-
private const string ScriptingVersion = "4.8.0-3.final";
14+
private const string ScriptingVersion = "4.11.0";
1515

1616
private readonly ScriptProjectProvider _scriptProjectProvider;
1717
private readonly ScriptEmitter _scriptEmitter;
@@ -57,7 +57,7 @@ public void CreateAssembly<TReturn, THost>(ScriptContext context, LogFactory log
5757
// only display published if we aren't auto publishing to temp folder
5858
if (!scriptAssemblyPath.StartsWith(FileUtils.GetTempPath()))
5959
{
60-
_scriptConsole.WriteSuccess($"Published {context.FilePath} to { scriptAssemblyPath}");
60+
_scriptConsole.WriteSuccess($"Published {context.FilePath} to {scriptAssemblyPath}");
6161
}
6262
}
6363

‎src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -8,19 +8,18 @@
88
<RepositoryUrl>https://github.com/dotnet-script/dotnet-script.git</RepositoryUrl>
99
<RepositoryType>git</RepositoryType>
1010
<PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
11-
<Version>1.5.0</Version>
11+
<Version>1.6.0</Version>
1212
<Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
1313
<Authors>dotnet-script</Authors>
1414
<Company>dotnet-script</Company>
1515
<LangVersion>latest</LangVersion>
1616
<SignAssembly>true</SignAssembly>
1717
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
1818
</PropertyGroup>
19-
2019
<ItemGroup>
2120
<Compile Include="..\Dotnet.Script.DependencyModel\ProjectSystem\ScriptParserInternal.cs" Link="ScriptParserInternal.cs" />
2221
</ItemGroup>
2322
<ItemGroup>
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
2524
</ItemGroup>
26-
</Project>
25+
</Project>

0 commit comments

Comments
 (0)