From 7331333a8c53de593ad5f9d9bd21c8f3c2cb3d60 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Tue, 2 Apr 2024 07:37:53 +1100 Subject: [PATCH] Cleanup of csproj --- source/Handlebars.Test/DynamicTests.cs | 16 ++++---- source/Handlebars.Test/Handlebars.Test.csproj | 30 -------------- source/Handlebars/Handlebars.csproj | 19 --------- source/Handlebars/IO/EncodedTextWriter.cs | 40 +++++++++---------- 4 files changed, 28 insertions(+), 77 deletions(-) diff --git a/source/Handlebars.Test/DynamicTests.cs b/source/Handlebars.Test/DynamicTests.cs index e5c75f3b..b11fc6d8 100644 --- a/source/Handlebars.Test/DynamicTests.cs +++ b/source/Handlebars.Test/DynamicTests.cs @@ -22,7 +22,7 @@ public class EnvGenerator : IEnumerable IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); } - + [Fact] public void DynamicObjectBasicTest() { @@ -36,7 +36,7 @@ public void DynamicObjectBasicTest() Assert.Equal("Foo: 1\nBar: hello world", output); } - + [Fact] public void DynamicObjectBasicIterationTest() { @@ -106,7 +106,7 @@ public void JsonTestArrays(IHandlebars handlebars){ Assert.Equal("Key1Val1Key2Val2", output); } - + [Theory] [ClassData(typeof(EnvGenerator))] public void JsonTestArrayCount(IHandlebars handlebars) @@ -121,7 +121,7 @@ public void JsonTestArrayCount(IHandlebars handlebars) Assert.Equal("2", output); } - + [Theory] [ClassData(typeof(EnvGenerator))] public void JsonTestObjects(IHandlebars handlebars){ @@ -150,7 +150,7 @@ public void JObjectTest(IHandlebars handlebars) { Assert.Equal("", output); } - + [Theory] [ClassData(typeof(EnvGenerator))] public void WithParentIndexJsonNet(IHandlebars handlebars) @@ -174,7 +174,7 @@ public void WithParentIndexJsonNet(IHandlebars handlebars) {{/each}} {{/each}} {{/each}}"; - + var template = handlebars.Compile( source ); var data = new { @@ -281,13 +281,13 @@ public void WithParentIndexJsonNet(IHandlebars handlebars) index=[1:1:1] first=[False:False:False] last=[True:True:True]"; - + Func makeFlat = text => text.Replace( " ", "" ).Replace( "\n", "" ).Replace( "\r", "" ); Assert.Equal( makeFlat( expected ), makeFlat( result ) ); } -#if !netstandard +#if NET452 || NET46 || NET461 || NET472 [Fact] public void SystemJsonTestArrays() diff --git a/source/Handlebars.Test/Handlebars.Test.csproj b/source/Handlebars.Test/Handlebars.Test.csproj index 36e8e33c..98d9b6fe 100644 --- a/source/Handlebars.Test/Handlebars.Test.csproj +++ b/source/Handlebars.Test/Handlebars.Test.csproj @@ -9,39 +9,9 @@ false false true - - - 0618;1701 - - $(DefineConstants);netFramework - - - $(DefineConstants);netFramework - - - $(DefineConstants);netFramework - - - $(DefineConstants);netFramework - - - - $(DefineConstants);netcoreapp;netstandard - - - $(DefineConstants);netcoreapp;netstandard - - - - $(DefineConstants);netcoreapp;netstandard;net - - - $(DefineConstants);netcoreapp;netstandard;net - - diff --git a/source/Handlebars/Handlebars.csproj b/source/Handlebars/Handlebars.csproj index e92d068a..f0256a00 100644 --- a/source/Handlebars/Handlebars.csproj +++ b/source/Handlebars/Handlebars.csproj @@ -8,25 +8,6 @@ 2.0.0 HandlebarsDotNet true - - - - $(DefineConstants);netstandard;netstandard1_3 - - - $(DefineConstants);netstandard - - - $(DefineConstants);NET451 - - - $(DefineConstants);NET452 - - - $(DefineConstants);NET46 - - - Rex Morgan Copyright © 2014-2020 Rex Morgan Blistering-fast Handlebars.js templates in your .NET application. diff --git a/source/Handlebars/IO/EncodedTextWriter.cs b/source/Handlebars/IO/EncodedTextWriter.cs index e70926be..8bb0f102 100644 --- a/source/Handlebars/IO/EncodedTextWriter.cs +++ b/source/Handlebars/IO/EncodedTextWriter.cs @@ -20,24 +20,24 @@ public bool SuppressEncoding { [MethodImpl(MethodImplOptions.AggressiveInlining)] get => !_encoder.Enabled; - + [MethodImpl(MethodImplOptions.AggressiveInlining)] set => _encoder.Enabled = !value; } - + [MethodImpl(MethodImplOptions.AggressiveInlining)] public EncodedTextWriter( TextWriter writer, - ITextEncoder encoder, - IFormatterProvider formatterProvider, + ITextEncoder encoder, + IFormatterProvider formatterProvider, bool suppressEncoding = false) { UnderlyingWriter = writer; _formatterProvider = formatterProvider; - _encoder = encoder != null - ? TextEncoderWrapper.Create(encoder) + _encoder = encoder != null + ? TextEncoderWrapper.Create(encoder) : TextEncoderWrapper.Null; - + SuppressEncoding = suppressEncoding; } @@ -52,7 +52,7 @@ public void Write(string value, bool encode) _encoder.Encode(value, UnderlyingWriter); return; } - + UnderlyingWriter.Write(value); } @@ -70,7 +70,7 @@ public void Write(StringBuilder value, bool encode = true) UnderlyingWriter.Write(value[i]); } } - + [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Write(Substring value, bool encode = true) { @@ -85,7 +85,7 @@ public void Write(Substring value, bool encode = true) UnderlyingWriter.Write(value[i]); } } - + [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Write(T value, bool encode) where T: IEnumerator { @@ -100,7 +100,7 @@ public void Write(T value, bool encode) where T: IEnumerator UnderlyingWriter.Write(value.Current); } } - + [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Write(string value) => Write(value, true); @@ -119,26 +119,26 @@ public void Write(T value) switch (value) { case null: - case string v when string.IsNullOrEmpty(v): + case string v when string.IsNullOrEmpty(v): case StringBuilder st when st.Length == 0: case Substring substring when substring.Length == 0: return; - + case string v: Write(v, true); return; case StringBuilder v: Write(v, true); return; - case Substring v: Write(v, true); return; - + case Substring v: Write(v, true); return; + default: WriteFormatted(value); return; } } - + [MethodImpl(MethodImplOptions.AggressiveInlining)] private void WriteFormatted(T value) { var type = typeof(T); -#if netstandard1_3 +#if NETSTANDARD1_3 if (type.GetTypeInfo().IsClass) type = value.GetType(); #else if (type.IsClass) type = value.GetType(); @@ -155,11 +155,11 @@ public Encoding Encoding [MethodImpl(MethodImplOptions.AggressiveInlining)] get => UnderlyingWriter.Encoding; } - + public void Dispose() => _encoder.Dispose(); - + public override string ToString() => UnderlyingWriter.ToString(); - + private static class Throw { [MethodImpl(MethodImplOptions.AggressiveInlining)]