Skip to content

Commit 85ea81d

Browse files
NikolayPianikovNikolayPianikov
committed
C# 14 support, .NET 10, removal of .NET 6, 7 dependencies
1 parent b933a46 commit 85ea81d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+284
-419
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- name: Setup .NET 6
15-
uses: actions/setup-dotnet@v3
16-
with:
17-
dotnet-version: '6.0.x'
18-
19-
- name: Setup .NET 7
20-
uses: actions/setup-dotnet@v3
21-
with:
22-
dotnet-version: '7.0.x'
23-
2414
- name: Setup .NET 8
2515
uses: actions/setup-dotnet@v3
2616
with:
@@ -31,6 +21,11 @@ jobs:
3121
with:
3222
dotnet-version: '9.0.x'
3323

24+
- name: Setup .NET 10
25+
uses: actions/setup-dotnet@v3
26+
with:
27+
dotnet-version: '10.0.x'
28+
3429
- name: Build
3530
run: dotnet run --project ./Build
3631

@@ -41,16 +36,6 @@ jobs:
4136
steps:
4237
- uses: actions/checkout@v4
4338

44-
- name: Setup .NET 6
45-
uses: actions/setup-dotnet@v3
46-
with:
47-
dotnet-version: '6.0.x'
48-
49-
- name: Setup .NET 7
50-
uses: actions/setup-dotnet@v3
51-
with:
52-
dotnet-version: '7.0.x'
53-
5439
- name: Setup .NET 8
5540
uses: actions/setup-dotnet@v3
5641
with:
@@ -61,6 +46,11 @@ jobs:
6146
with:
6247
dotnet-version: '9.0.x'
6348

49+
- name: Setup .NET 10
50+
uses: actions/setup-dotnet@v3
51+
with:
52+
dotnet-version: '10.0.x'
53+
6454
- name: Build
6555
run: dotnet run --project ./Build
6656

@@ -71,16 +61,6 @@ jobs:
7161
steps:
7262
- uses: actions/checkout@v4
7363

74-
- name: Setup .NET 6
75-
uses: actions/setup-dotnet@v3
76-
with:
77-
dotnet-version: '6.0.x'
78-
79-
- name: Setup .NET 7
80-
uses: actions/setup-dotnet@v3
81-
with:
82-
dotnet-version: '7.0.x'
83-
8464
- name: Setup .NET 8
8565
uses: actions/setup-dotnet@v3
8666
with:
@@ -91,5 +71,10 @@ jobs:
9171
with:
9272
dotnet-version: '9.0.x'
9373

74+
- name: Setup .NET 10
75+
uses: actions/setup-dotnet@v3
76+
with:
77+
dotnet-version: '10.0.x'
78+
9479
- name: Build
9580
run: dotnet run --project ./Build

‎.run/Build.run.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Build" type="DotNetProject" factoryName=".NET Project">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/Build/bin/Debug/net9.0/Build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="-p:integrationTests=true -p:version=1.1.4" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/Build/bin/Debug/net10.0/Build.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="-p:integrationTests=true -p:version=1.2.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Build/Build.csproj" />
1114
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net9.0" />
18+
<option name="PROJECT_TFM" value="net10.0" />
1619
<method v="2">
1720
<option name="Build" />
1821
</method>

‎.run/CommandLine.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="CommandLine.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="CommandLine.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/CommandLineAsync.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="CommandLineAsync.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="CommandLineAsync.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/CompilationError.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="CompilationError.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="CompilationError.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/Docker.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="Docker.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/Get version.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Get version" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="--version" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/Integration.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Integration.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="Integration.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

‎.run/Nuget.csx.run.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Nuget.csx" type="DotNetProject" factoryName=".NET Project" folderName="Scripts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net8.0/dotnet-csi.dll" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/CSharpInteractive/bin/Debug/CSharpInteractive.Tool/net10.0/dotnet-csi.dll" />
44
<option name="PROGRAM_PARAMETERS" value="Nuget.csx" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Samples/Scripts" />
66
<option name="PASS_PARENT_ENVS" value="1" />
7-
<option name="USE_EXTERNAL_CONSOLE" value="0" />
7+
<option name="ENV_FILE_PATHS" value="" />
8+
<option name="REDIRECT_INPUT_PATH" value="" />
9+
<option name="MIXED_MODE_DEBUG" value="0" />
810
<option name="USE_MONO" value="0" />
911
<option name="RUNTIME_ARGUMENTS" value="" />
12+
<option name="AUTO_ATTACH_CHILDREN" value="0" />
1013
<option name="PROJECT_PATH" value="$PROJECT_DIR$/CSharpInteractive/CSharpInteractive.Tool.csproj" />
11-
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
14+
<option name="PROJECT_EXE_PATH_TRACKING" value="0" />
1215
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1316
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1417
<option name="PROJECT_KIND" value="DotNetCore" />

0 commit comments

Comments
 (0)