Merge pull request #614 from filipw/bump-deps

filipw · web-flow · commit 984b9c626326 · 2021-04-22T16:06:42.000+02:00
Bump Microsoft packages to 5.0.0
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.0.1</VersionPrefix>
+    <VersionPrefix>1.0.2</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
@@ -30,8 +30,8 @@
     <!-- The following references are just quick fixes for issue #166 and issue #268
     We need to figure out why we can't load these via the dependency context.
      -->
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />
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>net5.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -351,6 +351,13 @@ public void ShouldThrowMeaningfulErrorMessageWhenDependencyIsNotFound()
             }
         }
 
+        [Fact]
+        public void ShouldHandleIssue613()
+        {
+            var result = ScriptTestRunner.Default.ExecuteFixture("Issue613");
+            Assert.Equal(0, result.exitCode);
+        }
+
         [Fact]
         public void ShouldHandleIssue235()
         {
diff --git a/src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx b/src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx
@@ -0,0 +1,18 @@
+#r "nuget: System.Text.Encoding.CodePages, 5.0.0"
+
+public class Script
+{
+    public static void Run()
+    {
+        try
+        {
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+        }
+        catch (Exception ex)
+        {
+            System.Console.WriteLine(ex.ToString());
+        }
+    }
+}
+
+Script.Run();
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.0.1</VersionPrefix>
+        <VersionPrefix>1.0.2</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
@@ -24,7 +24,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.6" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,13 @@ public void ShouldThrowMeaningfulErrorMessageWhenDependencyIsNotFound()`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
	`354`	`+ [Fact]`
	`355`	`+ public void ShouldHandleIssue613()`
	`356`	`+ {`
	`357`	`+ var result = ScriptTestRunner.Default.ExecuteFixture("Issue613");`
	`358`	`+ Assert.Equal(0, result.exitCode);`
	`359`	`+ }`
	`360`	`+`
`354`	`361`	`[Fact]`
`355`	`362`	`public void ShouldHandleIssue235()`
`356`	`363`	`{`