Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb0aadfa

Browse files
authored
Merge pull request#633 from filipw/feature/drop-2.1
drop support for .NET Core 2.1
2 parents2c21516 +07e10a2 commitb0aadfa

File tree

10 files changed

+15
-20
lines changed

10 files changed

+15
-20
lines changed

‎README.md‎

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

1111
| Name| Version| Framework(s)|
1212
| -------------------------------------| ------------------------------------------------------------| --------------------------------|
13-
|`dotnet-script`|[![Nuget](http://img.shields.io/nuget/v/dotnet-script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet-script/)|`netcoreapp2.1`,`netcoreapp3.1`|
14-
|`Dotnet.Script`|[![Nuget](http://img.shields.io/nuget/v/dotnet.script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet.script/)|`netcoreapp2.1`,`netcoreapp3.1`|
13+
|`dotnet-script`(global tool)|[![Nuget](http://img.shields.io/nuget/v/dotnet-script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet-script/)|`net5.0`,`netcoreapp3.1`|
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/)|`net5.0`,`netcoreapp3.1`|
1515
|`Dotnet.Script.Core`|[![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.Core.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.Core/)|`netstandard2.0`|
1616
|`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`|
1717
|`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`|
@@ -20,11 +20,11 @@ Run C# scripts from the .NET CLI, define NuGet packages inline and edit/debug th
2020

2121
###Prerequisites
2222

23-
The only thing we need to install is[.NET Core2.1+ SDK](https://www.microsoft.com/net/download/core). In order to use C# 8.0 features,[.NETCore 3.1+ SDK](https://www.microsoft.com/net/download/core) must be installed.
23+
The only thing we need to install is[.NET Core3.1 or .NET5.0 SDK](https://www.microsoft.com/net/download/core).
2424

2525
###.NET Core Global Tool
2626

27-
.NET Core 2.1introduces the concept of global tools meaning that you can install`dotnet-script` using nothing but the .NET CLI.
27+
.NET Core 2.1introduced the concept of global tools meaning that you can install`dotnet-script` using nothing but the .NET CLI.
2828

2929
```shell
3030
dotnet tool install -g dotnet-script
@@ -34,9 +34,6 @@ Tool 'dotnet-script' (version '0.22.0') was successfully installed.
3434
```
3535

3636
The advantage of this approach is that you can use the same command for installation across all platforms.
37-
38-
>⚠️ In order to use the global tool you need[.NET Core SDK 2.1.300](https://www.microsoft.com/net/download/dotnet-core/sdk-2.1.300) or higher. The earlier previews and release candidates of .NET Core 2.1 are not supported.
39-
4037
.NET Core SDK also supports viewing a list of installed tools and their uninstallation.
4138

4239
```shell
@@ -316,7 +313,6 @@ To consume a script package all we need to do specify the NuGet package in the `
316313
The following example loads the[simple-targets](https://www.nuget.org/packages/simple-targets-csx) package that contains script files to be included in our script.
317314

318315
```C#
319-
#! "netcoreapp2.1"
320316
#load"nuget:simple-targets-csx, 6.0.0"
321317

322318
usingstaticSimpleTargets;
@@ -466,7 +462,6 @@ The following example shows how we can pipe data in and out of a script.
466462
The`UpperCase.csx` script simply converts the standard input to upper case and writes it back out to standard output.
467463

468464
```csharp
469-
#! "netcoreapp2.1"
470465
using (varstreamReader=newStreamReader(Console.OpenStandardInput()))
471466
{
472467
Write(streamReader.ReadToEnd().ToUpper());

‎build/Build.csx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ await StepRunner.Execute(Args);
3535

3636
privatevoidCreateGitHubReleaseAsset()
3737
{
38-
DotNet.Publish(dotnetScriptProjectFolder,publishArtifactsFolder,"netcoreapp2.1");
38+
DotNet.Publish(dotnetScriptProjectFolder,publishArtifactsFolder,"netcoreapp3.1");
3939
Zip(publishArchiveFolder,pathToGitHubReleaseAsset);
4040
}
4141

‎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":"netcoreapp2.1"
4+
"defaultTargetFramework":"netcoreapp3.1"
55
}
66
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ProjectSdk="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.1.0</VersionPrefix>
5+
<VersionPrefix>1.2.0</VersionPrefix>
66
<Authors>filipw</Authors>
77
<TargetFrameworks>netstandard2.0</TargetFrameworks>
88
<AssemblyName>Dotnet.Script.Core</AssemblyName>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
99
<RepositoryType>git</RepositoryType>
1010
<PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
11-
<Version>1.1.0</Version>
11+
<Version>1.2.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>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
1212
<RepositoryType>git</RepositoryType>
1313
<PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
14-
<Version>1.1.0</Version>
14+
<Version>1.2.0</Version>
1515
<LangVersion>latest</LangVersion>
1616
<SignAssembly>true</SignAssembly>
1717
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>

‎src/Dotnet.Script.DependencyModel/ProjectSystem/csproj.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Dotnet.Script.Desktop.Tests/CompilationDepenencyTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public CompilationDependencyTests(ITestOutputHelper testOutputHelper)
1515
}
1616

1717
[Theory]
18-
[InlineData("netcoreapp2.1")]
19-
[InlineData("netcoreapp3.0")]
18+
[InlineData("netcoreapp3.1")]
19+
[InlineData("net5.0")]
2020
publicvoidShouldGetCompilationDependenciesForNetCoreApp(stringtargetFramework)
2121
{
2222
varresolver=CreateResolver();

‎src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ProjectSdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
3+
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ProjectSdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
4-
<VersionPrefix>1.1.0</VersionPrefix>
4+
<VersionPrefix>1.2.0</VersionPrefix>
55
<Authors>filipw</Authors>
66
<PackageId>Dotnet.Script</PackageId>
7-
<TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
88
<DebugType>portable</DebugType>
99
<AssemblyName>dotnet-script</AssemblyName>
1010
<OutputType>Exe</OutputType>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp