Merge pull request #86 from linked-data-dotnet/support/1.x-from-master

goofballLogic · web-flow · commit 8c0934bf07ae · 2020-10-23T17:55:24.000+01:00
Support/1.x from master
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,18 +1,29 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 90
+
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 30
+
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned
   - security
   - bug
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
+
 # Label to use when marking an issue as stale
 staleLabel: stale
+
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. After 30 days from now, it will be closed if no further
   activity occurs. Thank you for your contributions.
+
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,21 @@
+name: docker
+
+on:
+  push:
+    branches: [master]
+    tags: ["*"]
+  pull_request:
+    branches: [master] 
+
+jobs:
+  docker:
+    name: build & run tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: docker build
+        run: docker build -t json-ld.net .
+      - name: docker test
+        run: docker run --rm json-ld.net dotnet test
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -2,32 +2,131 @@ name: dotnet
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
+    tags: ["*"]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    outputs:
+      fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }}
+
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - uses: gittools/actions/gitversion/setup@v0.9.4
+        with:
+          versionSpec: "5.x"
+
+      - id: gitversion
+        uses: gittools/actions/gitversion/execute@v0.9.4
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 2.1.401
+
+      - uses: actions/cache@v2
+        env:
+          NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: ${{ runner.os }}-nuget-
+
+      - run: dotnet restore
 
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.1.401
+      - run: dotnet build --configuration Release --no-restore
 
-    - name: Install dependencies
-      run: dotnet restore
+      - run: |
+          dotnet test \
+            --configuration Release \
+            --no-build \
+            --no-restore \
+            -p:CollectCoverage=true \
+            -p:CoverletOutputFormat=opencover \
+            -p:Exclude="[JsonLD.Test*]*"
 
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
+      - name: Codecov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: bash <(curl -s https://codecov.io/bash)
+
+      - run: |
+          dotnet pack \
+            --include-source \
+            --configuration Release \
+            --no-build \
+            --no-restore \
+            -p:PackageVersion="${{ steps.gitversion.outputs.fullSemVer }}" \
+            src/json-ld.net/json-ld.net.csproj \
+            --output ${{ github.workspace }}/nugets/
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: nugets
+          path: nugets
+
+  nuget-push-dev:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs: build
+
+    steps:
+      - name: download artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: nugets
 
-    - name: Test
-      run: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*"
+      - name: setup dotnet
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1
+          source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: nuget push
+        run: dotnet nuget push "*.nupkg" --skip-duplicate --api-key ${{ secrets.GITHUB_TOKEN }}
+
+  nuget-push-prod:
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: build
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: nugets
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 2.1.401
+          source-url: https://api.nuget.org/v3/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
+
+      - run: dotnet nuget push nugets/*.nupkg --skip-duplicate
+
+  release-artifacts:
+    runs-on: ubuntu-latest
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - uses: actions/download-artifact@v1
+        with:
+          name: nugets
 
-    - name: Codecov
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      run: bash <(curl -s https://codecov.io/bash)
+      - name: Upload to stable release
+        uses: svenstaro/upload-release-action@v1-release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: nugets
+          asset_name: json-ld.net
+          tag: ${{ github.ref }}
+          overwrite: true
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,20 @@
+# If you want to build and test under Linux using a docker container, here's how:
+#
+#> docker build -t json-ld.net .
+#> docker run --rm json-ld.net dotnet test -v normal
+
+# .NET Core 2.1 on Ubuntu 18.04 LTS
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1-bionic
+
+WORKDIR /App
+
+# First we ONLY copy sln and csproj files so that we don't have to re-cache
+# dotnet restore every time a .cs file changes
+COPY src/json-ld.net/json-ld.net.csproj src/json-ld.net/json-ld.net.csproj
+COPY test/json-ld.net.tests/json-ld.net.tests.csproj test/json-ld.net.tests/json-ld.net.tests.csproj
+COPY JsonLD.sln JsonLD.sln
+RUN dotnet restore
+
+# Then we copy everything and run dotnet build
+COPY . .
+RUN dotnet build
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
diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj

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`	`}`