From c51328af912d685d06da8e761f673424524fd974 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 12 Jun 2019 20:42:23 +0200 Subject: [PATCH 1/4] Drop netstandard1.x and netcoreapp1.x --- plist-cil/PropertyListException.cs | 4 ---- plist-cil/PropertyListParser.cs | 8 -------- plist-cil/plist-cil.csproj | 28 ++-------------------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/plist-cil/PropertyListException.cs b/plist-cil/PropertyListException.cs index 7c235f3..b608832 100644 --- a/plist-cil/PropertyListException.cs +++ b/plist-cil/PropertyListException.cs @@ -25,9 +25,7 @@ // SOFTWARE. using System; -#if NET45 using System.Runtime.Serialization; -#endif namespace Claunia.PropertyList { @@ -62,11 +60,9 @@ namespace Claunia.PropertyList /// public PropertyListException(string message, Exception inner) : base(message, inner) { } - #if !NETCORE protected PropertyListException(SerializationInfo info, StreamingContext context) : base(info, context) { } - #endif } } \ No newline at end of file diff --git a/plist-cil/PropertyListParser.cs b/plist-cil/PropertyListParser.cs index 729d1a8..28249cb 100644 --- a/plist-cil/PropertyListParser.cs +++ b/plist-cil/PropertyListParser.cs @@ -247,16 +247,8 @@ namespace Claunia.PropertyList /// When an error occurs during the writing process. public static void SaveAsXml(NSObject root, Stream outStream) { - #if NET40 - // The StreamWriter constructor which takes a "leaveOpen" parameter is - // not available on .NET 4.0 - StreamWriter w = new StreamWriter(outStream, Encoding.UTF8); - w.Write(root.ToXmlPropertyList()); - w.Close(); -#else using(StreamWriter w = new StreamWriter(outStream, Encoding.UTF8, 1024, true)) w.Write(root.ToXmlPropertyList()); - #endif } /// diff --git a/plist-cil/plist-cil.csproj b/plist-cil/plist-cil.csproj index 2ebde71..6af09bc 100644 --- a/plist-cil/plist-cil.csproj +++ b/plist-cil/plist-cil.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0;netstandard1.3;netstandard1.4;netstandard1.6;netcoreapp2.0;netstandard2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1 + net45;netcoreapp2.0;netstandard2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1 2.1 Natalia Portillo Claunia.com @@ -46,31 +46,7 @@ Use invariant culture to format NSDate. - - - - - - - - - - - - - - - - - - - - - - - - - + From b515ce24532e55c7c1b83116c980e42e260e8691 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 19 Aug 2020 17:28:56 +0200 Subject: [PATCH 2/4] Build with Visual Studio 2019 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 20c781d..b4295ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +image: Visual Studio 2019 + build_script: - cmd: dotnet build -c Release --version-suffix r%APPVEYOR_BUILD_NUMBER% - cmd: dotnet test plist-cil.test\plist-cil.test.csproj From 10a81384325dae0745f80a60bc8c6f2dadbe0b4b Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 19 Aug 2020 17:33:11 +0200 Subject: [PATCH 3/4] Fix BenchmarkDotNet path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b4295ed..d899968 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,4 +12,4 @@ on_success: artifacts: - path: "plist-cil\\bin\\Release\\plist-cil.*.nupkg" - - path: "plist-cil.benchmark\\BenchmarkDotNet.Artifacts\\results\\*.*" \ No newline at end of file + - path: "BenchmarkDotNet.Artifacts\\results\\*.*" \ No newline at end of file From 1a96a36138c3fe66d93dc993e42c524ab041f65f Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 19 Aug 2020 17:41:17 +0200 Subject: [PATCH 4/4] Remove unneeded step --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d899968..d15714a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,9 +7,6 @@ build_script: - cmd: git checkout master - cmd: dotnet run --project plist-cil.benchmark/plist-cil.benchmark.csproj -c Release -on_success: - - cmd: dotnet pack plist-cil\plist-cil.csproj -c Release --version-suffix r%APPVEYOR_BUILD_NUMBER% - artifacts: - path: "plist-cil\\bin\\Release\\plist-cil.*.nupkg" - path: "BenchmarkDotNet.Artifacts\\results\\*.*" \ No newline at end of file