claunia/plist-cil
1
0
Fork 0
mirror of https://github.com/claunia/plist-cil.git synced 2025-12-16 19:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from quamotion/fixes/drop-net-core-1

Browse Source 
Drop netstandard1.x and netcoreapp1.x
This commit is contained in:
Natalia Portillo
2020-08-24 23:12:02 +01:00
committed by GitHub
parent 03462a8b74 1a96a36138
commit b97e989089
4 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appveyor.yml
View File

@@ -7,9 +7,6 @@ build_script:
- cmd: git checkout master - cmd: git checkout master
- cmd: dotnet run --project plist-cil.benchmark/plist-cil.benchmark.csproj -c Release - 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: artifacts:
- path: "plist-cil\\bin\\Release\\plist-cil.*.nupkg" - path: "plist-cil\\bin\\Release\\plist-cil.*.nupkg"
- path: "plist-cil.benchmark\\BenchmarkDotNet.Artifacts\\results\\*.*" - path: "BenchmarkDotNet.Artifacts\\results\\*.*"

4
plist-cil/PropertyListException.cs
View File

@@ -25,9 +25,7 @@
// SOFTWARE. // SOFTWARE.
using System; using System;
#if NET45
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endif
namespace Claunia.PropertyList namespace Claunia.PropertyList
{ {
@@ -62,11 +60,9 @@ namespace Claunia.PropertyList
/// </param> /// </param>
public PropertyListException(string message, Exception inner) : base(message, inner) { } public PropertyListException(string message, Exception inner) : base(message, inner) { }
#if !NETCORE
protected PropertyListException(SerializationInfo info, StreamingContext context) protected PropertyListException(SerializationInfo info, StreamingContext context)
: base(info, context) : base(info, context)
{ {
} }
#endif
} }
} }

8
plist-cil/PropertyListParser.cs
View File

@@ -247,16 +247,8 @@ namespace Claunia.PropertyList
/// <exception cref="IOException">When an error occurs during the writing process.</exception> /// <exception cref="IOException">When an error occurs during the writing process.</exception>
public static void SaveAsXml(NSObject root, Stream outStream) 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)) using(StreamWriter w = new StreamWriter(outStream, Encoding.UTF8, 1024, true))
w.Write(root.ToXmlPropertyList()); w.Write(root.ToXmlPropertyList());
#endif
} }
/// <summary> /// <summary>

28
plist-cil/plist-cil.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.0;netstandard1.3;netstandard1.4;netstandard1.6;netcoreapp2.0;netstandard2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.0;netstandard2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
<VersionPrefix>2.1</VersionPrefix> <VersionPrefix>2.1</VersionPrefix>
<Authors>Natalia Portillo</Authors> <Authors>Natalia Portillo</Authors>
<Company>Claunia.com</Company> <Company>Claunia.com</Company>
@@ -46,31 +46,7 @@ Use invariant culture to format NSDate.</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="System" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard1.')) Or $(TargetFramework.StartsWith('netcoreapp1.'))">
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Globalization" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'"> <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">