Replace custom shims with PolySharp (#613)

* PolySharp provides IsExternalInit * remove unused usings * update BenchmarkDotNet
sebastienros · Dec 8, 2023 · f62d8a5 · f62d8a5
1 parent 89706a0
commit f62d8a5
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 43 deletions.
diff --git a/Fluid.Benchmarks/BaseBenchmarks.cs b/Fluid.Benchmarks/BaseBenchmarks.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 
 namespace Fluid.Benchmarks
 {

diff --git a/Fluid.Benchmarks/Fluid.Benchmarks.csproj b/Fluid.Benchmarks/Fluid.Benchmarks.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
     <PackageReference Include="DotLiquid" Version="2.2.692" />
     <PackageReference Include="Liquid.NET" Version="0.10.0" />
     <PackageReference Include="Scriban" Version="5.9.0" />

diff --git a/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj b/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="PolySharp" Version="1.14.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">

diff --git a/Fluid.MvcViewEngine/IsExternalInit.cs b/Fluid.MvcViewEngine/IsExternalInit.cs
diff --git a/Fluid.Tests/CaseStatementTests.cs b/Fluid.Tests/CaseStatementTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Fluid.Ast;
 using Fluid.Values;
-using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Fluid.Tests

diff --git a/Fluid.Tests/Extensibility/ExtensibilityTests.cs b/Fluid.Tests/Extensibility/ExtensibilityTests.cs
@@ -1,6 +1,4 @@
 using Fluid.Ast;
-using Parlot.Fluent;
-using System;
 using Xunit;
 
 namespace Fluid.Tests.Extensibility

diff --git a/Fluid.Tests/ForStatementTests.cs b/Fluid.Tests/ForStatementTests.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Fluid.Ast;
 using Fluid.Values;
-using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Fluid.Tests

diff --git a/Fluid.Tests/Mocks/MockFileProvider.cs b/Fluid.Tests/Mocks/MockFileProvider.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
 
 namespace Fluid.Tests.Mocks
 {

diff --git a/Fluid.Tests/MvcViewEngine/SampleTests.cs b/Fluid.Tests/MvcViewEngine/SampleTests.cs
@@ -1,6 +1,5 @@
 #if !NETCOREAPP2_1
 using Fluid.Ast;
-using Fluid.MvcViewEngine;
 using Fluid.ViewEngine;
 using Xunit;
 

diff --git a/Fluid.Tests/NumberFiltersTests.cs b/Fluid.Tests/NumberFiltersTests.cs
@@ -1,8 +1,6 @@
-using System.Linq;
-using Fluid.Values;
+using Fluid.Values;
 using Fluid.Filters;
 using Xunit;
-using System;
 
 namespace Fluid.Tests
 {

diff --git a/Fluid.Tests/UnlessStatementTests.cs b/Fluid.Tests/UnlessStatementTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Fluid.Ast;
 using Fluid.Values;
-using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Fluid.Tests

diff --git a/Fluid.ViewEngine/FluidViewEngineOptions.cs b/Fluid.ViewEngine/FluidViewEngineOptions.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.FileProviders;
-using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;

diff --git a/Fluid.ViewEngine/FluidViewParser.cs b/Fluid.ViewEngine/FluidViewParser.cs
@@ -1,7 +1,6 @@
 using Fluid.Ast;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
 using static Parlot.Fluent.Parsers;
 

diff --git a/Fluid/ExceptionHelper.cs b/Fluid/ExceptionHelper.cs
@@ -49,10 +49,5 @@ public static void ThrowMaximumStatementsException()
         {
             throw new InvalidOperationException("The maximum number of statements has been reached. Your script took too long to run.");
         }
-
-#if NETSTANDARD2_0
-        [AttributeUsage(AttributeTargets.Method)]
-        private sealed class DoesNotReturnAttribute : Attribute {}
-#endif
     }
 }
diff --git a/Fluid/Fluid.csproj b/Fluid/Fluid.csproj
@@ -27,8 +27,9 @@
   <ItemGroup>
     <PackageReference Include="Parlot" Version="0.0.24" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.1.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="PolySharp" Version="1.14.0" PrivateAssets="all" />
+    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">

diff --git a/Fluid/FluidParserExtensions.cs b/Fluid/FluidParserExtensions.cs
@@ -1,6 +1,5 @@
 using Fluid.Ast;
 using Fluid.Parser;
-using Parlot.Fluent;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Fluid/IsExternalInit.cs b/Fluid/IsExternalInit.cs
diff --git a/Fluid/TemplateOptions.cs b/Fluid/TemplateOptions.cs
@@ -1,5 +1,4 @@
 using Fluid.Filters;
-using Fluid.Values;
 using Microsoft.Extensions.FileProviders;
 using System;
 using System.Collections.Generic;

diff --git a/Fluid/Values/FluidValueExtensions.cs b/Fluid/Values/FluidValueExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using TimeZoneConverter;
 
 namespace Fluid.Values
 {