Initial support for .Net Core 5

seesharper · seesharper · commit 29190739997f · 2020-03-31T11:56:04.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs b/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs
@@ -60,7 +60,7 @@ public ScriptDependencyContext ReadDependencyContext(string pathToAssetsFile)
                 }
             }
 
-            if (ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("3"))
+            if (ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("3") || ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("5"))
             {
                 var netcoreAppRuntimeAssemblyLocation = Path.GetDirectoryName(typeof(object).Assembly.Location);
                 var netcoreAppRuntimeAssemblies = Directory.GetFiles(netcoreAppRuntimeAssemblyLocation, "*.dll").Where(IsAssembly).ToArray();
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>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -4,7 +4,7 @@
         <VersionPrefix>0.51.0</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
-        <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
         <DebugType>portable</DebugType>
         <AssemblyName>dotnet-script</AssemblyName>
         <OutputType>Exe</OutputType>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public ScriptDependencyContext ReadDependencyContext(string pathToAssetsFile)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("3"))`
	`63`	`+ if (ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("3") \|\| ScriptEnvironment.Default.NetCoreVersion.Version.StartsWith("5"))`
`64`	`64`	`{`
`65`	`65`	`var netcoreAppRuntimeAssemblyLocation = Path.GetDirectoryName(typeof(object).Assembly.Location);`
`66`	`66`	`var netcoreAppRuntimeAssemblies = Directory.GetFiles(netcoreAppRuntimeAssemblyLocation, "*.dll").Where(IsAssembly).ToArray();`