Merge pull request #649 from filipw/net6-compilation-dependencies

seesharper · web-flow · commit 53a570d15ba6 · 2021-12-03T16:04:52.000+01:00
Net6 compilation dependencies
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -2,7 +2,7 @@
 <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.3.0</VersionPrefix>
+    <VersionPrefix>1.3.1</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
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/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</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/Compilation/CompilationDependencyResolver.cs b/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
@@ -45,7 +45,8 @@ public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory
 
             // On .Net Core, we need to fetch the compilation references for framework assemblies separately.
             if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase) ||
-                defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase))
+                defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase) ||
+                defaultTargetFramework.StartsWith("net6", StringComparison.InvariantCultureIgnoreCase))
             {
                 var compilationreferences = _compilationReferenceReader.Read(projectFileInfo);
                 result.Add(new CompilationDependency("Dotnet.Script.Default.Dependencies", "99.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));
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/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>1.3.0</VersionPrefix>
+        <VersionPrefix>1.3.1</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory`
`45`	`45`
`46`	`46`	`// On .Net Core, we need to fetch the compilation references for framework assemblies separately.`
`47`	`47`	`if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase) \|\|`
`48`		`- defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase))`
	`48`	`+ defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase) \|\|`
	`49`	`+ defaultTargetFramework.StartsWith("net6", StringComparison.InvariantCultureIgnoreCase))`
`49`	`50`	`{`
`50`	`51`	`var compilationreferences = _compilationReferenceReader.Read(projectFileInfo);`
`51`	`52`	`result.Add(new CompilationDependency("Dotnet.Script.Default.Dependencies", "99.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));`