Merge pull request #740 from dotnet-script/feature/net8

seesharper · web-flow · commit 3d6fa499e193 · 2023-11-09T13:42:52.000+01:00
Support .NET 8.0
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,11 +9,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install .Net Core
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
           include-prerelease: true
       - name: Install dotnet-script
         run: dotnet tool install dotnet-script --global
@@ -27,11 +28,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install .Net Core
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
           include-prerelease: true
       - name: Install dotnet-script
         run: dotnet tool install dotnet-script --global
@@ -45,11 +47,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install .Net Core
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
           include-prerelease: true
       - name: Install dotnet-script
         run: dotnet tool install dotnet-script --global
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100-rc.2.23502.2",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -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.4.0</VersionPrefix>
+    <VersionPrefix>1.5.0</VersionPrefix>
     <Authors>filipw</Authors>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
     <PackageId>Dotnet.Script.Core</PackageId>
     <PackageTags>script;csx;csharp;roslyn</PackageTags>
diff --git 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 @@
     <RepositoryUrl>https://github.com/dotnet-script/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>1.4.0</Version>
+    <Version>1.5.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>
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/dotnet-script/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs b/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs
@@ -133,10 +133,16 @@ private static string GetProcessArchitecture()
         private static string GetRuntimeIdentifier()
         {
             var platformIdentifier = GetPlatformIdentifier();
+            
+#if NET8_0 
+            return $"{platformIdentifier}-{GetProcessArchitecture()}";
+#endif
+            
             if (platformIdentifier == "osx" || platformIdentifier == "linux")
             {
                 return $"{platformIdentifier}-{GetProcessArchitecture()}";
             }
+            
             var runtimeIdentifier = RuntimeEnvironment.GetRuntimeIdentifier();
             return runtimeIdentifier;
         }
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/csproj.template b/src/Dotnet.Script.DependencyModel/ProjectSystem/csproj.template
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
   <ItemGroup>
   </ItemGroup>
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Dotnet.Script.Tests/InteractiveRunnerTests.cs b/src/Dotnet.Script.Tests/InteractiveRunnerTests.cs
@@ -19,8 +19,7 @@ public async Task ShouldCompileAndExecuteWithWebSdk()
             {
                 @"#r ""sdk:Microsoft.NET.Sdk.Web""",
                 "using Microsoft.AspNetCore.Builder;",
-                "var a = WebApplication.Create();",
-                @"a.GetType()",
+                @"typeof(WebApplication)",
                 "#exit"
             };
 
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using Dotnet.Script.DependencyModel.Environment;
 using Dotnet.Script.Shared.Tests;
@@ -479,13 +481,34 @@ public void ShouldSetCurrentContextualReflectionContext()
             Assert.Contains("Dotnet.Script.Core.ScriptAssemblyLoadContext", output);
         }
 
+#if NET6_0
+        [Fact]
+        public void ShouldCompileAndExecuteWithWebSdk()
+        {
+            var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApiNet6", "--no-cache");
+            Assert.Equal(0, processResult.ExitCode);
+        }
+#endif
+        
+#if NET7_0
         [Fact]
         public void ShouldCompileAndExecuteWithWebSdk()
         {
             var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApi", "--no-cache");
             Assert.Equal(0, processResult.ExitCode);
         }
-
+#endif 
+        
+#if NET8_0
+        // .NET 8.0 only works with isolated load context
+        [Fact]
+        public void ShouldCompileAndExecuteWithWebSdk()
+        {
+            var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApi", "--no-cache --isolated-load-context");
+            Assert.Equal(0, processResult.ExitCode);
+        }
+#endif 
+        
         [Fact]
         public void ShouldThrowExceptionWhenSdkIsNotSupported()
         {
diff --git a/src/Dotnet.Script.Tests/ScriptPublisherTests.cs b/src/Dotnet.Script.Tests/ScriptPublisherTests.cs
@@ -49,7 +49,11 @@ public void SimplePublishTest()
         public void SimplePublishTestToDifferentRuntimeId()
         {
             using var workspaceFolder = new DisposableFolder();
+#if NET8_0 
+            var runtimeId = _scriptEnvironment.RuntimeIdentifier == "win-x64" ? "osx-x64" : "win10-x64";
+#else
             var runtimeId = _scriptEnvironment.RuntimeIdentifier == "win10-x64" ? "osx-x64" : "win10-x64";
+#endif
             var code = @"WriteLine(""hello world"");";
             var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
             File.WriteAllText(mainPath, code);
diff --git a/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx b/src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx
@@ -1,6 +1,9 @@
 #r "sdk:Microsoft.NET.Sdk.Web"
+#r "nuget:Microsoft.Extensions.DependencyInjection.Abstractions, 8.0.0-rc.2.23479.6"
 
 using Microsoft.AspNetCore.Builder;
 
-var a = WebApplication.Create();
-a.MapGet("/", () => "Hello world");
+var builder = WebApplication.CreateBuilder();
+var app = builder.Build();
+
+app.MapGet("/", () => "Hello World!");
diff --git a/src/Dotnet.Script.Tests/TestFixtures/WebApiNet6/WebApiNet6.csx b/src/Dotnet.Script.Tests/TestFixtures/WebApiNet6/WebApiNet6.csx
@@ -0,0 +1,6 @@
+#r "sdk:Microsoft.NET.Sdk.Web"
+
+using Microsoft.AspNetCore.Builder;
+
+var a = WebApplication.Create();
+a.MapGet("/", () => "Hello world");
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-    <VersionPrefix>1.4.0</VersionPrefix>
+    <VersionPrefix>1.5.0</VersionPrefix>
     <Authors>filipw</Authors>
     <PackageId>Dotnet.Script</PackageId>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>dotnet-script</AssemblyName>
     <OutputType>Exe</OutputType>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.100",`
	`3`	`+ "version": "8.0.100-rc.2.23502.2",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,16 @@ private static string GetProcessArchitecture()`
`133`	`133`	`private static string GetRuntimeIdentifier()`
`134`	`134`	`{`
`135`	`135`	`var platformIdentifier = GetPlatformIdentifier();`
	`136`	`+`
	`137`	`+#if NET8_0`
	`138`	`+ return $"{platformIdentifier}-{GetProcessArchitecture()}";`
	`139`	`+#endif`
	`140`	`+`
`136`	`141`	`if (platformIdentifier == "osx" \|\| platformIdentifier == "linux")`
`137`	`142`	`{`
`138`	`143`	`return $"{platformIdentifier}-{GetProcessArchitecture()}";`
`139`	`144`	`}`
	`145`	`+`
`140`	`146`	`var runtimeIdentifier = RuntimeEnvironment.GetRuntimeIdentifier();`
`141`	`147`	`return runtimeIdentifier;`
`142`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ public async Task ShouldCompileAndExecuteWithWebSdk()`
`19`	`19`	`{`
`20`	`20`	`@"#r ""sdk:Microsoft.NET.Sdk.Web""",`
`21`	`21`	`"using Microsoft.AspNetCore.Builder;",`
`22`		`- "var a = WebApplication.Create();",`
`23`		`- @"a.GetType()",`
	`22`	`+ @"typeof(WebApplication)",`
`24`	`23`	`"#exit"`
`25`	`24`	`};`
`26`	`25`