Merge pull request #82 from sblom/experiment/minimum-netstandard

asbjornu · web-flow · commit ff57ebeb0150 · 2020-10-05T23:24:55.000+02:00
Reduce netstandard version to 1.1
diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs
@@ -14,9 +14,6 @@ namespace JsonLD.Core
 	/// <author>tristan</author>
 	//[System.Serializable]
 	public class Context : JObject
-#if !PORTABLE && !IS_CORECLR
-        , ICloneable
-#endif
     {
         private JsonLdOptions options;
 
diff --git a/src/json-ld.net/Core/JsonLdApi.cs b/src/json-ld.net/Core/JsonLdApi.cs
@@ -2196,7 +2196,6 @@ public virtual RDFDataset ToRDF()
         /// <exception cref="JsonLD.Core.JsonLdError"></exception>
         public virtual object Normalize(RDFDataset dataset)
         {
-#if !PORTABLE
             // create quads and map bnodes to their associated quads
             IList<RDFDataset.Quad> quads = new List<RDFDataset.Quad>();
             IDictionary<string,IDictionary<string,object>> bnodes = new Dictionary<string,IDictionary<string,object>>();
@@ -2247,9 +2246,6 @@ public virtual object Normalize(RDFDataset dataset)
             NormalizeUtils normalizeUtils = new NormalizeUtils(quads, bnodes, new UniqueNamer
                 ("_:c14n"), opts);
             return normalizeUtils.HashBlankNodes(bnodes.Keys);
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
     }
 }
diff --git a/src/json-ld.net/Core/JsonLdProcessor.cs b/src/json-ld.net/Core/JsonLdProcessor.cs
@@ -487,24 +487,16 @@ public static object ToRDF(JToken input)
         /// <exception cref="JsonLDNet.Core.JsonLdError"></exception>
         public static object Normalize(JToken input, JsonLdOptions options)
         {
-#if !PORTABLE
             JsonLdOptions opts = options.Clone();
             opts.format = null;
             RDFDataset dataset = (RDFDataset)ToRDF(input, opts);
             return new JsonLdApi(options).Normalize(dataset);
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
         /// <exception cref="JsonLD.Core.JsonLdError"></exception>
         public static object Normalize(JToken input)
         {
-#if !PORTABLE
             return Normalize(input, new JsonLdOptions(string.Empty));
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
     }
 }
diff --git a/src/json-ld.net/Core/NormalizeUtils.cs b/src/json-ld.net/Core/NormalizeUtils.cs
@@ -29,7 +29,6 @@ public NormalizeUtils(IList<RDFDataset.Quad> quads, IDictionary<string, IDiction
         /// <exception cref="JsonLD.Core.JsonLdError"></exception>
         public virtual object HashBlankNodes(IEnumerable<string> unnamed_)
         {
-#if !PORTABLE
             IList<string> unnamed = new List<string>(unnamed_);
             IList<string> nextUnnamed = new List<string>();
             IDictionary<string, IList<string>> duplicates = new Dictionary<string, IList<string
@@ -203,9 +202,6 @@ public virtual object HashBlankNodes(IEnumerable<string> unnamed_)
                     }
                 }
             }
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
         private sealed class _IComparer_145 : IComparer<NormalizeUtils.HashResult>
@@ -245,7 +241,6 @@ private class HashResult
         /// <param name="callback">(err, result) called once the operation completes.</param>
         private static NormalizeUtils.HashResult HashPaths(string id, IDictionary<string, IDictionary<string, object>> bnodes, UniqueNamer namer, UniqueNamer pathNamer)
         {
-#if !PORTABLE
             MessageDigest md = null;
 
             try
@@ -460,9 +455,6 @@ private static NormalizeUtils.HashResult HashPaths(string id, IDictionary<string
             {
                 md?.Dispose();
             }
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
         /// <summary>Hashes all of the quads about a blank node.</summary>
@@ -500,7 +492,6 @@ private static string HashQuads(string id, IDictionary<string, IDictionary<strin
         /// <returns></returns>
         private static string Sha1hash(ICollection<string> nquads)
         {
-#if !PORTABLE
             try
             {
                 // create SHA-1 digest
@@ -515,9 +506,6 @@ private static string Sha1hash(ICollection<string> nquads)
             {
                 throw;
             }
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
         // TODO: this is something to optimize
diff --git a/src/json-ld.net/Util/JavaCompat.cs b/src/json-ld.net/Util/JavaCompat.cs
@@ -6,10 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-
-#if !PORTABLE
 using System.Security.Cryptography;
-#endif
 
 namespace JsonLD
 {
@@ -281,13 +278,7 @@ public Matcher Matcher(string str)
 
         public string GetPattern()
         {
-#if !PORTABLE && !IS_CORECLR
-            return this.pattern;
-#elif !PORTABLE
             return _rx;
-#else
-            throw new PlatformNotSupportedException();
-#endif
         }
 
         new public static bool Matches(string val, string rx)
@@ -357,7 +348,6 @@ public bool Find()
     }
 
 
-#if !PORTABLE
     internal class MessageDigest : IDisposable
     {
         SHA1 md;
@@ -392,5 +382,4 @@ public void Dispose()
             md.Dispose();
         }
     }
-#endif
 }
diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj
@@ -5,15 +5,14 @@
 Implements the W3C JSON-LD 1.0 standard.</Description>
     <VersionPrefix>1.0.7</VersionPrefix>
     <Authors>NuGet;linked-data-dotnet</Authors>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net40</TargetFrameworks>
     <AssemblyName>json-ld.net</AssemblyName>
     <PackageId>json-ld.net</PackageId>
     <PackageTags>json-ld;jsonld;json;linked-data;rdf;semantic;web</PackageTags>
     <PackageIconUrl>http://json-ld.org/images/json-ld-logo-64.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/linked-data-dotnet/json-ld.net/</PackageProjectUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE</PackageLicenseUrl>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -22,19 +21,12 @@ Implements the W3C JSON-LD 1.0 standard.</Description>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40-client' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'portable45-net45+win8' ">
-    <DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
+    <PackageReference Include="Microsoft.Bcl.Async" Version="1.0.168" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ namespace JsonLD.Core`
`14`	`14`	`/// <author>tristan</author>`
`15`	`15`	`//[System.Serializable]`
`16`	`16`	`public class Context : JObject`
`17`		`-#if !PORTABLE && !IS_CORECLR`
`18`		`- , ICloneable`
`19`		`-#endif`
`20`	`17`	`{`
`21`	`18`	`private JsonLdOptions options;`
`22`	`19`
Original file line number	Diff line number	Diff line change
`@@ -2196,7 +2196,6 @@ public virtual RDFDataset ToRDF()`
`2196`	`2196`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`2197`	`2197`	`public virtual object Normalize(RDFDataset dataset)`
`2198`	`2198`	`{`
`2199`		`-#if !PORTABLE`
`2200`	`2199`	`// create quads and map bnodes to their associated quads`
`2201`	`2200`	`IList<RDFDataset.Quad> quads = new List<RDFDataset.Quad>();`
`2202`	`2201`	`IDictionary<string,IDictionary<string,object>> bnodes = new Dictionary<string,IDictionary<string,object>>();`
`@@ -2247,9 +2246,6 @@ public virtual object Normalize(RDFDataset dataset)`
`2247`	`2246`	`NormalizeUtils normalizeUtils = new NormalizeUtils(quads, bnodes, new UniqueNamer`
`2248`	`2247`	`("_:c14n"), opts);`
`2249`	`2248`	`return normalizeUtils.HashBlankNodes(bnodes.Keys);`
`2250`		`-#else`
`2251`		`- throw new PlatformNotSupportedException();`
`2252`		`-#endif`
`2253`	`2249`	`}`
`2254`	`2250`	`}`
`2255`	`2251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -487,24 +487,16 @@ public static object ToRDF(JToken input)`
`487`	`487`	`/// <exception cref="JsonLDNet.Core.JsonLdError"></exception>`
`488`	`488`	`public static object Normalize(JToken input, JsonLdOptions options)`
`489`	`489`	`{`
`490`		`-#if !PORTABLE`
`491`	`490`	`JsonLdOptions opts = options.Clone();`
`492`	`491`	`opts.format = null;`
`493`	`492`	`RDFDataset dataset = (RDFDataset)ToRDF(input, opts);`
`494`	`493`	`return new JsonLdApi(options).Normalize(dataset);`
`495`		`-#else`
`496`		`- throw new PlatformNotSupportedException();`
`497`		`-#endif`
`498`	`494`	`}`
`499`	`495`
`500`	`496`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`501`	`497`	`public static object Normalize(JToken input)`
`502`	`498`	`{`
`503`		`-#if !PORTABLE`
`504`	`499`	`return Normalize(input, new JsonLdOptions(string.Empty));`
`505`		`-#else`
`506`		`- throw new PlatformNotSupportedException();`
`507`		`-#endif`
`508`	`500`	`}`
`509`	`501`	`}`
`510`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ public NormalizeUtils(IList<RDFDataset.Quad> quads, IDictionary<string, IDiction`
`29`	`29`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`30`	`30`	`public virtual object HashBlankNodes(IEnumerable<string> unnamed_)`
`31`	`31`	`{`
`32`		`-#if !PORTABLE`
`33`	`32`	`IList<string> unnamed = new List<string>(unnamed_);`
`34`	`33`	`IList<string> nextUnnamed = new List<string>();`
`35`	`34`	`IDictionary<string, IList<string>> duplicates = new Dictionary<string, IList<string`
`@@ -203,9 +202,6 @@ public virtual object HashBlankNodes(IEnumerable<string> unnamed_)`
`203`	`202`	`}`
`204`	`203`	`}`
`205`	`204`	`}`
`206`		`-#else`
`207`		`- throw new PlatformNotSupportedException();`
`208`		`-#endif`
`209`	`205`	`}`
`210`	`206`
`211`	`207`	`private sealed class _IComparer_145 : IComparer<NormalizeUtils.HashResult>`
`@@ -245,7 +241,6 @@ private class HashResult`
`245`	`241`	`/// <param name="callback">(err, result) called once the operation completes.</param>`
`246`	`242`	`private static NormalizeUtils.HashResult HashPaths(string id, IDictionary<string, IDictionary<string, object>> bnodes, UniqueNamer namer, UniqueNamer pathNamer)`
`247`	`243`	`{`
`248`		`-#if !PORTABLE`
`249`	`244`	`MessageDigest md = null;`
`250`	`245`
`251`	`246`	`try`
`@@ -460,9 +455,6 @@ private static NormalizeUtils.HashResult HashPaths(string id, IDictionary<string`
`460`	`455`	`{`
`461`	`456`	`md?.Dispose();`
`462`	`457`	`}`
`463`		`-#else`
`464`		`- throw new PlatformNotSupportedException();`
`465`		`-#endif`
`466`	`458`	`}`
`467`	`459`
`468`	`460`	`/// <summary>Hashes all of the quads about a blank node.</summary>`
`@@ -500,7 +492,6 @@ private static string HashQuads(string id, IDictionary<string, IDictionary<strin`
`500`	`492`	`/// <returns></returns>`
`501`	`493`	`private static string Sha1hash(ICollection<string> nquads)`
`502`	`494`	`{`
`503`		`-#if !PORTABLE`
`504`	`495`	`try`
`505`	`496`	`{`
`506`	`497`	`// create SHA-1 digest`
`@@ -515,9 +506,6 @@ private static string Sha1hash(ICollection<string> nquads)`
`515`	`506`	`{`
`516`	`507`	`throw;`
`517`	`508`	`}`
`518`		`-#else`
`519`		`- throw new PlatformNotSupportedException();`
`520`		`-#endif`
`521`	`509`	`}`
`522`	`510`
`523`	`511`	`// TODO: this is something to optimize`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Text.RegularExpressions;`
`9`		`-`
`10`		`-#if !PORTABLE`
`11`	`9`	`using System.Security.Cryptography;`
`12`		`-#endif`
`13`	`10`
`14`	`11`	`namespace JsonLD`
`15`	`12`	`{`
`@@ -281,13 +278,7 @@ public Matcher Matcher(string str)`
`281`	`278`
`282`	`279`	`public string GetPattern()`
`283`	`280`	`{`
`284`		`-#if !PORTABLE && !IS_CORECLR`
`285`		`- return this.pattern;`
`286`		`-#elif !PORTABLE`
`287`	`281`	`return _rx;`
`288`		`-#else`
`289`		`- throw new PlatformNotSupportedException();`
`290`		`-#endif`
`291`	`282`	`}`
`292`	`283`
`293`	`284`	`new public static bool Matches(string val, string rx)`
`@@ -357,7 +348,6 @@ public bool Find()`
`357`	`348`	`}`
`358`	`349`
`359`	`350`
`360`		`-#if !PORTABLE`
`361`	`351`	`internal class MessageDigest : IDisposable`
`362`	`352`	`{`
`363`	`353`	`SHA1 md;`
`@@ -392,5 +382,4 @@ public void Dispose()`
`392`	`382`	`md.Dispose();`
`393`	`383`	`}`
`394`	`384`	`}`
`395`		`-#endif`
`396`	`385`	`}`