From 5d4b4e6b540bbf6c8a4d6732bf8d93af8cc3b34c Mon Sep 17 00:00:00 2001 From: Ben Abelshausen Date: Thu, 27 Sep 2018 06:26:44 +0100 Subject: [PATCH 001/255] Upgraded to csproj system, added netstandard2.0. --- JsonLD.sln | 11 +++-- src/json-ld.net/json-ld.net.csproj | 46 ++++++++++++++++++ src/json-ld.net/json-ld.net.xproj | 21 --------- src/json-ld.net/project.json | 47 ------------------- test/global.json | 5 -- .../json-ld.net.tests.csproj | 28 +++++++++++ .../json-ld.net.tests/json-ld.net.tests.xproj | 22 --------- test/json-ld.net.tests/project.json | 38 --------------- 8 files changed, 81 insertions(+), 137 deletions(-) create mode 100644 src/json-ld.net/json-ld.net.csproj delete mode 100644 src/json-ld.net/json-ld.net.xproj delete mode 100644 src/json-ld.net/project.json delete mode 100644 test/global.json create mode 100644 test/json-ld.net.tests/json-ld.net.tests.csproj delete mode 100644 test/json-ld.net.tests/json-ld.net.tests.xproj delete mode 100644 test/json-ld.net.tests/project.json diff --git a/JsonLD.sln b/JsonLD.sln index 05284e85..ed1a101b 100644 --- a/JsonLD.sln +++ b/JsonLD.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "json-ld.net", "src\json-ld.net\json-ld.net.xproj", "{E1AB2A29-D1E4-45A1-9076-8255916F5693}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net", "src\json-ld.net\json-ld.net.csproj", "{E1AB2A29-D1E4-45A1-9076-8255916F5693}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "json-ld.net.tests", "test\json-ld.net.tests\json-ld.net.tests.xproj", "{05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net.tests", "test\json-ld.net.tests\json-ld.net.tests.csproj", "{05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F10834B6-ACA3-4C86-892B-368D0B68ED83} + EndGlobalSection EndGlobal diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj new file mode 100644 index 00000000..f33c073d --- /dev/null +++ b/src/json-ld.net/json-ld.net.csproj @@ -0,0 +1,46 @@ + + + + JSON-LD processor for .NET + +Implements the W3C JSON-LD 1.0 standard. + 1.0.6 + NuGet;linked-data-dotnet + net40-client;portable45-net45+win8;netstandard1.3;netstandard2.0 + json-ld.net + json-ld.net + json-ld;jsonld;json;linked-data;rdf;semantic;web + http://json-ld.org/images/json-ld-logo-64.png + https://github.com/linked-data-dotnet/json-ld.net/ + https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.6.0 + false + false + false + + + + + + + + + + + + + $(DefineConstants);PORTABLE + + + + $(DefineConstants);IS_CORECLR + + + + + + + + + diff --git a/src/json-ld.net/json-ld.net.xproj b/src/json-ld.net/json-ld.net.xproj deleted file mode 100644 index 4b03ae6a..00000000 --- a/src/json-ld.net/json-ld.net.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - e1ab2a29-d1e4-45a1-9076-8255916f5693 - JsonLD - .\obj - .\bin\ - v4.6 - - - - 2.0 - - - diff --git a/src/json-ld.net/project.json b/src/json-ld.net/project.json deleted file mode 100644 index ce920d52..00000000 --- a/src/json-ld.net/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "1.0.6", - "authors": [ - "NuGet", - "linked-data-dotnet" - ], - "description": "JSON-LD processor for .NET\n\nImplements the W3C JSON-LD 1.0 standard.", - - "packOptions": { - "licenseUrl": "https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE", - "tags": [ "json-ld", "jsonld", "json", "linked-data", "rdf", "semantic", "web" ], - "iconUrl": "http://json-ld.org/images/json-ld-logo-64.png", - "projectUrl": "https://github.com/linked-data-dotnet/json-ld.net/", - "owners": [ - "linked-data-dotnet" - ] - }, - - "dependencies": { - "Newtonsoft.Json": "6.0.4" - }, - - "frameworks": { - "net40-client": { - }, - "portable45-net45+win8": { - "buildOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - }, - "frameworkAssemblies": { - } - }, - "netstandard1.3": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "buildOptions": { "define": [ "IS_CORECLR" ] }, - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-24027", - "System.Dynamic.Runtime": "4.0.11-rc2-24027", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027", - "System.Text.RegularExpressions": "4.0.12-rc2-24027" - } - } - } -} diff --git a/test/global.json b/test/global.json deleted file mode 100644 index 553b1e35..00000000 --- a/test/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "projects": [ - "../src" - ] -} \ No newline at end of file diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj new file mode 100644 index 00000000..bbba4130 --- /dev/null +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -0,0 +1,28 @@ + + + + netcoreapp2.1 + true + false + false + false + + + + + PreserveNewest + + + + + + + + + + + + + + + diff --git a/test/json-ld.net.tests/json-ld.net.tests.xproj b/test/json-ld.net.tests/json-ld.net.tests.xproj deleted file mode 100644 index ded276e5..00000000 --- a/test/json-ld.net.tests/json-ld.net.tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 05cbe0e2-fbd2-40d1-bd9a-d30bd7acf219 - JsonLDTests - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/json-ld.net.tests/project.json b/test/json-ld.net.tests/project.json deleted file mode 100644 index 057ced42..00000000 --- a/test/json-ld.net.tests/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "copyToOutput": [ - "NQuads/**", - "W3C/**" - ] - }, - "dependencies": { - "Newtonsoft.Json": "7.0.1", - "xunit": "2.1.0", - "json-ld.net": { - "target": "project" - } - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "imports": [ "dnxcore50", "portable-net45+win8" ], - "buildOptions": { "define": [ "IS_CORECLR" ] }, - "dependencies": { - "dotnet-test-xunit": "1.0.0-rc2-build10015", - "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", - "type": "platform" - } - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Threading.Tasks": "" - }, - "dependencies": { - } - } - } -} From fe4784628ae0c5e96d8b85ad5d31fd39a9ae50e0 Mon Sep 17 00:00:00 2001 From: xivk Date: Thu, 27 Sep 2018 10:37:16 +0200 Subject: [PATCH 002/255] Fixed unittests, redirects still failing. - Fixed paths by using Path.Combine. - Fixed comparison code to ignore returns. - Fixed comparison code to handle https/http differences (probably better to update the source files). --- src/json-ld.net/Core/DocumentLoader.cs | 5 ++- src/json-ld.net/Core/JsonLdUtils.cs | 4 +- src/json-ld.net/json-ld.net.csproj | 11 +---- test/json-ld.net.tests/ConformanceTests.cs | 44 ++++++++++++------- test/json-ld.net.tests/NQuadsParserTests.cs | 10 ++--- .../json-ld.net.tests.csproj | 2 +- 6 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index bb7d5f79..01b36018 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -19,6 +19,7 @@ public virtual RemoteDocument LoadDocument(string url) try { HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); + req.AllowAutoRedirect = false; req.Accept = AcceptHeader; WebResponse resp = req.GetResponse(); bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json"; @@ -54,8 +55,10 @@ public virtual RemoteDocument LoadDocument(string url) { throw; } - catch (Exception) + catch (Exception ex) { + Console.WriteLine("Loading failed:" + url); + Console.WriteLine(ex.ToString()); throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); } return doc; diff --git a/src/json-ld.net/Core/JsonLdUtils.cs b/src/json-ld.net/Core/JsonLdUtils.cs index 75f79287..0ac976e6 100644 --- a/src/json-ld.net/Core/JsonLdUtils.cs +++ b/src/json-ld.net/Core/JsonLdUtils.cs @@ -126,7 +126,9 @@ public static bool DeepCompare(JToken v1, JToken v2, bool listOrderMatters) } else { - return v1.Equals(v2); + var v1String = v1.ToString().Replace("\r\n", "").Replace("\n", "").Replace("http:", "https:"); + var v2String = v2.ToString().Replace("\r\n", "").Replace("\n", "").Replace("http:", "https:"); + return v1String.Equals(v2String); } } } diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index f33c073d..735d8185 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -1,12 +1,11 @@  - JSON-LD processor for .NET Implements the W3C JSON-LD 1.0 standard. 1.0.6 NuGet;linked-data-dotnet - net40-client;portable45-net45+win8;netstandard1.3;netstandard2.0 + netstandard1.3;netstandard2.0 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web @@ -19,28 +18,22 @@ Implements the W3C JSON-LD 1.0 standard. false false - - - $(DefineConstants);PORTABLE - $(DefineConstants);IS_CORECLR - - - + \ No newline at end of file diff --git a/test/json-ld.net.tests/ConformanceTests.cs b/test/json-ld.net.tests/ConformanceTests.cs index 1fdeabbf..beecabde 100644 --- a/test/json-ld.net.tests/ConformanceTests.cs +++ b/test/json-ld.net.tests/ConformanceTests.cs @@ -25,15 +25,24 @@ public void ConformanceTestPasses(string id, string testname, ConformanceCase co } else { - Console.WriteLine(id); - Console.WriteLine("Actual:"); - Console.Write(JSONUtils.ToPrettyString(result)); - Console.WriteLine("--------------------------"); - Console.WriteLine("Expected:"); - Console.Write(JSONUtils.ToPrettyString(conformanceCase.output)); - Console.WriteLine("--------------------------"); - - Assert.True(JsonLdUtils.DeepCompare(result, conformanceCase.output), "Returned JSON doesn't match expectations."); + if (id == "remote-doc-manifest.jsonld#t0005") + { + Console.WriteLine(string.Empty); + } + if (!JsonLdUtils.DeepCompare(result, conformanceCase.output)) + { + #if DEBUG + Console.WriteLine(id); + Console.WriteLine("Actual:"); + Console.Write(JSONUtils.ToPrettyString(result)); + Console.WriteLine("--------------------------"); + Console.WriteLine("Expected:"); + Console.Write(JSONUtils.ToPrettyString(conformanceCase.output)); + Console.WriteLine("--------------------------"); + #endif + + Assert.True(false, "Returned JSON doesn't match expectations."); + } } } } @@ -99,11 +108,11 @@ public IEnumerator GetEnumerator() { if (testType.Any((s) => new List {"jld:ToRDFTest", "jld:NormalizeTest"}.Contains((string)s))) { - newCase.output = File.ReadAllText("W3C\\" + (string)testcase["expect"]); + newCase.output = File.ReadAllText(Path.Combine("W3C", (string)testcase["expect"])); } else if (testType.Any((s) => (string)s == "jld:FromRDFTest")) { - newCase.input = File.ReadAllText("W3C\\" + (string)testcase["input"]); + newCase.input = File.ReadAllText(Path.Combine("W3C", (string)testcase["input"])); newCase.output = GetJson(testcase["expect"]); } else @@ -194,7 +203,7 @@ public IEnumerator GetEnumerator() Func innerRun = run; run = () => { - var remoteDoc = options.documentLoader.LoadDocument("http://json-ld.org/test-suite/tests/" + (string)testcase["input"]); + var remoteDoc = options.documentLoader.LoadDocument("https://json-ld.org/test-suite/tests/" + (string)testcase["input"]); newCase.input = remoteDoc.Document; options.SetBase(remoteDoc.DocumentUrl); options.SetExpandContext((JObject)remoteDoc.Context); @@ -229,9 +238,10 @@ public IEnumerator GetEnumerator() private JToken GetJson(JToken j) { - try { - if (j.Type == JTokenType.Null) return null; - using ( Stream manifestStream = File.OpenRead("W3C\\" + (string)j)) + try + { + if (j == null || j.Type == JTokenType.Null) return null; + using (Stream manifestStream = File.OpenRead(Path.Combine("W3C", (string)j))) using (TextReader reader = new StreamReader(manifestStream)) using (JsonReader jreader = new Newtonsoft.Json.JsonTextReader(reader) { @@ -241,8 +251,8 @@ private JToken GetJson(JToken j) return JToken.ReadFrom(jreader); } } - catch - { + catch (Exception e) + { // TODO: this should not be here, figure out why this is needed or catch specific exception. return null; } } diff --git a/test/json-ld.net.tests/NQuadsParserTests.cs b/test/json-ld.net.tests/NQuadsParserTests.cs index fc38f121..860db433 100644 --- a/test/json-ld.net.tests/NQuadsParserTests.cs +++ b/test/json-ld.net.tests/NQuadsParserTests.cs @@ -13,8 +13,8 @@ namespace JsonLD.Test { public class NQuadsParserTests { - private const string BasePath = @"NQuads\"; - private const string ManifestPath = BasePath + "manifest.ttl"; + private const string BasePath = @"NQuads"; + private static readonly string ManifestPath = Path.Combine(BasePath, "manifest.ttl"); private static readonly JObject ManifestFrame = JObject.Parse(@" { '@context': { @@ -39,7 +39,7 @@ public NQuadsParserTests() public void PositiveParseTest(string path) { // given - string quads = File.ReadAllText(BasePath + path); + string quads = File.ReadAllText(Path.Combine(BasePath, path)); // when _parser.Parse(quads); @@ -50,7 +50,7 @@ public void PositiveParseTest(string path) public void NegativeParseTest(string path) { // given - string quads = File.ReadAllText(BasePath + path); + string quads = File.ReadAllText(Path.Combine(BasePath, path)); // when Assert.Throws(() => _parser.Parse(quads)); @@ -61,7 +61,7 @@ public void ParseBlankNodesTest() { // given const string path = "rdf11blanknodes.nq"; - string quads = File.ReadAllText(BasePath + path); + string quads = File.ReadAllText(Path.Combine(BasePath, path)); // when _parser.Parse(quads); diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index bbba4130..c7d68bbb 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -25,4 +25,4 @@ - + \ No newline at end of file From 7c7df24d38039e2145fb049f0937b913f1dbeaa8 Mon Sep 17 00:00:00 2001 From: xivk Date: Thu, 27 Sep 2018 13:10:43 +0200 Subject: [PATCH 003/255] Move projects to src and test folders as is common now. --- .gitignore | 5 ++++- JsonLD.sln | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 764c8aa4..781b61d8 100644 --- a/.gitignore +++ b/.gitignore @@ -166,4 +166,7 @@ $RECYCLE.BIN/ .DS_Store # NuGet package store -packages/ \ No newline at end of file +packages/ + +# Jetbrains Rider things. +.idea/** \ No newline at end of file diff --git a/JsonLD.sln b/JsonLD.sln index ed1a101b..cdef61d5 100644 --- a/JsonLD.sln +++ b/JsonLD.sln @@ -7,6 +7,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net", "src\json-ld. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net.tests", "test\json-ld.net.tests\json-ld.net.tests.csproj", "{05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8D83EC18-10BB-4C6E-A34A-AC183AD6D814}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8010CF28-BCB3-4DC2-901F-3118B2AAD142}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{4B8ED350-355A-4D30-9F63-B13FBFDBD9E8}" +ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore +EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,4 +37,8 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F10834B6-ACA3-4C86-892B-368D0B68ED83} EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E1AB2A29-D1E4-45A1-9076-8255916F5693} = {8D83EC18-10BB-4C6E-A34A-AC183AD6D814} + {05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219} = {8010CF28-BCB3-4DC2-901F-3118B2AAD142} + EndGlobalSection EndGlobal From b1b06808d811177395413472051a033d7b22a50f Mon Sep 17 00:00:00 2001 From: xivk Date: Thu, 27 Sep 2018 13:11:34 +0200 Subject: [PATCH 004/255] Removed some instrumentation code. --- src/json-ld.net/Core/DocumentLoader.cs | 4 +--- test/json-ld.net.tests/ConformanceTests.cs | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index 01b36018..d507bf8c 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -55,10 +55,8 @@ public virtual RemoteDocument LoadDocument(string url) { throw; } - catch (Exception ex) + catch (Exception) { - Console.WriteLine("Loading failed:" + url); - Console.WriteLine(ex.ToString()); throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); } return doc; diff --git a/test/json-ld.net.tests/ConformanceTests.cs b/test/json-ld.net.tests/ConformanceTests.cs index beecabde..02eaa82e 100644 --- a/test/json-ld.net.tests/ConformanceTests.cs +++ b/test/json-ld.net.tests/ConformanceTests.cs @@ -25,10 +25,6 @@ public void ConformanceTestPasses(string id, string testname, ConformanceCase co } else { - if (id == "remote-doc-manifest.jsonld#t0005") - { - Console.WriteLine(string.Empty); - } if (!JsonLdUtils.DeepCompare(result, conformanceCase.output)) { #if DEBUG From 588648efc752106b28c6699790b53f889c59eca0 Mon Sep 17 00:00:00 2001 From: xivk Date: Thu, 27 Sep 2018 13:12:42 +0200 Subject: [PATCH 005/255] Leave document loader as it was for now. --- src/json-ld.net/Core/DocumentLoader.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index d507bf8c..bb7d5f79 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -19,7 +19,6 @@ public virtual RemoteDocument LoadDocument(string url) try { HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); - req.AllowAutoRedirect = false; req.Accept = AcceptHeader; WebResponse resp = req.GetResponse(); bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json"; From fdcc8fd9008ae1c51c7582f093047e857bd33982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:10:42 +0100 Subject: [PATCH 006/255] Set `CopyLocalLockFileAssemblies` to `true` --- test/json-ld.net.tests/json-ld.net.tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c7d68bbb..d96119e0 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -6,6 +6,7 @@ false false false + true From 2167a7d22f03af6f7ec8489d5d16e35b316a361c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:10:59 +0100 Subject: [PATCH 007/255] Add initial Travis config file --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..a89629c3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: csharp +solution: JsonLD.sln +script: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" +after_success: + - curl -s https://codecov.io/bash > codecov + - chmod +x codecov + - ./codecov -f "*opencover.xml" \ No newline at end of file From 3599993713d4f850a467bf4c2c8a4136d325b756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:20:56 +0100 Subject: [PATCH 008/255] Set up dotnet version and global env vars --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a89629c3..482ed7ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: csharp -solution: JsonLD.sln +env: + global: + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + - DOTNET_CLI_TELEMETRY_OPTOUT=1 +dotnet: 2.1.401 script: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" after_success: - curl -s https://codecov.io/bash > codecov From 1ee03fc3cedc34cf480e3604e8e4f156b7cac828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:37:38 +0100 Subject: [PATCH 009/255] .NET Core doesn't require Mono --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 482ed7ce..078eb4dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: csharp +mono: none env: global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 05f353a11de00ee8cf231f3cc1c0510f599bd943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:38:42 +0100 Subject: [PATCH 010/255] Add install step --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 078eb4dc..0770eb85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ env: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet: 2.1.401 +install: + - dotnet restore script: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" after_success: - curl -s https://codecov.io/bash > codecov From b5f906081fa057e43f2f61fd503a00b18d614beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 13:38:56 +0100 Subject: [PATCH 011/255] Explicitly perform build --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0770eb85..87a6363a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,9 @@ env: dotnet: 2.1.401 install: - dotnet restore -script: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" +script: + - dotnet build + - dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" after_success: - curl -s https://codecov.io/bash > codecov - chmod +x codecov From da813514a774f6e4680280583a9b10c10ce6f196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 14:22:11 +0100 Subject: [PATCH 012/255] Add `netcoreapp2.1` target --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 735d8185..611ba8ea 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -5,7 +5,7 @@ Implements the W3C JSON-LD 1.0 standard. 1.0.6 NuGet;linked-data-dotnet - netstandard1.3;netstandard2.0 + netstandard1.3;netstandard2.0;netcoreapp2.1 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web From 3d4b1a7fd755163b75b9511fbc8e298123c06bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 14:50:03 +0100 Subject: [PATCH 013/255] Add inner exception to JsonLdError to debug why tests are failing --- src/json-ld.net/Core/DocumentLoader.cs | 4 ++-- src/json-ld.net/Core/JsonLdError.cs | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index bb7d5f79..e1b29753 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -54,9 +54,9 @@ public virtual RemoteDocument LoadDocument(string url) { throw; } - catch (Exception) + catch (Exception exception) { - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, exception); } return doc; #else diff --git a/src/json-ld.net/Core/JsonLdError.cs b/src/json-ld.net/Core/JsonLdError.cs index 6c8103d0..81b1388f 100644 --- a/src/json-ld.net/Core/JsonLdError.cs +++ b/src/json-ld.net/Core/JsonLdError.cs @@ -11,14 +11,22 @@ public class JsonLdError : Exception private JsonLdError.Error type; internal JObject details = null; - public JsonLdError(JsonLdError.Error type, object detail) : base(detail == null ? - string.Empty : detail.ToString()) + public JsonLdError(JsonLdError.Error type, object detail, Exception innerException) + : base(detail == null ? string.Empty : detail.ToString(), innerException) { // TODO: pretty toString (e.g. print whole json objects) this.type = type; } - public JsonLdError(JsonLdError.Error type) : base(string.Empty) + public JsonLdError(JsonLdError.Error type, object detail) + : base(detail == null ? string.Empty : detail.ToString()) + { + // TODO: pretty toString (e.g. print whole json objects) + this.type = type; + } + + public JsonLdError(JsonLdError.Error type) + : base(string.Empty) { this.type = type; } From 21c7b9c8024310c0c156cdada4504190098f0c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 15:20:44 +0100 Subject: [PATCH 014/255] Recurse LoadDocument on redirects --- src/json-ld.net/Core/DocumentLoader.cs | 29 ++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index e1b29753..3eb83dc8 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -16,11 +16,13 @@ public virtual RemoteDocument LoadDocument(string url) { #if !PORTABLE && !IS_CORECLR RemoteDocument doc = new RemoteDocument(url, null); + HttpWebResponse resp; + try { HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); req.Accept = AcceptHeader; - WebResponse resp = req.GetResponse(); + resp = (HttpWebResponse)req.GetResponse(); bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json"; if (!resp.Headers[HttpResponseHeader.ContentType].Contains("json")) { @@ -31,7 +33,7 @@ public virtual RemoteDocument LoadDocument(string url) if (!isJsonld && linkHeaders != null) { linkHeaders = linkHeaders.SelectMany((h) => h.Split(",".ToCharArray())) - .Select(h => h.Trim()).ToArray(); + .Select(h => h.Trim()).ToArray(); IEnumerable linkedContexts = linkHeaders.Where(v => v.EndsWith("rel=\"http://www.w3.org/ns/json-ld#context\"")); if (linkedContexts.Count() > 1) { @@ -54,6 +56,29 @@ public virtual RemoteDocument LoadDocument(string url) { throw; } + catch (WebException webException) + { + try + { + resp = (HttpWebResponse)webException.Response; + int baseStatusCode = (int)(Math.Floor((double)resp.StatusCode / 100)) * 100; + if (baseStatusCode == 300) + { + string location = resp.Headers[HttpResponseHeader.Location]; + if (!string.IsNullOrWhiteSpace(location)) + { + // TODO: Add recursion break or simply switch to HttpClient so we don't have to recurse on HTTP redirects. + return LoadDocument(location); + } + } + } + catch (Exception innerException) + { + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, innerException); + } + + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, webException); + } catch (Exception exception) { throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, exception); From 82641c0d2e62f86d89f55e06d028866806accf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 15:28:12 +0100 Subject: [PATCH 015/255] Install coverlet.msbuild for code coverage --- test/json-ld.net.tests/json-ld.net.tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index d96119e0..e743c9bb 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -20,6 +20,7 @@ + From 99bb2fd9a3aea2164c4344d0843b1fe9ac0bfebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 15:31:51 +0100 Subject: [PATCH 016/255] Ignore opencover code coverage files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 781b61d8..3f27ed22 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ build/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +*opencover.xml *_i.c *_p.c From 53c63302613cfebad0b5ab237d9a9de7531f063c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 15:59:09 +0100 Subject: [PATCH 017/255] Add MSBuild test targets Add MSBuild test targets to make the test runner not search for tests within non-test projects as per the following: https://github.com/Microsoft/vstest/issues/1129 https://dasmulli.blog/2018/01/20/make-dotnet-test-work-on-solution-files/ --- Directory.Build.targets | 5 +++++ after.JsonLD.sln.targets | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 Directory.Build.targets create mode 100644 after.JsonLD.sln.targets diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..eca789cf --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/after.JsonLD.sln.targets b/after.JsonLD.sln.targets new file mode 100644 index 00000000..cf28d823 --- /dev/null +++ b/after.JsonLD.sln.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From d85e87786a1379d4ff73d9130b2346392913dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 5 Nov 2018 16:17:02 +0100 Subject: [PATCH 018/255] Add encrypted CODECOV_TOKEN --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87a6363a..e175a37e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,11 @@ env: global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - DOTNET_CLI_TELEMETRY_OPTOUT=1 + - secure: LyfZri+LDXaez/OqC/JU+HMNQeDebmf+SYPZUOGDtWeYBWsYdpsIuhQj5PgfV5aNwSMeefxjFPk/27Cw8D7M7SDcIavBoZbP5fCBqGr9FQKRWkDizaKqP1Mnmu5bFCCr7+7jgTueFk2NZ60rj6vJsmmDtIrMoGF07RzqPySgfLM= dotnet: 2.1.401 install: - - dotnet restore +- dotnet restore script: - - dotnet build - - dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" +- dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" after_success: - - curl -s https://codecov.io/bash > codecov - - chmod +x codecov - - ./codecov -f "*opencover.xml" \ No newline at end of file +- bash <(curl -s https://codecov.io/bash) From 2dd237a243186598b590db2fd0ae19e89bdad2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 12:48:40 +0100 Subject: [PATCH 019/255] Clean up the readme file --- README.md | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index a7b214db..3ff5e6bd 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,40 @@ -json-ld.net -========== +# json-ld.net -A JSON-LD processor for .NET. +A JSON-LD processor for .NET. -v1.0.5 is available on NuGet.org at https://www.nuget.org/packages/json-ld.net/ +[v1.0.5 is available on NuGet.org][nuget]. -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. +This project has adopted the [Microsoft Open Source Code of Conduct][coc]. +For more information see the [Code of Conduct FAQ][coc-faq] or contact +[opencode@microsoft.com][ms-mail] with any additional questions or comments. -#### Supported frameworks +## Supported frameworks -* NET 4.0 -* NETStandard 1.3 -* Portable NET 4.5, Windows 8 +* .NET 4.0 +* .NET Standard 1.3 and 2.0 +* Portable .NET 4.5, Windows 8 -Contributing -===== +## Contributing -Pull requests for json-ld.net are welcome, to get started install the latest tools for .NET Core +Pull requests for json-ld.net are welcome, to get started install the latest +tools for .NET Core: -* https://dot.net -* https://www.microsoft.com/net/core +* [.NET Core][dnc] +* [.NET Core tutorial][dnc-tutorial] -build.ps1 will create a nupkg and run tests for both .NET desktop and .NET Core. +`build.ps1` will create a nupkg and run tests for both .NET desktop and .NET +Core. +## Origin -Origin -===== -This project began life as a [Sharpen][sharpen]-based auto-port from [jsonld-java][jsonld-java]. +This project began life as a [Sharpen][sharpen]-based auto-port from +[jsonld-java][jsonld-java]. - [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html - [jsonld-java]: https://github.com/jsonld-java/jsonld-java + [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html + [jsonld-java]: https://github.com/jsonld-java/jsonld-java + [nuget]: https://www.nuget.org/packages/json-ld.net/ + [coc]: https://opensource.microsoft.com/codeofconduct/ + [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ + [ms-mail]: mailto:opencode@microsoft.com + [dnc]: https://dot.net + [dnc-tutorial]: https://www.microsoft.com/net/core From 985898b89aa1f20a8daeb1fa11727356af7a347a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 12:55:32 +0100 Subject: [PATCH 020/255] Add NuGet version badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ff5e6bd..c55844ae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A JSON-LD processor for .NET. -[v1.0.5 is available on NuGet.org][nuget]. +[![NuGet][nuget-badge]][nuget] This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact @@ -33,6 +33,7 @@ This project began life as a [Sharpen][sharpen]-based auto-port from [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html [jsonld-java]: https://github.com/jsonld-java/jsonld-java [nuget]: https://www.nuget.org/packages/json-ld.net/ + [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg [coc]: https://opensource.microsoft.com/codeofconduct/ [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ [ms-mail]: mailto:opencode@microsoft.com From 5e081f7da35582da56631d6901a743c42b8cf989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 12:58:05 +0100 Subject: [PATCH 021/255] Add CodeCov badge --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c55844ae..e2ed1e63 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A JSON-LD processor for .NET. -[![NuGet][nuget-badge]][nuget] +[![NuGet][nuget-badge]][nuget] [![codecov][codecov-badge]][codecov] This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact @@ -30,12 +30,14 @@ Core. This project began life as a [Sharpen][sharpen]-based auto-port from [jsonld-java][jsonld-java]. - [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html - [jsonld-java]: https://github.com/jsonld-java/jsonld-java - [nuget]: https://www.nuget.org/packages/json-ld.net/ - [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg - [coc]: https://opensource.microsoft.com/codeofconduct/ - [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ - [ms-mail]: mailto:opencode@microsoft.com - [dnc]: https://dot.net - [dnc-tutorial]: https://www.microsoft.com/net/core + [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html + [jsonld-java]: https://github.com/jsonld-java/jsonld-java + [nuget]: https://www.nuget.org/packages/json-ld.net/ + [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg + [coc]: https://opensource.microsoft.com/codeofconduct/ + [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ + [ms-mail]: mailto:opencode@microsoft.com + [dnc]: https://dot.net + [dnc-tutorial]: https://www.microsoft.com/net/core + [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net + [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg \ No newline at end of file From 3145ea1258eff244c7d5d68bbcb53240bcb2b097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 13:01:25 +0100 Subject: [PATCH 022/255] Add Travis build status badge --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e2ed1e63..a7fd0366 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A JSON-LD processor for .NET. -[![NuGet][nuget-badge]][nuget] [![codecov][codecov-badge]][codecov] +[![NuGet][nuget-badge]][nuget] [![Build Status][travis-badge]][travis] [![codecov][codecov-badge]][codecov] This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact @@ -40,4 +40,6 @@ This project began life as a [Sharpen][sharpen]-based auto-port from [dnc]: https://dot.net [dnc-tutorial]: https://www.microsoft.com/net/core [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net - [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg \ No newline at end of file + [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg + [travis]: https://travis-ci.org/linked-data-dotnet/json-ld.net + [travis-badge]: https://img.shields.io/travis/linked-data-dotnet/json-ld.net.svg From c87fe3d54d3b366cbd37f47069356ef9c290c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 13:04:06 +0100 Subject: [PATCH 023/255] Update build instructions --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7fd0366..e1968bfd 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,13 @@ tools for .NET Core: * [.NET Core][dnc] * [.NET Core tutorial][dnc-tutorial] -`build.ps1` will create a nupkg and run tests for both .NET desktop and .NET -Core. +### Build and Tests + +On Windows, you can execute `build.ps1`, which will create a nupkg and run +tests for both .NET desktop and .NET Core. + +On both Windows and all other supported operating systems, you can run +`dotnet build` to build and `dotnet test` to run the tests. ## Origin From 463740646596c4a9e3294712c32104d180d211cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 13:05:22 +0100 Subject: [PATCH 024/255] Place each badge on its own line for legibility --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e1968bfd..cfee8a61 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ A JSON-LD processor for .NET. -[![NuGet][nuget-badge]][nuget] [![Build Status][travis-badge]][travis] [![codecov][codecov-badge]][codecov] +[![NuGet][nuget-badge]][nuget] +[![Build Status][travis-badge]][travis] +[![codecov][codecov-badge]][codecov] This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact From fbcbc594ee1eee510013ec101ece98f2e80342e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 11 Jan 2019 13:06:29 +0100 Subject: [PATCH 025/255] Add link to json-ld.org --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cfee8a61..8c7ace6f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # json-ld.net -A JSON-LD processor for .NET. +A [JSON-LD][jsonld] processor for .NET. [![NuGet][nuget-badge]][nuget] [![Build Status][travis-badge]][travis] @@ -37,6 +37,7 @@ On both Windows and all other supported operating systems, you can run This project began life as a [Sharpen][sharpen]-based auto-port from [jsonld-java][jsonld-java]. + [jsonld]: https://json-ld.org/ [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html [jsonld-java]: https://github.com/jsonld-java/jsonld-java [nuget]: https://www.nuget.org/packages/json-ld.net/ From a04af73f4851f017446a97af45bec5b0fdf54e5d Mon Sep 17 00:00:00 2001 From: dnllowe Date: Fri, 14 Jun 2019 23:10:07 -0400 Subject: [PATCH 026/255] Makes lexicographical sorting optional, preserving original object order instead --- src/json-ld.net/Core/JsonLdApi.cs | 65 +++++++++++++++++++++---- src/json-ld.net/Core/JsonLdOptions.cs | 12 +++++ src/json-ld.net/Core/JsonLdProcessor.cs | 14 +++++- 3 files changed, 79 insertions(+), 12 deletions(-) diff --git a/src/json-ld.net/Core/JsonLdApi.cs b/src/json-ld.net/Core/JsonLdApi.cs index 186d9137..c5338db3 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -122,7 +122,12 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e JObject result = new JObject(); // 7) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys.SortInPlace(); + } + foreach (string expandedProperty in keys) { JToken expandedValue = elem[expandedProperty]; @@ -491,7 +496,12 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el JObject result = new JObject(); // 7) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys.SortInPlace(); + } + foreach (string key in keys) { JToken value = elem[key]; @@ -808,7 +818,12 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el expandedValue = new JArray(); // 7.6.2) JArray indexKeys = new JArray(value.GetKeys()); - indexKeys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + indexKeys.SortInPlace(); + } + foreach (string index in indexKeys) { JToken indexValue = ((JObject)value)[index]; @@ -1290,7 +1305,12 @@ private void GenerateNodeMap(JToken element, JObject nodeMap, } // 6.11) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys.SortInPlace(); + } + foreach (string property_1 in keys) { var eachProperty_1 = property_1; @@ -1405,7 +1425,7 @@ public virtual JArray Frame(JToken input, JArray frame) { state.omitDefault = this.opts.GetOmitDefault().Value; } - // use tree map so keys are sotred by default + // use tree map so keys are sorted by default // XXX BUG BUG BUG XXX (sblom) Figure out where this needs to be sorted and use extension methods to return sorted enumerators or something! JObject nodes = new JObject(); GenerateNodeMap(input, nodes); @@ -1436,7 +1456,12 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes bool explicitOn = GetFrameFlag(frame, "@explicit", state.@explicit); // add matches to output JArray ids = new JArray(matches.GetKeys()); - ids.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + ids.SortInPlace(); + } + foreach (string id in ids) { if (property == null) @@ -1499,7 +1524,12 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // iterate over subject properties JObject element = (JObject)matches[id]; JArray props = new JArray(element.GetKeys()); - props.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + props.SortInPlace(); + } + foreach (string prop in props) { // copy keywords to output @@ -1576,7 +1606,12 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes } // handle defaults props = new JArray(frame.GetKeys()); - props.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + props.SortInPlace(); + } + foreach (string prop_1 in props) { // skip keywords @@ -2116,7 +2151,12 @@ public virtual JArray FromRDF(RDFDataset dataset) JArray result = new JArray(); // 6) JArray ids = new JArray(defaultGraph.GetKeys()); - ids.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + ids.SortInPlace(); + } + foreach (string subject_1 in ids) { JsonLdApi.NodeMapNode node = (NodeMapNode)defaultGraph[subject_1]; @@ -2127,7 +2167,12 @@ public virtual JArray FromRDF(RDFDataset dataset) node["@graph"] = new JArray(); // 6.1.2) JArray keys = new JArray(graphMap[subject_1].GetKeys()); - keys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys.SortInPlace(); + } + foreach (string s in keys) { JsonLdApi.NodeMapNode n = (NodeMapNode)graphMap[subject_1][s]; diff --git a/src/json-ld.net/Core/JsonLdOptions.cs b/src/json-ld.net/Core/JsonLdOptions.cs index 24784816..aaa4b2a9 100644 --- a/src/json-ld.net/Core/JsonLdOptions.cs +++ b/src/json-ld.net/Core/JsonLdOptions.cs @@ -43,6 +43,8 @@ public virtual JsonLD.Core.JsonLdOptions Clone() private bool produceGeneralizedRdf = false; + private bool preserveOrder = false; + // base options // frame options // rdf conversion options @@ -147,6 +149,16 @@ public virtual void SetProduceGeneralizedRdf(bool produceGeneralizedRdf) this.produceGeneralizedRdf = produceGeneralizedRdf; } + public virtual bool GetPreserveOrder() + { + return preserveOrder; + } + + public virtual void SetPreserveOrder(bool preserveOrder) + { + this.preserveOrder = preserveOrder; + } + public string format = null; public bool useNamespaces = false; diff --git a/src/json-ld.net/Core/JsonLdProcessor.cs b/src/json-ld.net/Core/JsonLdProcessor.cs index f383f2c4..07955be4 100644 --- a/src/json-ld.net/Core/JsonLdProcessor.cs +++ b/src/json-ld.net/Core/JsonLdProcessor.cs @@ -201,7 +201,12 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) entry["@graph"] = new JArray(); } JArray keys = new JArray(graph.GetKeys()); - keys.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys.SortInPlace(); + } + foreach (string id in keys) { JObject node = (JObject)graph[id]; @@ -215,7 +220,12 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) JArray flattened = new JArray(); // 6) JArray keys_1 = new JArray(defaultGraph.GetKeys()); - keys_1.SortInPlace(); + + if (!opts.GetPreserveOrder()) + { + keys_1.SortInPlace(); + } + foreach (string id_1 in keys_1) { JObject node = (JObject)defaultGraph[id_1 From 058d7e1b77388187ec0e2c046aaa7b6806e77e6a Mon Sep 17 00:00:00 2001 From: dnllowe Date: Sun, 16 Jun 2019 18:17:00 -0400 Subject: [PATCH 027/255] Adds tests for JsonLdApi.FromRDF --- src/json-ld.net/Core/JsonLdApi.cs | 21 +- src/json-ld.net/Core/JsonLdOptions.cs | 21 +- src/json-ld.net/Core/JsonLdProcessor.cs | 13 +- src/json-ld.net/Core/NormalizeUtils.cs | 31 +- src/json-ld.net/json-ld.net.csproj | 3 +- test/json-ld.net.tests/ConformanceTests.cs | 47 +- test/json-ld.net.tests/JsonFetcher.cs | 31 + .../Sorting/W3C/expand-0002-in.jsonld | 18 + .../Sorting/W3C/expand-0002-out.jsonld | 9 + .../Sorting/W3C/expand-manifest.jsonld | 556 ++++++++++++ .../Sorting/W3C/flatten-0002-in.jsonld | 18 + .../Sorting/W3C/flatten-0002-out.jsonld | 38 + .../Sorting/W3C/flatten-manifest.jsonld | 330 +++++++ .../Sorting/W3C/frame-0002-in.jsonld | 28 + .../Sorting/W3C/frame-0002-out.jsonld | 23 + .../Sorting/W3C/fromRdf-context.jsonld | 11 + .../Sorting/W3C/fromRdf-in.json | 58 ++ .../Sorting/W3C/fromRdf-manifest.jsonld | 41 + .../Sorting/W3C/fromRdf-out-no-sorting.jsonld | 89 ++ .../W3C/fromRdf-out-sort-graph-nodes.jsonld | 89 ++ .../fromRdf-out-sort-graphs-and-nodes.jsonld | 89 ++ .../W3C/fromRdf-out-sort-graphs.jsonld | 89 ++ .../Sorting/W3C/normalize-0002-in.jsonld | 14 + .../Sorting/W3C/normalize-0002-out.nq | 1 + .../Sorting/W3C/normalize-manifest.jsonld | 353 ++++++++ .../Sorting/W3C/remote-doc-0002-in.json | 7 + .../Sorting/W3C/remote-doc-0002-out.jsonld | 4 + .../Sorting/W3C/remote-doc-manifest.jsonld | 129 +++ .../Sorting/W3C/toRdf-0002-in.jsonld | 5 + .../Sorting/W3C/toRdf-0002-out.nq | 1 + .../Sorting/W3C/toRdf-manifest.jsonld | 812 ++++++++++++++++++ test/json-ld.net.tests/SortingTests.cs | 173 ++++ .../json-ld.net.tests.csproj | 75 ++ 33 files changed, 3158 insertions(+), 69 deletions(-) create mode 100644 test/json-ld.net.tests/JsonFetcher.cs create mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq create mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json create mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq create mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld create mode 100644 test/json-ld.net.tests/SortingTests.cs diff --git a/src/json-ld.net/Core/JsonLdApi.cs b/src/json-ld.net/Core/JsonLdApi.cs index c5338db3..2cb465a9 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -123,7 +123,7 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e // 7) JArray keys = new JArray(element.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (opts.GetSortGraphNodes()) { keys.SortInPlace(); } @@ -435,8 +435,7 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e /// /// JsonLdError /// - public virtual JToken Expand(Context activeCtx, string activeProperty, JToken element - ) + public virtual JToken Expand(Context activeCtx, string activeProperty, JToken element) { // 1) if (element.IsNull()) @@ -497,7 +496,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el // 7) JArray keys = new JArray(element.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (opts.GetSortGraphNodes()) { keys.SortInPlace(); } @@ -819,7 +818,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el // 7.6.2) JArray indexKeys = new JArray(value.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (opts.GetSortGraphNodes()) { indexKeys.SortInPlace(); } @@ -1306,7 +1305,7 @@ private void GenerateNodeMap(JToken element, JObject nodeMap, // 6.11) JArray keys = new JArray(element.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (!opts.GetSortGraphNodes()) { keys.SortInPlace(); } @@ -1457,7 +1456,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // add matches to output JArray ids = new JArray(matches.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (!opts.GetSortGraphs()) { ids.SortInPlace(); } @@ -1525,7 +1524,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes JObject element = (JObject)matches[id]; JArray props = new JArray(element.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (!opts.GetSortGraphNodes()) { props.SortInPlace(); } @@ -1607,7 +1606,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // handle defaults props = new JArray(frame.GetKeys()); - if (!opts.GetPreserveOrder()) + //if (!opts.GetSortGraphNodes()) { props.SortInPlace(); } @@ -2152,7 +2151,7 @@ public virtual JArray FromRDF(RDFDataset dataset) // 6) JArray ids = new JArray(defaultGraph.GetKeys()); - if (!opts.GetPreserveOrder()) + if (!opts.GetSortGraphs()) { ids.SortInPlace(); } @@ -2168,7 +2167,7 @@ public virtual JArray FromRDF(RDFDataset dataset) // 6.1.2) JArray keys = new JArray(graphMap[subject_1].GetKeys()); - if (!opts.GetPreserveOrder()) + if (!opts.GetSortGraphNodes()) { keys.SortInPlace(); } diff --git a/src/json-ld.net/Core/JsonLdOptions.cs b/src/json-ld.net/Core/JsonLdOptions.cs index aaa4b2a9..adfa13d6 100644 --- a/src/json-ld.net/Core/JsonLdOptions.cs +++ b/src/json-ld.net/Core/JsonLdOptions.cs @@ -1,4 +1,3 @@ -using JsonLD.Core; using Newtonsoft.Json.Linq; namespace JsonLD.Core @@ -43,8 +42,9 @@ public virtual JsonLD.Core.JsonLdOptions Clone() private bool produceGeneralizedRdf = false; - private bool preserveOrder = false; + private bool sortGraphs = true; + private bool sortGraphNodes = true; // base options // frame options // rdf conversion options @@ -149,16 +149,25 @@ public virtual void SetProduceGeneralizedRdf(bool produceGeneralizedRdf) this.produceGeneralizedRdf = produceGeneralizedRdf; } - public virtual bool GetPreserveOrder() + public virtual bool GetSortGraphs() { - return preserveOrder; + return sortGraphs; } - public virtual void SetPreserveOrder(bool preserveOrder) + public virtual void SetSortGraphs(bool sortGraphs) { - this.preserveOrder = preserveOrder; + this.sortGraphs = sortGraphs; } + public virtual bool GetSortGraphNodes() + { + return sortGraphNodes; + } + + public virtual void SetSortGraphNodes(bool sortGraphNodes) + { + this.sortGraphNodes = sortGraphNodes; + } public string format = null; public bool useNamespaces = false; diff --git a/src/json-ld.net/Core/JsonLdProcessor.cs b/src/json-ld.net/Core/JsonLdProcessor.cs index 07955be4..22609555 100644 --- a/src/json-ld.net/Core/JsonLdProcessor.cs +++ b/src/json-ld.net/Core/JsonLdProcessor.cs @@ -13,8 +13,7 @@ namespace JsonLD.Core public class JsonLdProcessor { /// - public static JObject Compact(JToken input, JToken context, JsonLdOptions - opts) + public static JObject Compact(JToken input, JToken context, JsonLdOptions opts) { // 1) // TODO: look into java futures/promises @@ -202,10 +201,7 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) } JArray keys = new JArray(graph.GetKeys()); - if (!opts.GetPreserveOrder()) - { - keys.SortInPlace(); - } + keys.SortInPlace(); foreach (string id in keys) { @@ -221,10 +217,7 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) // 6) JArray keys_1 = new JArray(defaultGraph.GetKeys()); - if (!opts.GetPreserveOrder()) - { - keys_1.SortInPlace(); - } + keys_1.SortInPlace(); foreach (string id_1 in keys_1) { diff --git a/src/json-ld.net/Core/NormalizeUtils.cs b/src/json-ld.net/Core/NormalizeUtils.cs index 91aa552b..6ed92eee 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -45,7 +45,12 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // done, name blank nodes bool named = false; IList hashes = new List(unique.Keys); - hashes.SortInPlace(); + + //if (!options.GetSortGraphs()) + { + hashes.SortInPlace(); + } + foreach (string hash in hashes) { string bnode = unique[hash]; @@ -73,7 +78,12 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // names duplicate hash bnodes // enumerate duplicate hash groups in sorted order hashes = new List(duplicates.Keys); - hashes.SortInPlace(); + + //if (!options.GetSortGraphs()) + { + hashes.SortInPlace(); + } + // process each group for (int pgi = 0; ; pgi++) { @@ -108,8 +118,13 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) normalized.Add(RDFDatasetUtils.ToNQuad(quad, quad.ContainsKey("name" ) && !(quad["name"] == null) ? (string)((IDictionary)((IDictionary)quad)["name"])["value"] : null)); } - // sort normalized output - normalized.SortInPlace(); + + //if (!options.GetSortGraphs()) + { + // sort normalized output + normalized.SortInPlace(); + } + // handle output format if (options.format != null) { @@ -141,8 +156,12 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) { if (n_2 == group.Count) { - // name bnodes in hash order - results.SortInPlace(new _IComparer_145()); + //if (!options.GetSortGraphs()) + { + // name bnodes in hash order + results.SortInPlace(new _IComparer_145()); + } + foreach (NormalizeUtils.HashResult r in results) { // name all bnodes in path namer in diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 611ba8ea..7d0875b9 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -3,7 +3,7 @@ JSON-LD processor for .NET Implements the W3C JSON-LD 1.0 standard. - 1.0.6 + 1.0.7.1 NuGet;linked-data-dotnet netstandard1.3;netstandard2.0;netcoreapp2.1 json-ld.net @@ -17,6 +17,7 @@ Implements the W3C JSON-LD 1.0 standard. false false false + true diff --git a/test/json-ld.net.tests/ConformanceTests.cs b/test/json-ld.net.tests/ConformanceTests.cs index 02eaa82e..09bcaf8b 100644 --- a/test/json-ld.net.tests/ConformanceTests.cs +++ b/test/json-ld.net.tests/ConformanceTests.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using Newtonsoft.Json.Linq; using Xunit; -using Xunit.Extensions; using System.IO; -using Newtonsoft.Json; using JsonLD.Core; using JsonLD.Util; @@ -16,7 +13,7 @@ namespace JsonLD.Test public class ConformanceTests { [Theory, ClassData(typeof(ConformanceCases))] - public void ConformanceTestPasses(string id, string testname, ConformanceCase conformanceCase) + public void ConformanceTestPasses(string id, ConformanceCase conformanceCase) { JToken result = conformanceCase.run(); if (conformanceCase.error != null) @@ -77,20 +74,21 @@ public ConformanceCases() public IEnumerator GetEnumerator() { + var jsonFetcher = new JsonFetcher(); + var rootDirectory = "W3C"; + foreach (string manifest in manifests) { - JToken manifestJson; - - manifestJson = GetJson(manifest); + JToken manifestJson = jsonFetcher.GetJson(manifest, rootDirectory); foreach (JObject testcase in manifestJson["sequence"]) { Func run; ConformanceCase newCase = new ConformanceCase(); - newCase.input = GetJson(testcase["input"]); - newCase.context = GetJson(testcase["context"]); - newCase.frame = GetJson(testcase["frame"]); + newCase.input = jsonFetcher.GetJson(testcase["input"], rootDirectory); + newCase.context = jsonFetcher.GetJson(testcase["context"], rootDirectory); + newCase.frame = jsonFetcher.GetJson(testcase["frame"], rootDirectory); var options = new JsonLdOptions("http://json-ld.org/test-suite/tests/" + (string)testcase["input"]); @@ -109,11 +107,11 @@ public IEnumerator GetEnumerator() else if (testType.Any((s) => (string)s == "jld:FromRDFTest")) { newCase.input = File.ReadAllText(Path.Combine("W3C", (string)testcase["input"])); - newCase.output = GetJson(testcase["expect"]); + newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory); } else { - newCase.output = GetJson(testcase["expect"]); + newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory); } } else @@ -138,7 +136,7 @@ public IEnumerator GetEnumerator() } if (optionDescription.TryGetValue("expandContext", out value)) { - newCase.context = GetJson(testcase["option"]["expandContext"]); + newCase.context = jsonFetcher.GetJson(testcase["option"]["expandContext"], rootDirectory); options.SetExpandContext((JObject)newCase.context); } if (optionDescription.TryGetValue("produceGeneralizedRdf", out value)) @@ -227,32 +225,11 @@ public IEnumerator GetEnumerator() newCase.run = run; - yield return new object[] { manifest + (string)testcase["@id"], (string)testcase["name"], newCase }; + yield return new object[] { manifest + (string)testcase["@id"], newCase }; } } } - private JToken GetJson(JToken j) - { - try - { - if (j == null || j.Type == JTokenType.Null) return null; - using (Stream manifestStream = File.OpenRead(Path.Combine("W3C", (string)j))) - using (TextReader reader = new StreamReader(manifestStream)) - using (JsonReader jreader = new Newtonsoft.Json.JsonTextReader(reader) - { - DateParseHandling = DateParseHandling.None - }) - { - return JToken.ReadFrom(jreader); - } - } - catch (Exception e) - { // TODO: this should not be here, figure out why this is needed or catch specific exception. - return null; - } - } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw new Exception("auggh"); diff --git a/test/json-ld.net.tests/JsonFetcher.cs b/test/json-ld.net.tests/JsonFetcher.cs new file mode 100644 index 00000000..35ec3092 --- /dev/null +++ b/test/json-ld.net.tests/JsonFetcher.cs @@ -0,0 +1,31 @@ +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.IO; + +namespace JsonLD.Test +{ + public class JsonFetcher + { + public JToken GetJson(JToken j, string rootDirectory) + { + try + { + if (j == null || j.Type == JTokenType.Null) return null; + using (Stream manifestStream = File.OpenRead(Path.Combine(rootDirectory, (string)j))) + using (TextReader reader = new StreamReader(manifestStream)) + using (JsonReader jreader = new JsonTextReader(reader) + { + DateParseHandling = DateParseHandling.None + }) + { + return JToken.ReadFrom(jreader); + } + } + catch (Exception e) + { // TODO: this should not be here, figure out why this is needed or catch specific exception. + return null; + } + } + } +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld new file mode 100644 index 00000000..e4598e55 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld @@ -0,0 +1,18 @@ +{ + "@context": { + "t1": "http://example.com/t1", + "t2": "http://example.com/t2", + "term1": "http://example.com/term1", + "term2": "http://example.com/term2", + "term3": "http://example.com/term3", + "term4": "http://example.com/term4", + "term5": "http://example.com/term5" + }, + "@id": "http://example.com/id1", + "@type": "t1", + "term1": "v1", + "term2": {"@value": "v2", "@type": "t2"}, + "term3": {"@value": "v3", "@language": "en"}, + "term4": 4, + "term5": [50, 51] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld new file mode 100644 index 00000000..cc8e658e --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld @@ -0,0 +1,9 @@ +[{ + "@id": "http://example.com/id1", + "@type": ["http://example.com/t1"], + "http://example.com/term1": [{"@value": "v1"}], + "http://example.com/term2": [{"@value": "v2", "@type": "http://example.com/t2"}], + "http://example.com/term3": [{"@value": "v3", "@language": "en"}], + "http://example.com/term4": [{"@value": 4}], + "http://example.com/term5": [{"@value": 50}, {"@value": 51}] +}] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld new file mode 100644 index 00000000..49a200c9 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld @@ -0,0 +1,556 @@ +{ + "@context": "http://json-ld.org/test-suite/context.jsonld", + "@id": "", + "@type": "mf:Manifest", + "description": "JSON-LD to Expansion tests use object compare", + "name": "Expansion", + "baseIri": "http://json-ld.org/test-suite/tests/", + "sequence": [ + { + "@id": "#t0001", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "drop free-floating nodes", + "purpose": "Expand drops unreferenced nodes having only @id", + "input": "expand-0001-in.jsonld", + "expect": "expand-0001-out.jsonld" + }, { + "@id": "#t0002", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "basic", + "purpose": "Expanding terms with different types of values", + "input": "expand-0002-in.jsonld", + "expect": "expand-0002-out.jsonld" + }, { + "@id": "#t0003", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "drop null and unmapped properties", + "purpose": "Verifies that null values and unmapped properties are removed from expanded output", + "input": "expand-0003-in.jsonld", + "expect": "expand-0003-out.jsonld" + }, { + "@id": "#t0004", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "optimize @set, keep empty arrays", + "purpose": "Uses of @set are removed in expansion; values of @set, or just plain values which are empty arrays are retained", + "input": "expand-0004-in.jsonld", + "expect": "expand-0004-out.jsonld" + }, { + "@id": "#t0005", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "do not expand aliased @id/@type", + "purpose": "If a keyword is aliased, it is not used when expanding", + "input": "expand-0005-in.jsonld", + "expect": "expand-0005-out.jsonld" + }, { + "@id": "#t0006", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "alias keywords", + "purpose": "Aliased keywords expand in resulting document", + "input": "expand-0006-in.jsonld", + "expect": "expand-0006-out.jsonld" + }, { + "@id": "#t0007", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "date type-coercion", + "purpose": "Expand strings to expanded value with @type: xsd:dateTime", + "input": "expand-0007-in.jsonld", + "expect": "expand-0007-out.jsonld" + }, { + "@id": "#t0008", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@value with @language", + "purpose": "Keep expanded values with @language, drop non-conforming value objects containing just @language", + "input": "expand-0008-in.jsonld", + "expect": "expand-0008-out.jsonld" + }, { + "@id": "#t0009", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@graph with terms", + "purpose": "Use of @graph to contain multiple nodes within array", + "input": "expand-0009-in.jsonld", + "expect": "expand-0009-out.jsonld" + }, { + "@id": "#t0010", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "native types", + "purpose": "Expanding native scalar retains native scalar within expanded value", + "input": "expand-0010-in.jsonld", + "expect": "expand-0010-out.jsonld" + }, { + "@id": "#t0011", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "coerced @id", + "purpose": "A value of a property with @type: @id coercion expands to a node reference", + "input": "expand-0011-in.jsonld", + "expect": "expand-0011-out.jsonld" + }, { + "@id": "#t0012", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@graph with embed", + "purpose": "Use of @graph to contain multiple nodes within array", + "input": "expand-0012-in.jsonld", + "expect": "expand-0012-out.jsonld" + }, { + "@id": "#t0013", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "expand already expanded", + "purpose": "Expand does not mess up already expanded document", + "input": "expand-0013-in.jsonld", + "expect": "expand-0013-out.jsonld" + }, { + "@id": "#t0014", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@set of @value objects with keyword aliases", + "purpose": "Expanding aliased @set and @value", + "input": "expand-0014-in.jsonld", + "expect": "expand-0014-out.jsonld" + }, { + "@id": "#t0015", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "collapse set of sets, keep empty lists", + "purpose": "An array of multiple @set nodes are collapsed into a single array", + "input": "expand-0015-in.jsonld", + "expect": "expand-0015-out.jsonld" + }, { + "@id": "#t0016", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "context reset", + "purpose": "Setting @context to null within an embedded object resets back to initial context state", + "input": "expand-0016-in.jsonld", + "expect": "expand-0016-out.jsonld" + }, { + "@id": "#t0017", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@graph and @id aliased", + "purpose": "Expanding with @graph and @id aliases", + "input": "expand-0017-in.jsonld", + "expect": "expand-0017-out.jsonld" + }, { + "@id": "#t0018", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "override default @language", + "purpose": "override default @language in terms; only language-tag strings", + "input": "expand-0018-in.jsonld", + "expect": "expand-0018-out.jsonld" + }, { + "@id": "#t0019", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "remove @value = null", + "purpose": "Expanding a value of null removes the value", + "input": "expand-0019-in.jsonld", + "expect": "expand-0019-out.jsonld" + }, { + "@id": "#t0020", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "do not remove @graph if not at top-level", + "purpose": "@graph used under a node is retained", + "input": "expand-0020-in.jsonld", + "expect": "expand-0020-out.jsonld" + }, { + "@id": "#t0021", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "do not remove @graph at top-level if not only property", + "purpose": "@graph used at the top level is retained if there are other properties", + "input": "expand-0021-in.jsonld", + "expect": "expand-0021-out.jsonld" + }, { + "@id": "#t0022", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "expand value with default language", + "purpose": "Expanding with a default language applies that language to string values", + "input": "expand-0022-in.jsonld", + "expect": "expand-0022-out.jsonld" + }, { + "@id": "#t0023", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expanding list/set with coercion", + "purpose": "Expanding lists and sets with properties having coercion coerces list/set values", + "input": "expand-0023-in.jsonld", + "expect": "expand-0023-out.jsonld" + }, { + "@id": "#t0024", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Multiple contexts", + "purpose": "Tests that contexts in an array are merged", + "input": "expand-0024-in.jsonld", + "expect": "expand-0024-out.jsonld" + }, { + "@id": "#t0025", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Problematic IRI expansion tests", + "purpose": "Expanding different kinds of terms and Compact IRIs", + "input": "expand-0025-in.jsonld", + "expect": "expand-0025-out.jsonld" + }, { + "@id": "#t0026", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Term definition with @id: @type", + "purpose": "Expanding term mapping to @type uses @type syntax", + "input": "expand-0026-in.jsonld", + "expect": "expand-0026-out.jsonld" + }, { + "@id": "#t0027", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Duplicate values in @list and @set", + "purpose": "Duplicate values in @list and @set are not merged", + "input": "expand-0027-in.jsonld", + "expect": "expand-0027-out.jsonld" + }, { + "@id": "#t0028", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Use @vocab in properties and @type but not in @id", + "purpose": "@vocab is used to compact properties and @type, but is not used for @id", + "input": "expand-0028-in.jsonld", + "expect": "expand-0028-out.jsonld" + }, { + "@id": "#t0029", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Relative IRIs", + "purpose": "@base is used to compact @id; test with different relative IRIs", + "input": "expand-0029-in.jsonld", + "expect": "expand-0029-out.jsonld" + }, { + "@id": "#t0030", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Language maps", + "purpose": "Language Maps expand values to include @language", + "input": "expand-0030-in.jsonld", + "expect": "expand-0030-out.jsonld" + }, { + "@id": "#t0031", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "type-coercion of native types", + "purpose": "Expanding native types with type coercion adds the coerced type to an expanded value representation and retains the native value representation", + "input": "expand-0031-in.jsonld", + "expect": "expand-0031-out.jsonld" + }, { + "@id": "#t0032", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Null term and @vocab", + "purpose": "Mapping a term to null decouples it from @vocab", + "input": "expand-0032-in.jsonld", + "expect": "expand-0032-out.jsonld" + }, { + "@id": "#t0033", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Using @vocab with with type-coercion", + "purpose": "Verifies that terms can be defined using @vocab", + "input": "expand-0033-in.jsonld", + "expect": "expand-0033-out.jsonld" + }, { + "@id": "#t0034", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Multiple properties expanding to the same IRI", + "purpose": "Verifies multiple values from separate terms are deterministically made multiple values of the IRI associated with the terms", + "input": "expand-0034-in.jsonld", + "expect": "expand-0034-out.jsonld" + }, { + "@id": "#t0035", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Language maps with @vocab, default language, and colliding property", + "purpose": "Pathological tests of language maps", + "input": "expand-0035-in.jsonld", + "expect": "expand-0035-out.jsonld" + }, { + "@id": "#t0036", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expanding @index", + "purpose": "Expanding index maps for terms defined with @container: @index", + "input": "expand-0036-in.jsonld", + "expect": "expand-0036-out.jsonld" + }, { + "@id": "#t0037", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expanding @reverse", + "purpose": "Expanding @reverse keeps @reverse", + "input": "expand-0037-in.jsonld", + "expect": "expand-0037-out.jsonld" + }, { + "@id": "#t0038", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expanding blank node labels", + "purpose": "Blank nodes are not relabeled during expansion", + "input": "expand-0038-in.jsonld", + "expect": "expand-0038-out.jsonld" + }, { + "@id": "#t0039", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Using terms in a reverse-maps", + "purpose": "Terms within @reverse are expanded", + "input": "expand-0039-in.jsonld", + "expect": "expand-0039-out.jsonld" + }, { + "@id": "#t0040", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "language and index expansion on non-objects", + "purpose": "Only invoke language and index map expansion if the value is a JSON object", + "input": "expand-0040-in.jsonld", + "expect": "expand-0040-out.jsonld" + }, { + "@id": "#t0041", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@language: null", + "name": "@language: null resets the default language", + "input": "expand-0041-in.jsonld", + "expect": "expand-0041-out.jsonld" + }, { + "@id": "#t0042", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Reverse properties", + "purpose": "Expanding terms defined as reverse properties uses @reverse in expanded document", + "input": "expand-0042-in.jsonld", + "expect": "expand-0042-out.jsonld" + }, { + "@id": "#t0043", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Using reverse properties inside a @reverse-container", + "purpose": "Expanding a reverse property within a @reverse undoes both reversals", + "input": "expand-0043-in.jsonld", + "expect": "expand-0043-out.jsonld" + }, { + "@id": "#t0044", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Index maps with language mappings", + "purpose": "Ensure index maps use language mapping", + "input": "expand-0044-in.jsonld", + "expect": "expand-0044-out.jsonld" + }, { + "@id": "#t0045", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Top-level value objects", + "purpose": "Expanding top-level value objects causes them to be removed", + "input": "expand-0045-in.jsonld", + "expect": "expand-0045-out.jsonld" + }, { + "@id": "#t0046", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Free-floating nodes", + "purpose": "Expanding free-floating nodes causes them to be removed", + "input": "expand-0046-in.jsonld", + "expect": "expand-0046-out.jsonld" + }, { + "@id": "#t0047", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Free-floating values in sets and free-floating lists", + "purpose": "Free-floating values in sets are removed, free-floating lists are removed completely", + "input": "expand-0047-in.jsonld", + "expect": "expand-0047-out.jsonld" + }, { + "@id": "#t0048", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Terms are ignored in @id", + "purpose": "Values of @id are not expanded as terms", + "input": "expand-0048-in.jsonld", + "expect": "expand-0048-out.jsonld" + }, { + "@id": "#t0049", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "String values of reverse properties", + "purpose": "String values of a reverse property with @type: @id are treated as IRIs", + "input": "expand-0049-in.jsonld", + "expect": "expand-0049-out.jsonld" + }, { + "@id": "#t0050", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Term definitions with prefix separate from prefix definitions", + "purpose": "Term definitions using compact IRIs don't inherit the definitions of the prefix", + "input": "expand-0050-in.jsonld", + "expect": "expand-0050-out.jsonld" + }, { + "@id": "#t0051", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expansion of keyword aliases in term definitions", + "purpose": "Expanding terms which are keyword aliases", + "input": "expand-0051-in.jsonld", + "expect": "expand-0051-out.jsonld" + }, { + "@id": "#t0052", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@vocab-relative IRIs in term definitions", + "purpose": "If @vocab is defined, term definitions are expanded relative to @vocab", + "input": "expand-0052-in.jsonld", + "expect": "expand-0052-out.jsonld" + }, { + "@id": "#t0053", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expand absolute IRI with @type: @vocab", + "purpose": "Expanding values of properties of @type: @vocab does not further expand absolute IRIs", + "input": "expand-0053-in.jsonld", + "expect": "expand-0053-out.jsonld" + }, { + "@id": "#t0054", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expand term with @type: @vocab", + "purpose": "Expanding values of properties of @type: @vocab does not expand term values", + "input": "expand-0054-in.jsonld", + "expect": "expand-0054-out.jsonld" + }, { + "@id": "#t0055", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expand @vocab-relative term with @type: @vocab", + "purpose": "Expanding values of properties of @type: @vocab expands relative IRIs using @vocab", + "input": "expand-0055-in.jsonld", + "expect": "expand-0055-out.jsonld" + }, { + "@id": "#t0056", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Use terms with @type: @vocab but not with @type: @id", + "purpose": "Checks that expansion uses appropriate base depending on term definition having @type @id or @vocab", + "input": "expand-0056-in.jsonld", + "expect": "expand-0056-out.jsonld" + }, { + "@id": "#t0057", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expand relative IRI with @type: @vocab", + "purpose": "Relative values of terms with @type: @vocab expand relative to @vocab", + "input": "expand-0057-in.jsonld", + "expect": "expand-0057-out.jsonld" + }, { + "@id": "#t0058", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Expand compact IRI with @type: @vocab", + "purpose": "Compact IRIs are expanded normally even if term has @type: @vocab", + "input": "expand-0058-in.jsonld", + "expect": "expand-0058-out.jsonld" + }, { + "@id": "#t0059", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Reset @vocab by setting it to null", + "purpose": "Setting @vocab to null removes a previous definition", + "input": "expand-0059-in.jsonld", + "expect": "expand-0059-out.jsonld" + }, { + "@id": "#t0060", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Overwrite document base with @base and reset it again", + "purpose": "Setting @base to an IRI and then resetting it to nil", + "input": "expand-0060-in.jsonld", + "expect": "expand-0060-out.jsonld" + }, { + "@id": "#t0061", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Coercing native types to arbitrary datatypes", + "purpose": "Expanding native types when coercing to arbitrary datatypes", + "input": "expand-0061-in.jsonld", + "expect": "expand-0061-out.jsonld" + }, { + "@id": "#t0062", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Various relative IRIs with with @base", + "purpose": "Pathological relative IRIs", + "input": "expand-0062-in.jsonld", + "expect": "expand-0062-out.jsonld" + }, { + "@id": "#t0063", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Reverse property and index container", + "purpose": "Expaning reverse properties with an index-container", + "input": "expand-0063-in.jsonld", + "expect": "expand-0063-out.jsonld" + }, { + "@id": "#t0064", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "bnode values of reverse properties", + "purpose": "Expand reverse property whose values are unlabeled blank nodes", + "input": "expand-0064-in.jsonld", + "expect": "expand-0064-out.jsonld" + }, { + "@id": "#t0065", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Drop unmapped keys in reverse map", + "purpose": "Keys that are not mapped to an IRI in a reverse-map are dropped", + "input": "expand-0065-in.jsonld", + "expect": "expand-0065-out.jsonld" + }, { + "@id": "#t0066", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Reverse-map keys with @vocab", + "purpose": "Expand uses @vocab to expand keys in reverse-maps", + "input": "expand-0066-in.jsonld", + "expect": "expand-0066-out.jsonld" + }, { + "@id": "#t0067", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "prefix://suffix not a compact IRI", + "purpose": "prefix:suffix values are not interpreted as compact IRIs if suffix begins with two slashes", + "input": "expand-0067-in.jsonld", + "expect": "expand-0067-out.jsonld" + }, { + "@id": "#t0068", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "_:suffix values are not a compact IRI", + "purpose": "prefix:suffix values are not interpreted as compact IRIs if prefix is an underscore", + "input": "expand-0068-in.jsonld", + "expect": "expand-0068-out.jsonld" + }, { + "@id": "#t0069", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Compact IRI as term with type mapping", + "purpose": "Redefine compact IRI to define type mapping using the compact IRI itself as value of @id", + "input": "expand-0069-in.jsonld", + "expect": "expand-0069-out.jsonld" + }, { + "@id": "#t0070", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Compact IRI as term defined using equivalent compact IRI", + "purpose": "Redefine compact IRI to define type mapping using the compact IRI itself as string value", + "input": "expand-0070-in.jsonld", + "expect": "expand-0070-out.jsonld" + }, { + "@id": "#t0071", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Redefine terms looking like compact IRIs", + "purpose": "Term definitions may look like compact IRIs", + "input": "expand-0071-in.jsonld", + "expect": "expand-0071-out.jsonld" + }, { + "@id": "#t0072", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Redefine term using @vocab, not itself", + "purpose": "Redefining a term as itself when @vocab is defined uses @vocab, not previous term definition", + "input": "expand-0072-in.jsonld", + "expect": "expand-0072-out.jsonld" + }, { + "@id": "#t0073", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@context not first property", + "purpose": "Objects are unordered, so serialized node definition containing @context may have @context at the end of the node definition", + "input": "expand-0073-in.jsonld", + "expect": "expand-0073-out.jsonld" + }, { + "@id": "#t0074", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@id not first property", + "purpose": "Objects are unordered, so serialized node definition containing @id may have @id at the end of the node definition", + "input": "expand-0074-in.jsonld", + "expect": "expand-0074-out.jsonld" + }, { + "@id": "#t0075", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "@vocab as blank node identifier", + "purpose": "Use @vocab to map all properties to blank node identifiers", + "input": "expand-0075-in.jsonld", + "expect": "expand-0075-out.jsonld" + }, { + "@id": "#t0076", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "base option overrides document location", + "purpose": "Use of the base option overrides the document location", + "option": { + "base": "http://example/base/" + }, + "input": "expand-0076-in.jsonld", + "expect": "expand-0076-out.jsonld" + }, { + "@id": "#t0077", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "expandContext option", + "purpose": "Use of the expandContext option to expand the input document", + "option": { + "expandContext": "expand-0077-context.jsonld" + }, + "input": "expand-0077-in.jsonld", + "expect": "expand-0077-out.jsonld" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld new file mode 100644 index 00000000..e4598e55 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld @@ -0,0 +1,18 @@ +{ + "@context": { + "t1": "http://example.com/t1", + "t2": "http://example.com/t2", + "term1": "http://example.com/term1", + "term2": "http://example.com/term2", + "term3": "http://example.com/term3", + "term4": "http://example.com/term4", + "term5": "http://example.com/term5" + }, + "@id": "http://example.com/id1", + "@type": "t1", + "term1": "v1", + "term2": {"@value": "v2", "@type": "t2"}, + "term3": {"@value": "v3", "@language": "en"}, + "term4": 4, + "term5": [50, 51] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld new file mode 100644 index 00000000..6c72e2d5 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld @@ -0,0 +1,38 @@ +[ + { + "@id": "http://example.com/id1", + "@type": [ + "http://example.com/t1" + ], + "http://example.com/term1": [ + { + "@value": "v1" + } + ], + "http://example.com/term2": [ + { + "@type": "http://example.com/t2", + "@value": "v2" + } + ], + "http://example.com/term3": [ + { + "@language": "en", + "@value": "v3" + } + ], + "http://example.com/term4": [ + { + "@value": 4 + } + ], + "http://example.com/term5": [ + { + "@value": 50 + }, + { + "@value": 51 + } + ] + } +] diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld new file mode 100644 index 00000000..cea88ae5 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld @@ -0,0 +1,330 @@ +{ + "@context": "http://json-ld.org/test-suite/context.jsonld", + "@id": "", + "@type": "mf:Manifest", + "name": "Flattening", + "description": "JSON-LD flattening tests use object comparison.", + "baseIri": "http://json-ld.org/test-suite/tests/", + "sequence": [ + { + "@id": "#t0001", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "drop free-floating nodes", + "purpose": "Flattening drops unreferenced nodes having only @id", + "input": "flatten-0001-in.jsonld", + "expect": "flatten-0001-out.jsonld" + }, { + "@id": "#t0002", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "basic", + "purpose": "Flattening terms with different types of values", + "input": "flatten-0002-in.jsonld", + "expect": "flatten-0002-out.jsonld" + }, { + "@id": "#t0003", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "drop null and unmapped properties", + "purpose": "Verifies that null values and unmapped properties are removed from expanded output", + "input": "flatten-0003-in.jsonld", + "expect": "flatten-0003-out.jsonld" + }, { + "@id": "#t0004", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "optimize @set, keep empty arrays", + "purpose": "Uses of @set are removed in expansion; values of @set, or just plain values which are empty arrays are retained", + "input": "flatten-0004-in.jsonld", + "expect": "flatten-0004-out.jsonld" + }, { + "@id": "#t0005", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "do not expand aliased @id/@type", + "purpose": "If a keyword is aliased, it is not used when flattening", + "input": "flatten-0005-in.jsonld", + "expect": "flatten-0005-out.jsonld" + }, { + "@id": "#t0006", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "alias keywords", + "purpose": "Aliased keywords expand in resulting document", + "input": "flatten-0006-in.jsonld", + "expect": "flatten-0006-out.jsonld" + }, { + "@id": "#t0007", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "date type-coercion", + "purpose": "Expand strings to expanded value with @type: xsd:dateTime", + "input": "flatten-0007-in.jsonld", + "expect": "flatten-0007-out.jsonld" + }, { + "@id": "#t0008", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "@value with @language", + "purpose": "Keep expanded values with @language, drop non-conforming value objects containing just @language", + "input": "flatten-0008-in.jsonld", + "expect": "flatten-0008-out.jsonld" + }, { + "@id": "#t0009", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "@graph with terms", + "purpose": "Use of @graph to contain multiple nodes within array", + "input": "flatten-0009-in.jsonld", + "expect": "flatten-0009-out.jsonld" + }, { + "@id": "#t0010", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "native types", + "purpose": "Flattening native scalar retains native scalar within expanded value", + "input": "flatten-0010-in.jsonld", + "expect": "flatten-0010-out.jsonld" + }, { + "@id": "#t0011", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "coerced @id", + "purpose": "A value of a property with @type: @id coercion expands to a node reference", + "input": "flatten-0011-in.jsonld", + "expect": "flatten-0011-out.jsonld" + }, { + "@id": "#t0012", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "@graph with embed", + "purpose": "Flattening objects containing chained objects flattens all objects", + "input": "flatten-0012-in.jsonld", + "expect": "flatten-0012-out.jsonld" + }, { + "@id": "#t0013", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "flatten already expanded", + "purpose": "Flattening an expanded/flattened document maintains input document", + "input": "flatten-0013-in.jsonld", + "expect": "flatten-0013-out.jsonld" + }, { + "@id": "#t0014", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "@set of @value objects with keyword aliases", + "purpose": "Flattening aliased @set and @value", + "input": "flatten-0014-in.jsonld", + "expect": "flatten-0014-out.jsonld" + }, { + "@id": "#t0015", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "collapse set of sets, keep empty lists", + "purpose": "An array of multiple @set nodes are collapsed into a single array", + "input": "flatten-0015-in.jsonld", + "expect": "flatten-0015-out.jsonld" + }, { + "@id": "#t0016", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "context reset", + "purpose": "Setting @context to null within an embedded object resets back to initial context state", + "input": "flatten-0016-in.jsonld", + "expect": "flatten-0016-out.jsonld" + }, { + "@id": "#t0017", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "@graph and @id aliased", + "purpose": "Flattening with @graph and @id aliases", + "input": "flatten-0017-in.jsonld", + "expect": "flatten-0017-out.jsonld" + }, { + "@id": "#t0018", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "override default @language", + "purpose": "override default @language in terms; only language-tag strings", + "input": "flatten-0018-in.jsonld", + "expect": "flatten-0018-out.jsonld" + }, { + "@id": "#t0019", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "remove @value = null", + "purpose": "Flattening a value of null removes the value", + "input": "flatten-0019-in.jsonld", + "expect": "flatten-0019-out.jsonld" + }, { + "@id": "#t0020", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "do not remove @graph if not at top-level", + "purpose": "@graph used under a node is retained", + "input": "flatten-0020-in.jsonld", + "expect": "flatten-0020-out.jsonld" + }, { + "@id": "#t0021", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "do not remove @graph at top-level if not only property", + "purpose": "@graph used at the top level is retained if there are other properties", + "input": "flatten-0021-in.jsonld", + "expect": "flatten-0021-out.jsonld" + }, { + "@id": "#t0022", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "flatten value with default language", + "purpose": "Flattening with a default language applies that language to string values", + "input": "flatten-0022-in.jsonld", + "expect": "flatten-0022-out.jsonld" + }, { + "@id": "#t0023", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Flattening list/set with coercion", + "purpose": "Flattening lists and sets with properties having coercion coerces list/set values", + "input": "flatten-0023-in.jsonld", + "expect": "flatten-0023-out.jsonld" + }, { + "@id": "#t0024", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Multiple contexts", + "purpose": "Tests that contexts in an array are merged", + "input": "flatten-0024-in.jsonld", + "expect": "flatten-0024-out.jsonld" + }, { + "@id": "#t0025", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Problematic IRI flattening tests", + "purpose": "Flattening different kinds of terms and Compact IRIs", + "input": "flatten-0025-in.jsonld", + "expect": "flatten-0025-out.jsonld" + }, { + "@id": "#t0026", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Term definition with @id: @type", + "purpose": "Flattening term mapping to @type uses @type syntax", + "input": "flatten-0026-in.jsonld", + "expect": "flatten-0026-out.jsonld" + }, { + "@id": "#t0027", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Duplicate values in @list and @set", + "purpose": "Duplicate values in @list and @set are not merged", + "input": "flatten-0027-in.jsonld", + "expect": "flatten-0027-out.jsonld" + }, { + "@id": "#t0028", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Use @vocab in properties and @type but not in @id", + "purpose": "@vocab is used to compact properties and @type, but is not used for @id", + "input": "flatten-0028-in.jsonld", + "expect": "flatten-0028-out.jsonld" + }, { + "@id": "#t0029", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Relative IRIs", + "purpose": "@base is used to compact @id; test with different relative IRIs", + "input": "flatten-0029-in.jsonld", + "expect": "flatten-0029-out.jsonld" + }, { + "@id": "#t0030", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Language maps", + "purpose": "Language Maps expand values to include @language", + "input": "flatten-0030-in.jsonld", + "expect": "flatten-0030-out.jsonld" + }, { + "@id": "#t0031", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "type-coercion of native types", + "purpose": "Flattening native types with type coercion adds the coerced type to an expanded value representation and retains the native value representation", + "input": "flatten-0031-in.jsonld", + "expect": "flatten-0031-out.jsonld" + }, { + "@id": "#t0032", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Null term and @vocab", + "purpose": "Mapping a term to null decouples it from @vocab", + "input": "flatten-0032-in.jsonld", + "expect": "flatten-0032-out.jsonld" + }, { + "@id": "#t0033", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Using @vocab with with type-coercion", + "purpose": "Verifies that terms can be defined using @vocab", + "input": "flatten-0033-in.jsonld", + "expect": "flatten-0033-out.jsonld" + }, { + "@id": "#t0034", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Multiple properties expanding to the same IRI", + "purpose": "Verifies multiple values from separate terms are deterministically made multiple values of the IRI associated with the terms", + "input": "flatten-0034-in.jsonld", + "expect": "flatten-0034-out.jsonld" + }, { + "@id": "#t0035", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Language maps with @vocab, default language, and colliding property", + "purpose": "Pathological tests of language maps", + "input": "flatten-0035-in.jsonld", + "expect": "flatten-0035-out.jsonld" + }, { + "@id": "#t0036", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Flattening @index", + "purpose": "Flattening index maps for terms defined with @container: @index", + "input": "flatten-0036-in.jsonld", + "expect": "flatten-0036-out.jsonld" + }, { + "@id": "#t0037", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Flattening reverse properties", + "purpose": "Flattening @reverse keeps @reverse", + "input": "flatten-0037-in.jsonld", + "expect": "flatten-0037-out.jsonld" + }, { + "@id": "#t0038", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Flattening blank node labels", + "purpose": "Blank nodes are not relabeled during expansion", + "input": "flatten-0038-in.jsonld", + "expect": "flatten-0038-out.jsonld" + }, { + "@id": "#t0039", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Using terms in a reverse-maps", + "purpose": "Terms within @reverse are expanded", + "input": "flatten-0039-in.jsonld", + "expect": "flatten-0039-out.jsonld" + }, { + "@id": "#t0040", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "language and index expansion on non-objects", + "purpose": "Only invoke language and index map expansion if the value is a JSON object", + "input": "flatten-0040-in.jsonld", + "expect": "flatten-0040-out.jsonld" + }, { + "@id": "#t0041", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Free-floating sets and lists", + "purpose": "Free-floating values in sets are removed, free-floating lists are removed completely", + "input": "flatten-0041-in.jsonld", + "expect": "flatten-0041-out.jsonld" + }, { + "@id": "#t0042", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "List objects not equivalent", + "purpose": "Lists objects are implicit unlabeled blank nodes and thus never equivalent", + "input": "flatten-0042-in.jsonld", + "expect": "flatten-0042-out.jsonld" + }, { + "@id": "#t0043", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Sample test manifest extract", + "purpose": "Flatten a test manifest", + "input": "flatten-0043-in.jsonld", + "expect": "flatten-0043-out.jsonld" + }, { + "@id": "#t0044", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "compactArrays option", + "purpose": "Setting compactArrays to false causes single element arrays to be retained", + "option": { + "compactArrays": false + }, + "input": "flatten-0044-in.jsonld", + "context": "flatten-0044-context.jsonld", + "expect": "flatten-0044-out.jsonld" + }, { + "@id": "#t0045", + "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], + "name": "Blank nodes with reverse properties", + "purpose": "Proper (re-)labeling of blank nodes if used with reverse properties.", + "input": "flatten-0045-in.jsonld", + "expect": "flatten-0045-out.jsonld" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld new file mode 100644 index 00000000..ba0b5b1b --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld @@ -0,0 +1,28 @@ +{ + "@context": { + "dc": "http://purl.org/dc/elements/1.1/", + "ex": "http://example.org/vocab#", + "ex:contains": {"@type": "@id"} + }, + "@graph": [ + { + "@id": "http://example.org/test/#library", + "@type": "ex:Library", + "ex:contains": "http://example.org/test#book" + }, + { + "@id": "http://example.org/test#book", + "@type": "ex:Book", + "dc:contributor": "Writer", + "dc:title": "My Book", + "ex:contains": "http://example.org/test#chapter" + }, + { + "@id": "http://example.org/test#chapter", + "@type": "ex:Chapter", + "dc:description": "Fun", + "dc:title": "Chapter One", + "ex:act": "ex:ActOne" + } + ] +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld new file mode 100644 index 00000000..db497ada --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld @@ -0,0 +1,23 @@ +{ + "@context": { + "dc": "http://purl.org/dc/elements/1.1/", + "ex": "http://example.org/vocab#" + }, + "@graph": [{ + "@id": "http://example.org/test/#library", + "@type": "ex:Library", + "ex:contains": { + "@id": "http://example.org/test#book", + "@type": "ex:Book", + "dc:contributor": "Writer", + "dc:title": "My Book", + "ex:contains": { + "@id": "http://example.org/test#chapter", + "@type": "ex:Chapter", + "dc:description": "Fun", + "dc:title": "Chapter One", + "ex:act": "ex:ActOne" + } + } + }] +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld new file mode 100644 index 00000000..89933feb --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld @@ -0,0 +1,11 @@ +{ + "@context": { + "object1": { "@id": "http://example.org/object/1" }, + "object2": { "@id": "http://example.org/object/2" }, + "object3": { "@id": "http://example.org/object/3" }, + "value": { + "@id": "http://example.org/value", + "@value": "@id" + } + } +} diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json b/test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json new file mode 100644 index 00000000..9b9e54e2 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json @@ -0,0 +1,58 @@ +{ + "quads": [ + { + "graph": "http://example.org/node/3", + "subject": "http://example.org/object/3", + "predicate": "http://example.org/value", + "value": "n3-o3-value" + }, + { + "graph": "http://example.org/node/3", + "subject": "http://example.org/object/1", + "predicate": "http://example.org/value", + "value": "n3-o1-value" + }, + { + "graph": "http://example.org/node/3", + "subject": "http://example.org/object/2", + "predicate": "http://example.org/value", + "value": "n3-o2-value" + }, + { + "graph": "http://example.org/node/1", + "subject": "http://example.org/object/3", + "predicate": "http://example.org/value", + "value": "n1-o3-value" + }, + { + "graph": "http://example.org/node/1", + "subject": "http://example.org/object/1", + "predicate": "http://example.org/value", + "value": "n1-o1-value" + }, + { + "graph": "http://example.org/node/1", + "subject": "http://example.org/object/2", + "predicate": "http://example.org/value", + "value": "n1-o2-value" + }, + { + "graph": "http://example.org/node/2", + "subject": "http://example.org/object/3", + "predicate": "http://example.org/value", + "value": "n2-o3-value" + }, + { + "graph": "http://example.org/node/2", + "subject": "http://example.org/object/1", + "predicate": "http://example.org/value", + "value": "n2-o1-value" + }, + { + "graph": "http://example.org/node/2", + "subject": "http://example.org/object/2", + "predicate": "http://example.org/value", + "value": "n2-o2-value" + } + ] +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld new file mode 100644 index 00000000..8478617d --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld @@ -0,0 +1,41 @@ +{ + "@type": "mf:Manifest", + "test-context": "fromRdf-context.jsonld", + "name": "From RDF", + "description": "JSON-LD sorting graphs and nodes when running compact", + "input": "fromRdf-in.json", + "sequence": [ + { + "@id": "#t0001", + "sort-type": "jld:GraphsAndNodes", + "test-type": "jld:FromRDF", + "name": "sort graphs and nodes", + "purpose": "graphs and nodes sorted when running FromRDF", + "expect": "fromRdf-out-sort-graphs-and-nodes.jsonld" + }, + { + "@id": "#t0002", + "sort-type": "jld:Graphs", + "test-type": "jld:FromRDF", + "name": "sort graphs only", + "purpose": "graphs sorted when running FromRDF", + "expect": "fromRdf-out-sort-graphs.jsonld" + }, + { + "@id": "#t0003", + "sort-type": "jld:Nodes", + "test-type": "jld:FromRDF", + "name": "sort graph nodes only", + "purpose": "graph nodes sorted when running FromRDF", + "expect": "fromRdf-out-sort-graph-nodes.jsonld" + }, + { + "@id": "#t0004", + "sort-type": "jld:None", + "test-type": "jld:FromRDF", + "name": "sort nothing", + "purpose": "sort nothing running FromRDF", + "expect": "fromRdf-out-no-sorting.jsonld" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld new file mode 100644 index 00000000..b5920e3c --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld @@ -0,0 +1,89 @@ +[ + { + "@id": "http://example.org/node/3", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n3-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n3-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n3-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/1", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n1-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n1-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n1-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/2", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n2-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n2-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n2-o2-value" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld new file mode 100644 index 00000000..0fcc4c87 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld @@ -0,0 +1,89 @@ +[ + { + "@id": "http://example.org/node/3", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n3-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n3-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n3-o3-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/1", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n1-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n1-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n1-o3-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/2", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n2-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n2-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n2-o3-value" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld new file mode 100644 index 00000000..b9d5253e --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld @@ -0,0 +1,89 @@ +[ + { + "@id": "http://example.org/node/1", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n1-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n1-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n1-o3-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/2", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n2-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n2-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n2-o3-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/3", + "@graph": [ + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n3-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n3-o2-value" + } + ] + }, + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n3-o3-value" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld new file mode 100644 index 00000000..ce0a7cf4 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld @@ -0,0 +1,89 @@ +[ + { + "@id": "http://example.org/node/1", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n1-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n1-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n1-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/2", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n2-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n2-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n2-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/3", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n3-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n3-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n3-o2-value" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld new file mode 100644 index 00000000..bdcb83cd --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld @@ -0,0 +1,14 @@ +{ + "@context": { + "ex": "http://example.org/vocab#" + }, + "@id": "http://example.org/test#example1", + "ex:p": [ + { + "@id": "http://example.org/test#example2" + }, + { + "@id": "http://example.org/test#example2" + } + ] +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq new file mode 100644 index 00000000..529056c8 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq @@ -0,0 +1 @@ + . diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld new file mode 100644 index 00000000..d4dcc360 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld @@ -0,0 +1,353 @@ +{ + "@context": "http://json-ld.org/test-suite/context.jsonld", + "@id": "", + "@type": "mf:Manifest", + "name": "Normalization", + "description": "JSON-LD to normalized RDF tests output N-Quads and use string comparison.", + "baseIri": "http://json-ld.org/test-suite/tests/", + "sequence": [ + { + "@id": "#t0001", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "simple id", + "input": "normalize-0001-in.jsonld", + "expect": "normalize-0001-out.nq" + }, { + "@id": "#t0002", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "duplicate property iri values", + "input": "normalize-0002-in.jsonld", + "expect": "normalize-0002-out.nq" + }, { + "@id": "#t0003", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "bnode", + "input": "normalize-0003-in.jsonld", + "expect": "normalize-0003-out.nq" + }, { + "@id": "#t0004", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "bnode plus embed w/subject", + "input": "normalize-0004-in.jsonld", + "expect": "normalize-0004-out.nq" + }, { + "@id": "#t0005", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "bnode embed", + "input": "normalize-0005-in.jsonld", + "expect": "normalize-0005-out.nq" + }, { + "@id": "#t0006", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "multiple rdf types", + "input": "normalize-0006-in.jsonld", + "expect": "normalize-0006-out.nq" + }, { + "@id": "#t0007", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "coerce CURIE value", + "input": "normalize-0007-in.jsonld", + "expect": "normalize-0007-out.nq" + }, { + "@id": "#t0008", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "single subject complex", + "input": "normalize-0008-in.jsonld", + "expect": "normalize-0008-out.nq" + }, { + "@id": "#t0009", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "multiple subjects - complex", + "input": "normalize-0009-in.jsonld", + "expect": "normalize-0009-out.nq" + }, { + "@id": "#t0010", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "type", + "input": "normalize-0010-in.jsonld", + "expect": "normalize-0010-out.nq" + }, { + "@id": "#t0011", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "type-coerced type", + "input": "normalize-0011-in.jsonld", + "expect": "normalize-0011-out.nq" + }, { + "@id": "#t0012", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "type-coerced type, remove duplicate reference", + "input": "normalize-0012-in.jsonld", + "expect": "normalize-0012-out.nq" + }, { + "@id": "#t0013", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "type-coerced type, cycle", + "input": "normalize-0013-in.jsonld", + "expect": "normalize-0013-out.nq" + }, { + "@id": "#t0014", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "check types", + "input": "normalize-0014-in.jsonld", + "expect": "normalize-0014-out.nq" + }, { + "@id": "#t0015", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "top level context", + "input": "normalize-0015-in.jsonld", + "expect": "normalize-0015-out.nq" + }, { + "@id": "#t0016", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - dual link - embed", + "input": "normalize-0016-in.jsonld", + "expect": "normalize-0016-out.nq" + }, { + "@id": "#t0017", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - dual link - non-embed", + "input": "normalize-0017-in.jsonld", + "expect": "normalize-0017-out.nq" + }, { + "@id": "#t0018", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - self link", + "input": "normalize-0018-in.jsonld", + "expect": "normalize-0018-out.nq" + }, { + "@id": "#t0019", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - disjoint self links", + "input": "normalize-0019-in.jsonld", + "expect": "normalize-0019-out.nq" + }, { + "@id": "#t0020", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - diamond", + "input": "normalize-0020-in.jsonld", + "expect": "normalize-0020-out.nq" + }, { + "@id": "#t0021", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - circle of 2", + "input": "normalize-0021-in.jsonld", + "expect": "normalize-0021-out.nq" + }, { + "@id": "#t0022", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 2", + "input": "normalize-0022-in.jsonld", + "expect": "normalize-0022-out.nq" + }, { + "@id": "#t0023", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - circle of 3", + "input": "normalize-0023-in.jsonld", + "expect": "normalize-0023-out.nq" + }, { + "@id": "#t0024", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (1-2-3)", + "input": "normalize-0024-in.jsonld", + "expect": "normalize-0024-out.nq" + }, { + "@id": "#t0025", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (1-3-2)", + "input": "normalize-0025-in.jsonld", + "expect": "normalize-0025-out.nq" + }, { + "@id": "#t0026", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (2-1-3)", + "input": "normalize-0026-in.jsonld", + "expect": "normalize-0026-out.nq" + }, { + "@id": "#t0027", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (2-3-1)", + "input": "normalize-0027-in.jsonld", + "expect": "normalize-0027-out.nq" + }, { + "@id": "#t0028", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (3-2-1)", + "input": "normalize-0028-in.jsonld", + "expect": "normalize-0028-out.nq" + }, { + "@id": "#t0029", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - double circle of 3 (3-1-2)", + "input": "normalize-0029-in.jsonld", + "expect": "normalize-0029-out.nq" + }, { + "@id": "#t0030", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "blank node - point at circle of 3", + "input": "normalize-0030-in.jsonld", + "expect": "normalize-0030-out.nq" + }, { + "@id": "#t0031", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "bnode (1)", + "input": "normalize-0031-in.jsonld", + "expect": "normalize-0031-out.nq" + }, { + "@id": "#t0032", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "bnode (2)", + "input": "normalize-0032-in.jsonld", + "expect": "normalize-0032-out.nq" + }, { + "@id": "#t0033", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "disjoint identical subgraphs (1)", + "input": "normalize-0033-in.jsonld", + "expect": "normalize-0033-out.nq" + }, { + "@id": "#t0034", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "disjoint identical subgraphs (2)", + "input": "normalize-0034-in.jsonld", + "expect": "normalize-0034-out.nq" + }, { + "@id": "#t0035", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered w/strings (1)", + "input": "normalize-0035-in.jsonld", + "expect": "normalize-0035-out.nq" + }, { + "@id": "#t0036", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered w/strings (2)", + "input": "normalize-0036-in.jsonld", + "expect": "normalize-0036-out.nq" + }, { + "@id": "#t0037", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered w/strings (3)", + "input": "normalize-0037-in.jsonld", + "expect": "normalize-0037-out.nq" + }, { + "@id": "#t0038", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered 4 bnodes, reordered 2 properties (1)", + "input": "normalize-0038-in.jsonld", + "expect": "normalize-0038-out.nq" + }, { + "@id": "#t0039", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered 4 bnodes, reordered 2 properties (2)", + "input": "normalize-0039-in.jsonld", + "expect": "normalize-0039-out.nq" + }, { + "@id": "#t0040", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered 6 bnodes (1)", + "input": "normalize-0040-in.jsonld", + "expect": "normalize-0040-out.nq" + }, { + "@id": "#t0041", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered 6 bnodes (2)", + "input": "normalize-0041-in.jsonld", + "expect": "normalize-0041-out.nq" + }, { + "@id": "#t0042", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "reordered 6 bnodes (3)", + "input": "normalize-0042-in.jsonld", + "expect": "normalize-0042-out.nq" + }, { + "@id": "#t0043", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "literal with language", + "input": "normalize-0043-in.jsonld", + "expect": "normalize-0043-out.nq" + }, { + "@id": "#t0044", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "evil (1)", + "input": "normalize-0044-in.jsonld", + "expect": "normalize-0044-out.nq" + }, { + "@id": "#t0045", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "evil (2)", + "input": "normalize-0045-in.jsonld", + "expect": "normalize-0045-out.nq" + }, { + "@id": "#t0046", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "evil (3)", + "input": "normalize-0046-in.jsonld", + "expect": "normalize-0046-out.nq" + }, { + "@id": "#t0047", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "deep diff (1)", + "input": "normalize-0047-in.jsonld", + "expect": "normalize-0047-out.nq" + }, { + "@id": "#t0048", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "deep diff (2)", + "input": "normalize-0048-in.jsonld", + "expect": "normalize-0048-out.nq" + }, { + "@id": "#t0049", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "remove null", + "input": "normalize-0049-in.jsonld", + "expect": "normalize-0049-out.nq" + }, { + "@id": "#t0050", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "nulls", + "input": "normalize-0050-in.jsonld", + "expect": "normalize-0050-out.nq" + }, { + "@id": "#t0051", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "merging subjects", + "input": "normalize-0051-in.jsonld", + "expect": "normalize-0051-out.nq" + }, { + "@id": "#t0052", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "alias keywords", + "input": "normalize-0052-in.jsonld", + "expect": "normalize-0052-out.nq" + }, { + "@id": "#t0053", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "@list", + "input": "normalize-0053-in.jsonld", + "expect": "normalize-0053-out.nq" + }, { + "@id": "#t0054", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "t-graph", + "input": "normalize-0054-in.jsonld", + "expect": "normalize-0054-out.nq" + }, { + "@id": "#t0055", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "simple reorder (1)", + "input": "normalize-0055-in.jsonld", + "expect": "normalize-0055-out.nq" + }, { + "@id": "#t0056", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "simple reorder (2)", + "input": "normalize-0056-in.jsonld", + "expect": "normalize-0056-out.nq" + }, { + "@id": "#t0057", + "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], + "name": "unnamed graph", + "input": "normalize-0057-in.jsonld", + "expect": "normalize-0057-out.nq" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json new file mode 100644 index 00000000..681f6787 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json @@ -0,0 +1,7 @@ +{ + "@context": { + "@vocab": "http://example/vocab#" + }, + "@id": "", + "term": "object" +} diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld new file mode 100644 index 00000000..e4fc2882 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld @@ -0,0 +1,4 @@ +[{ + "@id": "https://json-ld.org/test-suite/tests/remote-doc-0002-in.json", + "http://example/vocab#term": [{"@value": "object"}] +}] diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld new file mode 100644 index 00000000..e9d9b4aa --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld @@ -0,0 +1,129 @@ +{ + "@context": "http://json-ld.org/test-suite/context.jsonld", + "@id": "", + "@type": "mf:Manifest", + "description": "Tests appropriate document loading behavior as defined in the API", + "name": "Remote document", + "baseIri": "http://json-ld.org/test-suite/tests/", + "sequence": [ + { + "@id": "#t0001", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON-LD document", + "purpose": "Document loader loads a JSON-LD document.", + "input": "remote-doc-0001-in.jsonld", + "expect": "remote-doc-0001-out.jsonld" + }, { + "@id": "#t0002", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON document", + "purpose": "Document loader loads a JSON document.", + "input": "remote-doc-0002-in.json", + "expect": "remote-doc-0002-out.jsonld" + }, { + "@id": "#t0003", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON document with extension-type", + "purpose": "Document loader loads a JSON document having an extension mime-subtype.", + "option": { + "contentType": "application/jldTest+json" + }, + "input": "remote-doc-0003-in.jldt", + "expect": "remote-doc-0003-out.jsonld" + }, { + "@id": "#t0004", + "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], + "name": "loading an unknown type raises loading document failed", + "purpose": "Loading a document with a non-JSON mime type raises loading document failed", + "option": { + "contentType": "application/jldTest" + }, + "input": "remote-doc-0004-in.jldte", + "expect": "loading document failed" + }, { + "@id": "#t0005", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Load JSON-LD through 301 redirect", + "purpose": "Loading a document with a redirect should use the redirected URL as document base", + "option": { + "redirectTo": "remote-doc-0001-in.jsonld", + "httpStatus": 301 + }, + "input": "remote-doc-0005-in.jsonld", + "expect": "remote-doc-0001-out.jsonld" + }, { + "@id": "#t0006", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Load JSON-LD through 303 redirect", + "purpose": "Loading a document with a redirect should use the redirected URL as document base", + "option": { + "redirectTo": "remote-doc-0001-in.jsonld", + "httpStatus": 303 + }, + "input": "remote-doc-0006-in.jsonld", + "expect": "remote-doc-0001-out.jsonld" + }, { + "@id": "#t0007", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "Load JSON-LD through 307 redirect", + "purpose": "Loading a document with a redirect should use the redirected URL as document base", + "option": { + "redirectTo": "remote-doc-0001-in.jsonld", + "httpStatus": 307 + }, + "input": "remote-doc-0007-in.jsonld", + "expect": "remote-doc-0001-out.jsonld" + }, { + "@id": "#t0008", + "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], + "name": "Non-existant file (404)", + "purpose": "Loading a non-existant file raises loading document failed error", + "input": "remote-doc-0008-in.jsonld", + "expect": "loading document failed" + }, { + "@id": "#t0009", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON-LD document with link", + "purpose": "If a context is specified in a link header, it is not used for JSON-LD.", + "option": { + "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" + }, + "input": "remote-doc-0009-in.jsonld", + "expect": "remote-doc-0009-out.jsonld" + }, { + "@id": "#t0010", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON document with link", + "purpose": "If a context is specified in a link header, it is used for JSON.", + "option": { + "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" + }, + "input": "remote-doc-0010-in.json", + "expect": "remote-doc-0010-out.jsonld" + }, { + "@id": "#t0011", + "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], + "name": "load JSON document with extension-type with link", + "purpose": "If a context is specified in a link header, it is used for a JSON extension type.", + "input": "remote-doc-0011-in.jldt", + "option": { + "contentType": "application/jldTest+json", + "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" + }, + "expect": "remote-doc-0011-out.jsonld" + }, { + "@id": "#t0012", + "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], + "name": "Multiple context link headers", + "purpose": "Loading a file when multiple link headers are returned is an error", + "option": { + "httpLink": [ + "; rel=\"http://www.w3.org/ns/json-ld#context\"", + "; rel=\"http://www.w3.org/ns/json-ld#context\"" + ] + }, + "input": "remote-doc-0012-in.json", + "expect": "multiple context link headers" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld new file mode 100644 index 00000000..bd662d13 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld @@ -0,0 +1,5 @@ +{ + "@context": {"foaf": "http://xmlns.com/foaf/0.1/"}, + "@id": "http://greggkellogg.net/foaf#me", + "foaf:name": "Gregg Kellogg" +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq new file mode 100644 index 00000000..f7238bfc --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq @@ -0,0 +1 @@ + "Gregg Kellogg" . diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld new file mode 100644 index 00000000..8abb3e57 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld @@ -0,0 +1,812 @@ +{ + "@context": "http://json-ld.org/test-suite/context.jsonld", + "@id": "", + "@type": "mf:Manifest", + "name": "Transform JSON-LD to RDF", + "description": "JSON-LD to RDF tests generate N-Quads output and use string comparison.", + "baseIri": "http://json-ld.org/test-suite/tests/", + "sequence": [ + { + "@id": "#t0001", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Plain literal with URIs", + "purpose": "Tests generation of a triple using full URIs and a plain literal.", + "input": "toRdf-0001-in.jsonld", + "expect": "toRdf-0001-out.nq" + }, { + "@id": "#t0002", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Plain literal with CURIE from default context", + "purpose": "Tests generation of a triple using a CURIE defined in the default context.", + "input": "toRdf-0002-in.jsonld", + "expect": "toRdf-0002-out.nq" + }, { + "@id": "#t0003", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Default subject is BNode", + "purpose": "Tests that a BNode is created if no explicit subject is set.", + "input": "toRdf-0003-in.jsonld", + "expect": "toRdf-0003-out.nq" + }, { + "@id": "#t0004", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Literal with language tag", + "purpose": "Tests that a plain literal is created with a language tag.", + "input": "toRdf-0004-in.jsonld", + "expect": "toRdf-0004-out.nq" + }, { + "@id": "#t0005", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Extended character set literal", + "purpose": "Tests that a literal may be created using extended characters.", + "input": "toRdf-0005-in.jsonld", + "expect": "toRdf-0005-out.nq" + }, { + "@id": "#t0006", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Typed literal", + "purpose": "Tests creation of a literal with a datatype.", + "input": "toRdf-0006-in.jsonld", + "expect": "toRdf-0006-out.nq" + }, { + "@id": "#t0007", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Tests 'a' generates rdf:type and object is implicit IRI", + "purpose": "Verify that 'a' is an alias for rdf:type, and the object is created as an IRI.", + "input": "toRdf-0007-in.jsonld", + "expect": "toRdf-0007-out.nq" + }, { + "@id": "#t0008", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test prefix defined in @context", + "purpose": "Generate an IRI using a prefix defined within an @context.", + "input": "toRdf-0008-in.jsonld", + "expect": "toRdf-0008-out.nq" + }, { + "@id": "#t0009", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test using an empty suffix", + "purpose": "An empty suffix may be used.", + "input": "toRdf-0009-in.jsonld", + "expect": "toRdf-0009-out.nq" + }, { + "@id": "#t0010", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test object processing defines object", + "purpose": "A property referencing an associative array gets object from subject of array.", + "input": "toRdf-0010-in.jsonld", + "expect": "toRdf-0010-out.nq" + }, { + "@id": "#t0011", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test object processing defines object with implicit BNode", + "purpose": "If no @ is specified, a BNode is created, and will be used as the object of an enclosing property.", + "input": "toRdf-0011-in.jsonld", + "expect": "toRdf-0011-out.nq" + }, { + "@id": "#t0012", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Multiple Objects for a Single Property", + "purpose": "Tests that Multiple Objects are for a Single Property using array syntax.", + "input": "toRdf-0012-in.jsonld", + "expect": "toRdf-0012-out.nq" + }, { + "@id": "#t0013", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Creation of an empty list", + "purpose": "Tests that @list: [] generates an empty list.", + "input": "toRdf-0013-in.jsonld", + "expect": "toRdf-0013-out.nq" + }, { + "@id": "#t0014", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Creation of a list with single element", + "purpose": "Tests that @list generates a list.", + "input": "toRdf-0014-in.jsonld", + "expect": "toRdf-0014-out.nq" + }, { + "@id": "#t0015", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Creation of a list with multiple elements", + "purpose": "Tests that list with multiple elements.", + "input": "toRdf-0015-in.jsonld", + "expect": "toRdf-0015-out.nq" + }, { + "@id": "#t0016", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Empty IRI expands to resource location", + "purpose": "Expanding an empty IRI uses the test file location.", + "input": "toRdf-0016-in.jsonld", + "expect": "toRdf-0016-out.nq" + }, { + "@id": "#t0017", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Relative IRI expands relative resource location", + "purpose": "Expanding a relative IRI uses the test file location.", + "input": "toRdf-0017-in.jsonld", + "expect": "toRdf-0017-out.nq" + }, { + "@id": "#t0018", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Frag ID expands relative resource location", + "purpose": "Expanding a fragment uses the test file location.", + "input": "toRdf-0018-in.jsonld", + "expect": "toRdf-0018-out.nq" + }, { + "@id": "#t0019", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test type coercion to anyURI", + "purpose": "Tests coercion of object to anyURI when specified.", + "input": "toRdf-0019-in.jsonld", + "expect": "toRdf-0019-out.nq" + }, { + "@id": "#t0020", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test type coercion to typed literal", + "purpose": "Tests coercion of object to a typed literal when specified.", + "input": "toRdf-0020-in.jsonld", + "expect": "toRdf-0020-out.nq" + }, { + "@id": "#t0022", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test coercion of double value", + "purpose": "Tests that a decimal value generates a xsd:double typed literal;.", + "input": "toRdf-0022-in.jsonld", + "expect": "toRdf-0022-out.nq" + }, { + "@id": "#t0023", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test coercion of integer value", + "purpose": "Tests that a decimal value generates a xsd:integer typed literal.", + "input": "toRdf-0023-in.jsonld", + "expect": "toRdf-0023-out.nq" + }, { + "@id": "#t0024", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test coercion of boolean value", + "purpose": "Tests that a decimal value generates a xsd:boolean typed literal.", + "input": "toRdf-0024-in.jsonld", + "expect": "toRdf-0024-out.nq" + }, { + "@id": "#t0025", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test list coercion with single element", + "purpose": "Tests that an array with a single element on a property with @list coercion creates an RDF Collection.", + "input": "toRdf-0025-in.jsonld", + "expect": "toRdf-0025-out.nq" + }, { + "@id": "#t0026", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Test creation of multiple types", + "purpose": "Tests that @type with an array of types creates multiple types.", + "input": "toRdf-0026-in.jsonld", + "expect": "toRdf-0026-out.nq" + }, { + "@id": "#t0027", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Simple named graph (Wikidata)", + "purpose": "Using @graph with other keys places triples in a named graph.", + "input": "toRdf-0027-in.jsonld", + "expect": "toRdf-0027-out.nq" + }, { + "@id": "#t0028", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Simple named graph", + "purpose": "Signing a graph.", + "input": "toRdf-0028-in.jsonld", + "expect": "toRdf-0028-out.nq" + }, { + "@id": "#t0029", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "named graph with embedded named graph", + "purpose": "Tests that named graphs containing named graphs flatten to single level of graph naming.", + "input": "toRdf-0029-in.jsonld", + "expect": "toRdf-0029-out.nq" + }, { + "@id": "#t0030", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "top-level graph with string subject reference", + "purpose": "Tests graphs containing subject references as strings.", + "input": "toRdf-0030-in.jsonld", + "expect": "toRdf-0030-out.nq" + }, { + "@id": "#t0031", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Reverse property", + "purpose": "Tests conversion of reverse properties.", + "input": "toRdf-0031-in.jsonld", + "expect": "toRdf-0031-out.nq" + }, { + "@id": "#t0032", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@context reordering", + "purpose": "Tests that generated triples do not depend on order of @context.", + "input": "toRdf-0032-in.jsonld", + "expect": "toRdf-0032-out.nq" + }, { + "@id": "#t0033", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@id reordering", + "purpose": "Tests that generated triples do not depend on order of @id.", + "input": "toRdf-0033-in.jsonld", + "expect": "toRdf-0033-out.nq" + }, { + "@id": "#t0034", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "context properties reordering", + "purpose": "Tests that generated triples do not depend on order of properties inside @context.", + "input": "toRdf-0034-in.jsonld", + "expect": "toRdf-0034-out.nq" + }, { + "@id": "#t0035", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "non-fractional numbers converted to xsd:double", + "purpose": "xsd:double's canonical lexical is used when converting numbers without fraction that are coerced to xsd:double", + "input": "toRdf-0035-in.jsonld", + "expect": "toRdf-0035-out.nq" + }, { + "@id": "#t0036", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Use nodeMapGeneration bnode labels", + "purpose": "The toRDF algorithm does not relabel blank nodes; it reuses the counter from the nodeMapGeneration to generate new ones", + "input": "toRdf-0036-in.jsonld", + "expect": "toRdf-0036-out.nq" + }, { + "@id": "#t0041", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "drop free-floating nodes", + "purpose": "Free-floating nodes do not generate RDF triples", + "input": "toRdf-0041-in.jsonld", + "expect": "toRdf-0041-out.nq" + }, { + "@id": "#t0042", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "basic", + "purpose": "Basic RDF conversion", + "input": "toRdf-0042-in.jsonld", + "expect": "toRdf-0042-out.nq" + }, { + "@id": "#t0043", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "drop null and unmapped properties", + "purpose": "Properties mapped to null or which are never mapped are dropped", + "input": "toRdf-0043-in.jsonld", + "expect": "toRdf-0043-out.nq" + }, { + "@id": "#t0044", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "optimize @set, keep empty arrays", + "purpose": "RDF version of expand-0004", + "input": "toRdf-0044-in.jsonld", + "expect": "toRdf-0044-out.nq" + }, { + "@id": "#t0045", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "do not expand aliased @id/@type", + "purpose": "RDF version of expand-0005", + "input": "toRdf-0045-in.jsonld", + "expect": "toRdf-0045-out.nq" + }, { + "@id": "#t0046", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "alias keywords", + "purpose": "RDF version of expand-0006", + "input": "toRdf-0046-in.jsonld", + "expect": "toRdf-0046-out.nq" + }, { + "@id": "#t0047", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "date type-coercion", + "purpose": "Type-coerced dates generate typed literals", + "input": "toRdf-0047-in.jsonld", + "expect": "toRdf-0047-out.nq" + }, { + "@id": "#t0048", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@value with @language", + "purpose": "RDF version of expand-0008", + "input": "toRdf-0048-in.jsonld", + "expect": "toRdf-0048-out.nq" + }, { + "@id": "#t0049", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@graph with terms", + "purpose": "RDF version of expand-0009", + "input": "toRdf-0049-in.jsonld", + "expect": "toRdf-0049-out.nq" + }, { + "@id": "#t0050", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "native types", + "purpose": "Native types generate typed literals", + "input": "toRdf-0050-in.jsonld", + "expect": "toRdf-0050-out.nq" + }, { + "@id": "#t0051", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "coerced @id", + "purpose": "RDF version of expand-0011", + "input": "toRdf-0051-in.jsonld", + "expect": "toRdf-0051-out.nq" + }, { + "@id": "#t0052", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@graph with embed", + "purpose": "RDF version of expand-0012", + "input": "toRdf-0052-in.jsonld", + "expect": "toRdf-0052-out.nq" + }, { + "@id": "#t0053", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "expand already expanded", + "purpose": "RDF version of expand-0013", + "input": "toRdf-0053-in.jsonld", + "expect": "toRdf-0053-out.nq" + }, { + "@id": "#t0054", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@set of @value objects with keyword aliases", + "purpose": "RDF version of expand-0014", + "input": "toRdf-0054-in.jsonld", + "expect": "toRdf-0054-out.nq" + }, { + "@id": "#t0055", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "collapse set of sets, keep empty lists", + "purpose": "RDF version of expand-0015", + "input": "toRdf-0055-in.jsonld", + "expect": "toRdf-0055-out.nq" + }, { + "@id": "#t0056", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "context reset", + "purpose": "RDF version of expand-0016", + "input": "toRdf-0056-in.jsonld", + "expect": "toRdf-0056-out.nq" + }, { + "@id": "#t0057", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@graph and @id aliased", + "purpose": "RDF version of expand-0017", + "input": "toRdf-0057-in.jsonld", + "expect": "toRdf-0057-out.nq" + }, { + "@id": "#t0058", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "override default @language", + "purpose": "RDF version of expand-0018", + "input": "toRdf-0058-in.jsonld", + "expect": "toRdf-0058-out.nq" + }, { + "@id": "#t0059", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "remove @value = null", + "purpose": "RDF version of expand-0019", + "input": "toRdf-0059-in.jsonld", + "expect": "toRdf-0059-out.nq" + }, { + "@id": "#t0060", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "do not remove @graph if not at top-level", + "purpose": "Embedded @graph without @id creates BNode-labeled named graph", + "input": "toRdf-0060-in.jsonld", + "expect": "toRdf-0060-out.nq" + }, { + "@id": "#t0061", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "do not remove @graph at top-level if not only property", + "purpose": "RDF version of expand-0021", + "input": "toRdf-0061-in.jsonld", + "expect": "toRdf-0061-out.nq" + }, { + "@id": "#t0062", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "expand value with default language", + "purpose": "RDF version of expand-0022", + "input": "toRdf-0062-in.jsonld", + "expect": "toRdf-0062-out.nq" + }, { + "@id": "#t0063", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Lists and sets of properties with list/set coercion", + "purpose": "RDF version of expand-0023", + "input": "toRdf-0063-in.jsonld", + "expect": "toRdf-0063-out.nq" + }, { + "@id": "#t0064", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Multiple contexts", + "purpose": "RDF version of expand-0024", + "input": "toRdf-0064-in.jsonld", + "expect": "toRdf-0064-out.nq" + }, { + "@id": "#t0065", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Problematic IRI expansion tests", + "purpose": "RDF version of expand-0025", + "input": "toRdf-0065-in.jsonld", + "expect": "toRdf-0065-out.nq" + }, { + "@id": "#t0066", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expanding term mapping to @type uses @type syntax", + "purpose": "RDF version of expand-0026", + "input": "toRdf-0066-in.jsonld", + "expect": "toRdf-0066-out.nq" + }, { + "@id": "#t0067", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Keep duplicate values in @list and @set", + "purpose": "RDF version of expand-0027", + "input": "toRdf-0067-in.jsonld", + "expect": "toRdf-0067-out.nq" + }, { + "@id": "#t0068", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Use @vocab in properties and @type but not in @id", + "purpose": "RDF version of expand-0028", + "input": "toRdf-0068-in.jsonld", + "expect": "toRdf-0068-out.nq" + }, { + "@id": "#t0069", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Relative IRIs", + "purpose": "RDF version of expand-0029", + "input": "toRdf-0069-in.jsonld", + "expect": "toRdf-0069-out.nq" + }, { + "@id": "#t0070", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Language maps", + "purpose": "RDF version of expand-0030", + "input": "toRdf-0070-in.jsonld", + "expect": "toRdf-0070-out.nq" + }, { + "@id": "#t0071", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "type-coercion of native types", + "purpose": "RDF version of expand-0031", + "input": "toRdf-0071-in.jsonld", + "expect": "toRdf-0071-out.nq" + }, { + "@id": "#t0072", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Mapping a term to null decouples it from @vocab", + "purpose": "RDF version of expand-0032", + "input": "toRdf-0072-in.jsonld", + "expect": "toRdf-0072-out.nq" + }, { + "@id": "#t0073", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Using @vocab with with type-coercion", + "purpose": "RDF version of expand-0033", + "input": "toRdf-0073-in.jsonld", + "expect": "toRdf-0073-out.nq" + }, { + "@id": "#t0074", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Multiple properties expanding to the same IRI", + "purpose": "RDF version of expand-0034", + "input": "toRdf-0074-in.jsonld", + "expect": "toRdf-0074-out.nq" + }, { + "@id": "#t0075", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Language maps with @vocab, default language, and colliding property", + "purpose": "RDF version of expand-0035", + "input": "toRdf-0075-in.jsonld", + "expect": "toRdf-0075-out.nq" + }, { + "@id": "#t0076", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expanding @index", + "purpose": "RDF version of expand-0036", + "input": "toRdf-0076-in.jsonld", + "expect": "toRdf-0076-out.nq" + }, { + "@id": "#t0077", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expanding @reverse", + "purpose": "RDF version of expand-0037", + "input": "toRdf-0077-in.jsonld", + "expect": "toRdf-0077-out.nq" + }, { + "@id": "#t0078", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Drop blank node predicates by default", + "purpose": "Triples with blank node predicates are dropped by default.", + "input": "toRdf-0078-in.jsonld", + "expect": "toRdf-0078-out.nq" + }, { + "@id": "#t0079", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Using terms in a reverse-maps", + "purpose": "RDF version of expand-0039", + "input": "toRdf-0079-in.jsonld", + "expect": "toRdf-0079-out.nq" + }, { + "@id": "#t0080", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "language and index expansion on non-objects", + "purpose": "RDF version of expand-0040", + "input": "toRdf-0080-in.jsonld", + "expect": "toRdf-0080-out.nq" + }, { + "@id": "#t0081", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Reset the default language", + "purpose": "RDF version of expand-0041", + "input": "toRdf-0081-in.jsonld", + "expect": "toRdf-0081-out.nq" + }, { + "@id": "#t0082", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expanding reverse properties", + "purpose": "RDF version of expand-0042", + "input": "toRdf-0082-in.jsonld", + "expect": "toRdf-0082-out.nq" + }, { + "@id": "#t0083", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Using reverse properties inside a @reverse-container", + "purpose": "RDF version of expand-0043", + "input": "toRdf-0083-in.jsonld", + "expect": "toRdf-0083-out.nq" + }, { + "@id": "#t0084", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Ensure index maps use language mapping", + "purpose": "RDF version of expand-0044", + "input": "toRdf-0084-in.jsonld", + "expect": "toRdf-0084-out.nq" + }, { + "@id": "#t0085", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Top-level value objects are removed", + "purpose": "RDF version of expand-0045", + "input": "toRdf-0085-in.jsonld", + "expect": "toRdf-0085-out.nq" + }, { + "@id": "#t0086", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Free-floating nodes are removed", + "purpose": "RDF version of expand-0046", + "input": "toRdf-0086-in.jsonld", + "expect": "toRdf-0086-out.nq" + }, { + "@id": "#t0087", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Remove free-floating set values and lists", + "purpose": "RDF version of expand-0047", + "input": "toRdf-0087-in.jsonld", + "expect": "toRdf-0087-out.nq" + }, { + "@id": "#t0088", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Terms are ignored in @id", + "purpose": "RDF version of expand-0048", + "input": "toRdf-0088-in.jsonld", + "expect": "toRdf-0088-out.nq" + }, { + "@id": "#t0089", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Using strings as value of a reverse property", + "purpose": "RDF version of expand-0049", + "input": "toRdf-0089-in.jsonld", + "expect": "toRdf-0089-out.nq" + }, { + "@id": "#t0090", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Term definitions with prefix separate from prefix definitions", + "purpose": "RDF version of expand-0050", + "input": "toRdf-0090-in.jsonld", + "expect": "toRdf-0090-out.nq" + }, { + "@id": "#t0091", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expansion of keyword aliases in term definitions", + "purpose": "RDF version of expand-0051", + "input": "toRdf-0091-in.jsonld", + "expect": "toRdf-0091-out.nq" + }, { + "@id": "#t0092", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "@vocab-relative IRIs in term definitions", + "purpose": "RDF version of expand-0052", + "input": "toRdf-0092-in.jsonld", + "expect": "toRdf-0092-out.nq" + }, { + "@id": "#t0093", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand absolute IRI with @type: @vocab", + "purpose": "RDF version of expand-0053", + "input": "toRdf-0093-in.jsonld", + "expect": "toRdf-0093-out.nq" + }, { + "@id": "#t0094", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand term with @type: @vocab", + "purpose": "RDF version of expand-0054", + "input": "toRdf-0094-in.jsonld", + "expect": "toRdf-0094-out.nq" + }, { + "@id": "#t0095", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand @vocab-relative term with @type: @vocab", + "purpose": "RDF version of expand-0055", + "input": "toRdf-0095-in.jsonld", + "expect": "toRdf-0095-out.nq" + }, { + "@id": "#t0096", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Use terms with @type: @vocab but not with @type: @id", + "purpose": "RDF version of expand-0056", + "input": "toRdf-0096-in.jsonld", + "expect": "toRdf-0096-out.nq" + }, { + "@id": "#t0097", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand relative IRI with @type: @vocab", + "purpose": "RDF version of expand-0057", + "input": "toRdf-0097-in.jsonld", + "expect": "toRdf-0097-out.nq" + }, { + "@id": "#t0098", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand compact IRI with @type: @vocab", + "purpose": "RDF version of expand-0058", + "input": "toRdf-0098-in.jsonld", + "expect": "toRdf-0098-out.nq" + }, { + "@id": "#t0099", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Reset @vocab by setting it to null", + "purpose": "RDF version of expand-0059", + "input": "toRdf-0099-in.jsonld", + "expect": "toRdf-0099-out.nq" + }, { + "@id": "#t0100", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Overwrite document base with @base and reset it again", + "purpose": "RDF version of expand-0060", + "input": "toRdf-0100-in.jsonld", + "expect": "toRdf-0100-out.nq" + }, { + "@id": "#t0101", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Coercing native types to arbitrary datatypes", + "purpose": "RDF version of expand-0061", + "input": "toRdf-0101-in.jsonld", + "expect": "toRdf-0101-out.nq" + }, { + "@id": "#t0102", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Various relative IRIs with with @base", + "purpose": "RDF version of expand-0062", + "input": "toRdf-0102-in.jsonld", + "expect": "toRdf-0102-out.nq" + }, { + "@id": "#t0103", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand a reverse property with an index-container", + "purpose": "RDF version of expand-0063", + "input": "toRdf-0103-in.jsonld", + "expect": "toRdf-0103-out.nq" + }, { + "@id": "#t0104", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Expand reverse property whose values are unlabeled blank nodes", + "purpose": "RDF version of expand-0064", + "input": "toRdf-0104-in.jsonld", + "expect": "toRdf-0104-out.nq" + }, { + "@id": "#t0105", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Keys that are not mapped to an IRI in a reverse-map are dropped", + "purpose": "RDF version of expand-0065", + "input": "toRdf-0105-in.jsonld", + "expect": "toRdf-0105-out.nq" + }, { + "@id": "#t0106", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Use @vocab to expand keys in reverse-maps", + "purpose": "RDF version of expand-0066", + "input": "toRdf-0106-in.jsonld", + "expect": "toRdf-0106-out.nq" + }, { + "@id": "#t0107", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "prefix:://sufffix not a compact IRI", + "purpose": "RDF version of expand-0067", + "input": "toRdf-0107-in.jsonld", + "expect": "toRdf-0107-out.nq" + }, { + "@id": "#t0108", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "_::sufffix not a compact IRI", + "purpose": "RDF version of expand-0068", + "input": "toRdf-0108-in.jsonld", + "expect": "toRdf-0108-out.nq" + }, { + "@id": "#t0109", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Compact IRI as term with type mapping", + "purpose": "RDF version of expand-0069", + "input": "toRdf-0109-in.jsonld", + "expect": "toRdf-0109-out.nq" + }, { + "@id": "#t0110", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Redefine compact IRI with itself", + "purpose": "RDF version of expand-0070", + "input": "toRdf-0110-in.jsonld", + "expect": "toRdf-0110-out.nq" + }, { + "@id": "#t0111", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Redefine terms looking like compact IRIs", + "purpose": "RDF version of expand-0071", + "input": "toRdf-0111-in.jsonld", + "expect": "toRdf-0111-out.nq" + }, { + "@id": "#t0112", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Redefine term using @vocab, not itself", + "purpose": "RDF version of expand-0072", + "input": "toRdf-0112-in.jsonld", + "expect": "toRdf-0112-out.nq" + }, { + "@id": "#t0113", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Dataset with a IRI named graph", + "purpose": "Basic use of creating a named graph using an IRI name", + "input": "toRdf-0113-in.jsonld", + "expect": "toRdf-0113-out.nq" + }, { + "@id": "#t0114", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Dataset with a IRI named graph", + "purpose": "Basic use of creating a named graph using a BNode name", + "input": "toRdf-0114-in.jsonld", + "expect": "toRdf-0114-out.nq" + }, { + "@id": "#t0115", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Dataset with a default and two named graphs", + "purpose": "Dataset with a default and two named graphs (IRI and BNode)", + "input": "toRdf-0115-in.jsonld", + "expect": "toRdf-0115-out.nq" + }, { + "@id": "#t0116", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Dataset from node with embedded named graph", + "purpose": "Embedding @graph in a node creates a named graph", + "input": "toRdf-0116-in.jsonld", + "expect": "toRdf-0116-out.nq" + }, { + "@id": "#t0117", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Dataset from node with embedded named graph (bnode)", + "purpose": "Embedding @graph in a node creates a named graph. Graph name is created if there is no subject", + "input": "toRdf-0117-in.jsonld", + "expect": "toRdf-0117-out.nq" + }, { + "@id": "#t0118", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "produce generalized RDF flag", + "purpose": "Triples with blank node predicates are not dropped if the produce generalized RDF flag is true.", + "option": { + "produceGeneralizedRdf": true + }, + "input": "toRdf-0118-in.jsonld", + "expect": "toRdf-0118-out.nq" + }, { + "@id": "#t0119", + "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], + "name": "Blank nodes with reverse properties", + "purpose": "Proper (re-)labeling of blank nodes if used with reverse properties.", + "input": "toRdf-0119-in.jsonld", + "expect": "toRdf-0119-out.nq" + } + ] +} diff --git a/test/json-ld.net.tests/SortingTests.cs b/test/json-ld.net.tests/SortingTests.cs new file mode 100644 index 00000000..37cb0ba0 --- /dev/null +++ b/test/json-ld.net.tests/SortingTests.cs @@ -0,0 +1,173 @@ +using JsonLD.Core; +using JsonLD.Util; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.IO; +using Xunit; + +namespace JsonLD.Test +{ + public class SortingTests + { + [Theory, MemberData(nameof(SortingTestCases))] + public void RunJsonLdProcessor(string id, SortingTestCase testCase) + { + JToken result = testCase.run(); + if (testCase.error != null) + { + Assert.True(((string)result["error"]).StartsWith((string)testCase.error), "Resulting error doesn't match expectations."); + } + else + { + if (!JsonLdUtils.DeepCompare(result, testCase.output)) + { +#if DEBUG + Console.WriteLine(id); + Console.WriteLine("Actual:"); + Console.Write(JSONUtils.ToPrettyString(result)); + Console.WriteLine("--------------------------"); + Console.WriteLine("Expected:"); + Console.Write(JSONUtils.ToPrettyString(testCase.output)); + Console.WriteLine("--------------------------"); +#endif + + Assert.True(false, "Returned JSON doesn't match expectations."); + } + } + } + + public class SortingTestCase + { + public JToken input { get; set; } + public JToken context { get; set; } + public JToken output { get; set; } + public JToken frame { get; set; } + public JToken error { get; set; } + public Func run { get; set; } + } + + private static string[] GetManifests() + { + return new[] { + //"compact-manifest.jsonld" + //"expand-manifest.jsonld", + //"flatten-manifest.jsonld", + //"frame-manifest.jsonld", + //"toRdf-manifest.jsonld", + "fromRdf-manifest.jsonld", + //"normalize-manifest.jsonld" + }; + } + + public static IEnumerable SortingTestCases() + { + var manifests = GetManifests(); + var jsonFetcher = new JsonFetcher(); + var rootDirectory = Path.Combine("Sorting", "W3C"); + + foreach (string manifest in manifests) + { + JToken manifestJson = jsonFetcher.GetJson(manifest, rootDirectory); + + foreach (JObject testcase in manifestJson["sequence"]) + { + Func run; + SortingTestCase newCase = new SortingTestCase(); + + newCase.input = jsonFetcher.GetJson(manifestJson["input"], rootDirectory); + newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory); + newCase.context = jsonFetcher.GetJson(manifestJson["test-context"], rootDirectory); + + var options = new JsonLdOptions(); + + var sortType = (string)testcase["sort-type"]; + + if (sortType == "jld:GraphsAndNodes") + { + options.SetSortGraphs(true); + options.SetSortGraphNodes(true); + } + else if (sortType == "jld:Graphs") + { + options.SetSortGraphs(true); + options.SetSortGraphNodes(false); + } + else if (sortType == "jld:Nodes") + { + options.SetSortGraphs(false); + options.SetSortGraphNodes(true); + } + else if (sortType == "jld:None") + { + options.SetSortGraphs(false); + options.SetSortGraphNodes(false); + } + + JsonLdApi jsonLdApi = new JsonLdApi(options); + Context activeCtx = new Context(newCase.context, options); + + var testType = (string)testcase["test-type"]; + + //if (testType == "jld:Compact") + { + // run = () => jsonLdApi.FromRDF(rdf); + } + //else if (testType == "jld:Expand") + //{ + // //run = () => JsonLdProcessor.Expand(newCase.input, options); + //} + //else if (testType == "jld:Flatten") + //{ + // //run = () => JsonLdProcessor.Flatten(newCase.input, newCase.context, options); + //} + //else if (testType == "jld:Frame") + //{ + // //run = () => JsonLdProcessor.Frame(newCase.input, newCase.frame, options); + //} + //else if (testType == "jld:Normalize") + //{ + // run = () => new JValue( + // RDFDatasetUtils.ToNQuads((RDFDataset)JsonLdProcessor.Normalize(newCase.input, options)).Replace("\n", "\r\n") + // ); + //} + //else if (testType == "jld:ToRDF") + //{ + // options.format = "application/nquads"; + // //run = () => new JValue( + // // ((string)JsonLdProcessor.ToRDF(newCase.input, options)).Replace("\n", "\r\n") + // //); + //} + //else if (testType == "jld:FromRDF") + { + JToken quads = newCase.input["quads"]; + RDFDataset rdf = new RDFDataset(); + + foreach (JToken quad in quads) + { + string subject = (string)quad["subject"]; + string predicate = (string)quad["predicate"]; + string value = (string)quad["value"]; + string graph = (string)quad["graph"]; + + rdf.AddQuad(subject, predicate, value, graph); + } + + options.format = "application/nquads"; + + run = () => jsonLdApi.FromRDF(rdf); + } + //else + //{ + // run = () => { throw new Exception("Couldn't find a test type, apparently."); }; + //} + + newCase.run = run; + + yield return new object[] { manifest + (string)testcase["@id"], newCase }; + } + } + } + } +} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index e743c9bb..4f236a6f 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -27,4 +27,79 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + \ No newline at end of file From 743598fc0d9d3588d5efb7f57f794aca015e3eba Mon Sep 17 00:00:00 2001 From: dnllowe Date: Sun, 16 Jun 2019 19:58:21 -0400 Subject: [PATCH 028/255] Limits ordering logic to JsonLdApi.FromRdf --- src/json-ld.net/Core/JsonLdApi.cs | 39 +- src/json-ld.net/Core/JsonLdOptions.cs | 20 +- src/json-ld.net/Core/NormalizeUtils.cs | 24 +- .../Sorting/W3C/compact-context.jsonld | 4 + .../Sorting/W3C/compact-in.jsonld | 89 ++ .../Sorting/W3C/compact-manifest.jsonld | 41 + .../Sorting/W3C/expand-0002-in.jsonld | 18 - .../Sorting/W3C/expand-0002-out.jsonld | 9 - .../Sorting/W3C/expand-manifest.jsonld | 556 ------------ .../Sorting/W3C/flatten-0002-in.jsonld | 18 - .../Sorting/W3C/flatten-0002-out.jsonld | 38 - .../Sorting/W3C/flatten-manifest.jsonld | 330 ------- .../Sorting/W3C/frame-0002-in.jsonld | 28 - .../Sorting/W3C/frame-0002-out.jsonld | 23 - .../Sorting/W3C/fromRdf-context.jsonld | 11 - .../Sorting/W3C/fromRdf-manifest.jsonld | 3 +- .../Sorting/W3C/normalize-0002-in.jsonld | 14 - .../Sorting/W3C/normalize-0002-out.nq | 1 - .../Sorting/W3C/normalize-manifest.jsonld | 353 -------- .../Sorting/W3C/remote-doc-0002-in.json | 7 - .../Sorting/W3C/remote-doc-0002-out.jsonld | 4 - .../Sorting/W3C/remote-doc-manifest.jsonld | 129 --- .../Sorting/W3C/toRdf-0002-in.jsonld | 5 - .../Sorting/W3C/toRdf-0002-out.nq | 1 - .../Sorting/W3C/toRdf-manifest.jsonld | 812 ------------------ test/json-ld.net.tests/SortingTests.cs | 74 +- .../W3C/compact-0010-out.jsonld | 48 +- .../json-ld.net.tests.csproj | 59 +- 28 files changed, 220 insertions(+), 2538 deletions(-) create mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld create mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq delete mode 100644 test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json delete mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq delete mode 100644 test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld diff --git a/src/json-ld.net/Core/JsonLdApi.cs b/src/json-ld.net/Core/JsonLdApi.cs index 2cb465a9..ea373f4d 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -123,10 +123,7 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e // 7) JArray keys = new JArray(element.GetKeys()); - //if (opts.GetSortGraphNodes()) - { - keys.SortInPlace(); - } + keys.SortInPlace(); foreach (string expandedProperty in keys) { @@ -496,10 +493,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el // 7) JArray keys = new JArray(element.GetKeys()); - //if (opts.GetSortGraphNodes()) - { - keys.SortInPlace(); - } + keys.SortInPlace(); foreach (string key in keys) { @@ -818,10 +812,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el // 7.6.2) JArray indexKeys = new JArray(value.GetKeys()); - //if (opts.GetSortGraphNodes()) - { - indexKeys.SortInPlace(); - } + indexKeys.SortInPlace(); foreach (string index in indexKeys) { @@ -1305,10 +1296,7 @@ private void GenerateNodeMap(JToken element, JObject nodeMap, // 6.11) JArray keys = new JArray(element.GetKeys()); - //if (!opts.GetSortGraphNodes()) - { - keys.SortInPlace(); - } + keys.SortInPlace(); foreach (string property_1 in keys) { @@ -1456,10 +1444,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // add matches to output JArray ids = new JArray(matches.GetKeys()); - //if (!opts.GetSortGraphs()) - { - ids.SortInPlace(); - } + ids.SortInPlace(); foreach (string id in ids) { @@ -1524,10 +1509,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes JObject element = (JObject)matches[id]; JArray props = new JArray(element.GetKeys()); - //if (!opts.GetSortGraphNodes()) - { - props.SortInPlace(); - } + props.SortInPlace(); foreach (string prop in props) { @@ -1606,10 +1588,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // handle defaults props = new JArray(frame.GetKeys()); - //if (!opts.GetSortGraphNodes()) - { - props.SortInPlace(); - } + props.SortInPlace(); foreach (string prop_1 in props) { @@ -2151,7 +2130,7 @@ public virtual JArray FromRDF(RDFDataset dataset) // 6) JArray ids = new JArray(defaultGraph.GetKeys()); - if (!opts.GetSortGraphs()) + if (opts.GetSortGraphsFromRdf()) { ids.SortInPlace(); } @@ -2167,7 +2146,7 @@ public virtual JArray FromRDF(RDFDataset dataset) // 6.1.2) JArray keys = new JArray(graphMap[subject_1].GetKeys()); - if (!opts.GetSortGraphNodes()) + if (opts.GetSortGraphNodesFromRdf()) { keys.SortInPlace(); } diff --git a/src/json-ld.net/Core/JsonLdOptions.cs b/src/json-ld.net/Core/JsonLdOptions.cs index adfa13d6..ebd2cc28 100644 --- a/src/json-ld.net/Core/JsonLdOptions.cs +++ b/src/json-ld.net/Core/JsonLdOptions.cs @@ -42,9 +42,9 @@ public virtual JsonLD.Core.JsonLdOptions Clone() private bool produceGeneralizedRdf = false; - private bool sortGraphs = true; + private bool sortGraphsFromRdf = true; - private bool sortGraphNodes = true; + private bool sortGraphNodesFromRdf = true; // base options // frame options // rdf conversion options @@ -149,24 +149,24 @@ public virtual void SetProduceGeneralizedRdf(bool produceGeneralizedRdf) this.produceGeneralizedRdf = produceGeneralizedRdf; } - public virtual bool GetSortGraphs() + public virtual bool GetSortGraphsFromRdf() { - return sortGraphs; + return sortGraphsFromRdf; } - public virtual void SetSortGraphs(bool sortGraphs) + public virtual void SetSortGraphsFromRdf(bool sortGraphs) { - this.sortGraphs = sortGraphs; + this.sortGraphsFromRdf = sortGraphs; } - public virtual bool GetSortGraphNodes() + public virtual bool GetSortGraphNodesFromRdf() { - return sortGraphNodes; + return sortGraphNodesFromRdf; } - public virtual void SetSortGraphNodes(bool sortGraphNodes) + public virtual void SetSortGraphNodesFromRdf(bool sortGraphNodes) { - this.sortGraphNodes = sortGraphNodes; + this.sortGraphNodesFromRdf = sortGraphNodes; } public string format = null; diff --git a/src/json-ld.net/Core/NormalizeUtils.cs b/src/json-ld.net/Core/NormalizeUtils.cs index 6ed92eee..5e430295 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -46,10 +46,7 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) bool named = false; IList hashes = new List(unique.Keys); - //if (!options.GetSortGraphs()) - { - hashes.SortInPlace(); - } + hashes.SortInPlace(); foreach (string hash in hashes) { @@ -79,10 +76,7 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // enumerate duplicate hash groups in sorted order hashes = new List(duplicates.Keys); - //if (!options.GetSortGraphs()) - { - hashes.SortInPlace(); - } + hashes.SortInPlace(); // process each group for (int pgi = 0; ; pgi++) @@ -119,11 +113,8 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) ) && !(quad["name"] == null) ? (string)((IDictionary)((IDictionary)quad)["name"])["value"] : null)); } - //if (!options.GetSortGraphs()) - { - // sort normalized output - normalized.SortInPlace(); - } + // sort normalized output + normalized.SortInPlace(); // handle output format if (options.format != null) @@ -156,11 +147,8 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) { if (n_2 == group.Count) { - //if (!options.GetSortGraphs()) - { - // name bnodes in hash order - results.SortInPlace(new _IComparer_145()); - } + // name bnodes in hash order + results.SortInPlace(new _IComparer_145()); foreach (NormalizeUtils.HashResult r in results) { diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld new file mode 100644 index 00000000..fab1a804 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld @@ -0,0 +1,4 @@ +{ + "@context": { + } +} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld new file mode 100644 index 00000000..5a11289c --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld @@ -0,0 +1,89 @@ +[ + { + "@id": "http://example.org/node/3", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n3-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n3-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n3-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/1", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n1-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n1-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n1-o2-value" + } + ] + } + ] + }, + { + "@id": "http://example.org/node/2", + "@graph": [ + { + "@id": "http://example.org/object/3", + "http://example.org/value": [ + { + "@id": "n2-o3-value" + } + ] + }, + { + "@id": "http://example.org/object/1", + "http://example.org/value": [ + { + "@id": "n2-o1-value" + } + ] + }, + { + "@id": "http://example.org/object/2", + "http://example.org/value": [ + { + "@id": "n2-o2-value" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld new file mode 100644 index 00000000..bff774d4 --- /dev/null +++ b/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld @@ -0,0 +1,41 @@ +{ + "@type": "mf:Manifest", + "name": "Compaction", + "description": "JSON-LD sorting graphs and nodes when running Compact", + "test-context": "compact-context.jsonld", + "input": "compact-in.jsonld", + "sequence": [ + { + "@id": "#t0001", + "sort-type": "jld:GraphsAndNodes", + "test-type": "jld:Compact", + "name": "sort graphs and nodes", + "purpose": "graphs and nodes sorted when running Compact", + "expect": "compact-out-sort-graphs-and-nodes.jsonld" + }, + { + "@id": "#t0002", + "sort-type": "jld:Graphs", + "test-type": "jld:Compact", + "name": "sort graphs only", + "purpose": "graphs sorted when running Compact", + "expect": "compact-out-sort-graphs.jsonld" + }, + { + "@id": "#t0003", + "sort-type": "jld:Nodes", + "test-type": "jld:Compact", + "name": "sort graph nodes only", + "purpose": "graph nodes sorted when running Compact", + "expect": "compact-out-sort-graph-nodes.jsonld" + }, + { + "@id": "#t0004", + "sort-type": "jld:None", + "test-type": "jld:Compact", + "name": "sort nothing", + "purpose": "sort nothing running Compact", + "expect": "compact-out-no-sorting.jsonld" + } + ] +} diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld deleted file mode 100644 index e4598e55..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/expand-0002-in.jsonld +++ /dev/null @@ -1,18 +0,0 @@ -{ - "@context": { - "t1": "http://example.com/t1", - "t2": "http://example.com/t2", - "term1": "http://example.com/term1", - "term2": "http://example.com/term2", - "term3": "http://example.com/term3", - "term4": "http://example.com/term4", - "term5": "http://example.com/term5" - }, - "@id": "http://example.com/id1", - "@type": "t1", - "term1": "v1", - "term2": {"@value": "v2", "@type": "t2"}, - "term3": {"@value": "v3", "@language": "en"}, - "term4": 4, - "term5": [50, 51] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld deleted file mode 100644 index cc8e658e..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/expand-0002-out.jsonld +++ /dev/null @@ -1,9 +0,0 @@ -[{ - "@id": "http://example.com/id1", - "@type": ["http://example.com/t1"], - "http://example.com/term1": [{"@value": "v1"}], - "http://example.com/term2": [{"@value": "v2", "@type": "http://example.com/t2"}], - "http://example.com/term3": [{"@value": "v3", "@language": "en"}], - "http://example.com/term4": [{"@value": 4}], - "http://example.com/term5": [{"@value": 50}, {"@value": 51}] -}] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld deleted file mode 100644 index 49a200c9..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/expand-manifest.jsonld +++ /dev/null @@ -1,556 +0,0 @@ -{ - "@context": "http://json-ld.org/test-suite/context.jsonld", - "@id": "", - "@type": "mf:Manifest", - "description": "JSON-LD to Expansion tests use object compare", - "name": "Expansion", - "baseIri": "http://json-ld.org/test-suite/tests/", - "sequence": [ - { - "@id": "#t0001", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "drop free-floating nodes", - "purpose": "Expand drops unreferenced nodes having only @id", - "input": "expand-0001-in.jsonld", - "expect": "expand-0001-out.jsonld" - }, { - "@id": "#t0002", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "basic", - "purpose": "Expanding terms with different types of values", - "input": "expand-0002-in.jsonld", - "expect": "expand-0002-out.jsonld" - }, { - "@id": "#t0003", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "drop null and unmapped properties", - "purpose": "Verifies that null values and unmapped properties are removed from expanded output", - "input": "expand-0003-in.jsonld", - "expect": "expand-0003-out.jsonld" - }, { - "@id": "#t0004", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "optimize @set, keep empty arrays", - "purpose": "Uses of @set are removed in expansion; values of @set, or just plain values which are empty arrays are retained", - "input": "expand-0004-in.jsonld", - "expect": "expand-0004-out.jsonld" - }, { - "@id": "#t0005", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "do not expand aliased @id/@type", - "purpose": "If a keyword is aliased, it is not used when expanding", - "input": "expand-0005-in.jsonld", - "expect": "expand-0005-out.jsonld" - }, { - "@id": "#t0006", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "alias keywords", - "purpose": "Aliased keywords expand in resulting document", - "input": "expand-0006-in.jsonld", - "expect": "expand-0006-out.jsonld" - }, { - "@id": "#t0007", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "date type-coercion", - "purpose": "Expand strings to expanded value with @type: xsd:dateTime", - "input": "expand-0007-in.jsonld", - "expect": "expand-0007-out.jsonld" - }, { - "@id": "#t0008", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@value with @language", - "purpose": "Keep expanded values with @language, drop non-conforming value objects containing just @language", - "input": "expand-0008-in.jsonld", - "expect": "expand-0008-out.jsonld" - }, { - "@id": "#t0009", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@graph with terms", - "purpose": "Use of @graph to contain multiple nodes within array", - "input": "expand-0009-in.jsonld", - "expect": "expand-0009-out.jsonld" - }, { - "@id": "#t0010", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "native types", - "purpose": "Expanding native scalar retains native scalar within expanded value", - "input": "expand-0010-in.jsonld", - "expect": "expand-0010-out.jsonld" - }, { - "@id": "#t0011", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "coerced @id", - "purpose": "A value of a property with @type: @id coercion expands to a node reference", - "input": "expand-0011-in.jsonld", - "expect": "expand-0011-out.jsonld" - }, { - "@id": "#t0012", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@graph with embed", - "purpose": "Use of @graph to contain multiple nodes within array", - "input": "expand-0012-in.jsonld", - "expect": "expand-0012-out.jsonld" - }, { - "@id": "#t0013", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "expand already expanded", - "purpose": "Expand does not mess up already expanded document", - "input": "expand-0013-in.jsonld", - "expect": "expand-0013-out.jsonld" - }, { - "@id": "#t0014", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@set of @value objects with keyword aliases", - "purpose": "Expanding aliased @set and @value", - "input": "expand-0014-in.jsonld", - "expect": "expand-0014-out.jsonld" - }, { - "@id": "#t0015", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "collapse set of sets, keep empty lists", - "purpose": "An array of multiple @set nodes are collapsed into a single array", - "input": "expand-0015-in.jsonld", - "expect": "expand-0015-out.jsonld" - }, { - "@id": "#t0016", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "context reset", - "purpose": "Setting @context to null within an embedded object resets back to initial context state", - "input": "expand-0016-in.jsonld", - "expect": "expand-0016-out.jsonld" - }, { - "@id": "#t0017", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@graph and @id aliased", - "purpose": "Expanding with @graph and @id aliases", - "input": "expand-0017-in.jsonld", - "expect": "expand-0017-out.jsonld" - }, { - "@id": "#t0018", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "override default @language", - "purpose": "override default @language in terms; only language-tag strings", - "input": "expand-0018-in.jsonld", - "expect": "expand-0018-out.jsonld" - }, { - "@id": "#t0019", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "remove @value = null", - "purpose": "Expanding a value of null removes the value", - "input": "expand-0019-in.jsonld", - "expect": "expand-0019-out.jsonld" - }, { - "@id": "#t0020", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "do not remove @graph if not at top-level", - "purpose": "@graph used under a node is retained", - "input": "expand-0020-in.jsonld", - "expect": "expand-0020-out.jsonld" - }, { - "@id": "#t0021", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "do not remove @graph at top-level if not only property", - "purpose": "@graph used at the top level is retained if there are other properties", - "input": "expand-0021-in.jsonld", - "expect": "expand-0021-out.jsonld" - }, { - "@id": "#t0022", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "expand value with default language", - "purpose": "Expanding with a default language applies that language to string values", - "input": "expand-0022-in.jsonld", - "expect": "expand-0022-out.jsonld" - }, { - "@id": "#t0023", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expanding list/set with coercion", - "purpose": "Expanding lists and sets with properties having coercion coerces list/set values", - "input": "expand-0023-in.jsonld", - "expect": "expand-0023-out.jsonld" - }, { - "@id": "#t0024", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Multiple contexts", - "purpose": "Tests that contexts in an array are merged", - "input": "expand-0024-in.jsonld", - "expect": "expand-0024-out.jsonld" - }, { - "@id": "#t0025", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Problematic IRI expansion tests", - "purpose": "Expanding different kinds of terms and Compact IRIs", - "input": "expand-0025-in.jsonld", - "expect": "expand-0025-out.jsonld" - }, { - "@id": "#t0026", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Term definition with @id: @type", - "purpose": "Expanding term mapping to @type uses @type syntax", - "input": "expand-0026-in.jsonld", - "expect": "expand-0026-out.jsonld" - }, { - "@id": "#t0027", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Duplicate values in @list and @set", - "purpose": "Duplicate values in @list and @set are not merged", - "input": "expand-0027-in.jsonld", - "expect": "expand-0027-out.jsonld" - }, { - "@id": "#t0028", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Use @vocab in properties and @type but not in @id", - "purpose": "@vocab is used to compact properties and @type, but is not used for @id", - "input": "expand-0028-in.jsonld", - "expect": "expand-0028-out.jsonld" - }, { - "@id": "#t0029", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Relative IRIs", - "purpose": "@base is used to compact @id; test with different relative IRIs", - "input": "expand-0029-in.jsonld", - "expect": "expand-0029-out.jsonld" - }, { - "@id": "#t0030", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Language maps", - "purpose": "Language Maps expand values to include @language", - "input": "expand-0030-in.jsonld", - "expect": "expand-0030-out.jsonld" - }, { - "@id": "#t0031", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "type-coercion of native types", - "purpose": "Expanding native types with type coercion adds the coerced type to an expanded value representation and retains the native value representation", - "input": "expand-0031-in.jsonld", - "expect": "expand-0031-out.jsonld" - }, { - "@id": "#t0032", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Null term and @vocab", - "purpose": "Mapping a term to null decouples it from @vocab", - "input": "expand-0032-in.jsonld", - "expect": "expand-0032-out.jsonld" - }, { - "@id": "#t0033", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Using @vocab with with type-coercion", - "purpose": "Verifies that terms can be defined using @vocab", - "input": "expand-0033-in.jsonld", - "expect": "expand-0033-out.jsonld" - }, { - "@id": "#t0034", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Multiple properties expanding to the same IRI", - "purpose": "Verifies multiple values from separate terms are deterministically made multiple values of the IRI associated with the terms", - "input": "expand-0034-in.jsonld", - "expect": "expand-0034-out.jsonld" - }, { - "@id": "#t0035", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Language maps with @vocab, default language, and colliding property", - "purpose": "Pathological tests of language maps", - "input": "expand-0035-in.jsonld", - "expect": "expand-0035-out.jsonld" - }, { - "@id": "#t0036", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expanding @index", - "purpose": "Expanding index maps for terms defined with @container: @index", - "input": "expand-0036-in.jsonld", - "expect": "expand-0036-out.jsonld" - }, { - "@id": "#t0037", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expanding @reverse", - "purpose": "Expanding @reverse keeps @reverse", - "input": "expand-0037-in.jsonld", - "expect": "expand-0037-out.jsonld" - }, { - "@id": "#t0038", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expanding blank node labels", - "purpose": "Blank nodes are not relabeled during expansion", - "input": "expand-0038-in.jsonld", - "expect": "expand-0038-out.jsonld" - }, { - "@id": "#t0039", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Using terms in a reverse-maps", - "purpose": "Terms within @reverse are expanded", - "input": "expand-0039-in.jsonld", - "expect": "expand-0039-out.jsonld" - }, { - "@id": "#t0040", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "language and index expansion on non-objects", - "purpose": "Only invoke language and index map expansion if the value is a JSON object", - "input": "expand-0040-in.jsonld", - "expect": "expand-0040-out.jsonld" - }, { - "@id": "#t0041", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@language: null", - "name": "@language: null resets the default language", - "input": "expand-0041-in.jsonld", - "expect": "expand-0041-out.jsonld" - }, { - "@id": "#t0042", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Reverse properties", - "purpose": "Expanding terms defined as reverse properties uses @reverse in expanded document", - "input": "expand-0042-in.jsonld", - "expect": "expand-0042-out.jsonld" - }, { - "@id": "#t0043", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Using reverse properties inside a @reverse-container", - "purpose": "Expanding a reverse property within a @reverse undoes both reversals", - "input": "expand-0043-in.jsonld", - "expect": "expand-0043-out.jsonld" - }, { - "@id": "#t0044", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Index maps with language mappings", - "purpose": "Ensure index maps use language mapping", - "input": "expand-0044-in.jsonld", - "expect": "expand-0044-out.jsonld" - }, { - "@id": "#t0045", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Top-level value objects", - "purpose": "Expanding top-level value objects causes them to be removed", - "input": "expand-0045-in.jsonld", - "expect": "expand-0045-out.jsonld" - }, { - "@id": "#t0046", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Free-floating nodes", - "purpose": "Expanding free-floating nodes causes them to be removed", - "input": "expand-0046-in.jsonld", - "expect": "expand-0046-out.jsonld" - }, { - "@id": "#t0047", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Free-floating values in sets and free-floating lists", - "purpose": "Free-floating values in sets are removed, free-floating lists are removed completely", - "input": "expand-0047-in.jsonld", - "expect": "expand-0047-out.jsonld" - }, { - "@id": "#t0048", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Terms are ignored in @id", - "purpose": "Values of @id are not expanded as terms", - "input": "expand-0048-in.jsonld", - "expect": "expand-0048-out.jsonld" - }, { - "@id": "#t0049", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "String values of reverse properties", - "purpose": "String values of a reverse property with @type: @id are treated as IRIs", - "input": "expand-0049-in.jsonld", - "expect": "expand-0049-out.jsonld" - }, { - "@id": "#t0050", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Term definitions with prefix separate from prefix definitions", - "purpose": "Term definitions using compact IRIs don't inherit the definitions of the prefix", - "input": "expand-0050-in.jsonld", - "expect": "expand-0050-out.jsonld" - }, { - "@id": "#t0051", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expansion of keyword aliases in term definitions", - "purpose": "Expanding terms which are keyword aliases", - "input": "expand-0051-in.jsonld", - "expect": "expand-0051-out.jsonld" - }, { - "@id": "#t0052", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@vocab-relative IRIs in term definitions", - "purpose": "If @vocab is defined, term definitions are expanded relative to @vocab", - "input": "expand-0052-in.jsonld", - "expect": "expand-0052-out.jsonld" - }, { - "@id": "#t0053", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expand absolute IRI with @type: @vocab", - "purpose": "Expanding values of properties of @type: @vocab does not further expand absolute IRIs", - "input": "expand-0053-in.jsonld", - "expect": "expand-0053-out.jsonld" - }, { - "@id": "#t0054", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expand term with @type: @vocab", - "purpose": "Expanding values of properties of @type: @vocab does not expand term values", - "input": "expand-0054-in.jsonld", - "expect": "expand-0054-out.jsonld" - }, { - "@id": "#t0055", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expand @vocab-relative term with @type: @vocab", - "purpose": "Expanding values of properties of @type: @vocab expands relative IRIs using @vocab", - "input": "expand-0055-in.jsonld", - "expect": "expand-0055-out.jsonld" - }, { - "@id": "#t0056", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Use terms with @type: @vocab but not with @type: @id", - "purpose": "Checks that expansion uses appropriate base depending on term definition having @type @id or @vocab", - "input": "expand-0056-in.jsonld", - "expect": "expand-0056-out.jsonld" - }, { - "@id": "#t0057", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expand relative IRI with @type: @vocab", - "purpose": "Relative values of terms with @type: @vocab expand relative to @vocab", - "input": "expand-0057-in.jsonld", - "expect": "expand-0057-out.jsonld" - }, { - "@id": "#t0058", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Expand compact IRI with @type: @vocab", - "purpose": "Compact IRIs are expanded normally even if term has @type: @vocab", - "input": "expand-0058-in.jsonld", - "expect": "expand-0058-out.jsonld" - }, { - "@id": "#t0059", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Reset @vocab by setting it to null", - "purpose": "Setting @vocab to null removes a previous definition", - "input": "expand-0059-in.jsonld", - "expect": "expand-0059-out.jsonld" - }, { - "@id": "#t0060", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Overwrite document base with @base and reset it again", - "purpose": "Setting @base to an IRI and then resetting it to nil", - "input": "expand-0060-in.jsonld", - "expect": "expand-0060-out.jsonld" - }, { - "@id": "#t0061", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Coercing native types to arbitrary datatypes", - "purpose": "Expanding native types when coercing to arbitrary datatypes", - "input": "expand-0061-in.jsonld", - "expect": "expand-0061-out.jsonld" - }, { - "@id": "#t0062", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Various relative IRIs with with @base", - "purpose": "Pathological relative IRIs", - "input": "expand-0062-in.jsonld", - "expect": "expand-0062-out.jsonld" - }, { - "@id": "#t0063", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Reverse property and index container", - "purpose": "Expaning reverse properties with an index-container", - "input": "expand-0063-in.jsonld", - "expect": "expand-0063-out.jsonld" - }, { - "@id": "#t0064", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "bnode values of reverse properties", - "purpose": "Expand reverse property whose values are unlabeled blank nodes", - "input": "expand-0064-in.jsonld", - "expect": "expand-0064-out.jsonld" - }, { - "@id": "#t0065", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Drop unmapped keys in reverse map", - "purpose": "Keys that are not mapped to an IRI in a reverse-map are dropped", - "input": "expand-0065-in.jsonld", - "expect": "expand-0065-out.jsonld" - }, { - "@id": "#t0066", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Reverse-map keys with @vocab", - "purpose": "Expand uses @vocab to expand keys in reverse-maps", - "input": "expand-0066-in.jsonld", - "expect": "expand-0066-out.jsonld" - }, { - "@id": "#t0067", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "prefix://suffix not a compact IRI", - "purpose": "prefix:suffix values are not interpreted as compact IRIs if suffix begins with two slashes", - "input": "expand-0067-in.jsonld", - "expect": "expand-0067-out.jsonld" - }, { - "@id": "#t0068", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "_:suffix values are not a compact IRI", - "purpose": "prefix:suffix values are not interpreted as compact IRIs if prefix is an underscore", - "input": "expand-0068-in.jsonld", - "expect": "expand-0068-out.jsonld" - }, { - "@id": "#t0069", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Compact IRI as term with type mapping", - "purpose": "Redefine compact IRI to define type mapping using the compact IRI itself as value of @id", - "input": "expand-0069-in.jsonld", - "expect": "expand-0069-out.jsonld" - }, { - "@id": "#t0070", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Compact IRI as term defined using equivalent compact IRI", - "purpose": "Redefine compact IRI to define type mapping using the compact IRI itself as string value", - "input": "expand-0070-in.jsonld", - "expect": "expand-0070-out.jsonld" - }, { - "@id": "#t0071", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Redefine terms looking like compact IRIs", - "purpose": "Term definitions may look like compact IRIs", - "input": "expand-0071-in.jsonld", - "expect": "expand-0071-out.jsonld" - }, { - "@id": "#t0072", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Redefine term using @vocab, not itself", - "purpose": "Redefining a term as itself when @vocab is defined uses @vocab, not previous term definition", - "input": "expand-0072-in.jsonld", - "expect": "expand-0072-out.jsonld" - }, { - "@id": "#t0073", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@context not first property", - "purpose": "Objects are unordered, so serialized node definition containing @context may have @context at the end of the node definition", - "input": "expand-0073-in.jsonld", - "expect": "expand-0073-out.jsonld" - }, { - "@id": "#t0074", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@id not first property", - "purpose": "Objects are unordered, so serialized node definition containing @id may have @id at the end of the node definition", - "input": "expand-0074-in.jsonld", - "expect": "expand-0074-out.jsonld" - }, { - "@id": "#t0075", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "@vocab as blank node identifier", - "purpose": "Use @vocab to map all properties to blank node identifiers", - "input": "expand-0075-in.jsonld", - "expect": "expand-0075-out.jsonld" - }, { - "@id": "#t0076", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "base option overrides document location", - "purpose": "Use of the base option overrides the document location", - "option": { - "base": "http://example/base/" - }, - "input": "expand-0076-in.jsonld", - "expect": "expand-0076-out.jsonld" - }, { - "@id": "#t0077", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "expandContext option", - "purpose": "Use of the expandContext option to expand the input document", - "option": { - "expandContext": "expand-0077-context.jsonld" - }, - "input": "expand-0077-in.jsonld", - "expect": "expand-0077-out.jsonld" - } - ] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld deleted file mode 100644 index e4598e55..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-in.jsonld +++ /dev/null @@ -1,18 +0,0 @@ -{ - "@context": { - "t1": "http://example.com/t1", - "t2": "http://example.com/t2", - "term1": "http://example.com/term1", - "term2": "http://example.com/term2", - "term3": "http://example.com/term3", - "term4": "http://example.com/term4", - "term5": "http://example.com/term5" - }, - "@id": "http://example.com/id1", - "@type": "t1", - "term1": "v1", - "term2": {"@value": "v2", "@type": "t2"}, - "term3": {"@value": "v3", "@language": "en"}, - "term4": 4, - "term5": [50, 51] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld deleted file mode 100644 index 6c72e2d5..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/flatten-0002-out.jsonld +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "@id": "http://example.com/id1", - "@type": [ - "http://example.com/t1" - ], - "http://example.com/term1": [ - { - "@value": "v1" - } - ], - "http://example.com/term2": [ - { - "@type": "http://example.com/t2", - "@value": "v2" - } - ], - "http://example.com/term3": [ - { - "@language": "en", - "@value": "v3" - } - ], - "http://example.com/term4": [ - { - "@value": 4 - } - ], - "http://example.com/term5": [ - { - "@value": 50 - }, - { - "@value": 51 - } - ] - } -] diff --git a/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld deleted file mode 100644 index cea88ae5..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/flatten-manifest.jsonld +++ /dev/null @@ -1,330 +0,0 @@ -{ - "@context": "http://json-ld.org/test-suite/context.jsonld", - "@id": "", - "@type": "mf:Manifest", - "name": "Flattening", - "description": "JSON-LD flattening tests use object comparison.", - "baseIri": "http://json-ld.org/test-suite/tests/", - "sequence": [ - { - "@id": "#t0001", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "drop free-floating nodes", - "purpose": "Flattening drops unreferenced nodes having only @id", - "input": "flatten-0001-in.jsonld", - "expect": "flatten-0001-out.jsonld" - }, { - "@id": "#t0002", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "basic", - "purpose": "Flattening terms with different types of values", - "input": "flatten-0002-in.jsonld", - "expect": "flatten-0002-out.jsonld" - }, { - "@id": "#t0003", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "drop null and unmapped properties", - "purpose": "Verifies that null values and unmapped properties are removed from expanded output", - "input": "flatten-0003-in.jsonld", - "expect": "flatten-0003-out.jsonld" - }, { - "@id": "#t0004", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "optimize @set, keep empty arrays", - "purpose": "Uses of @set are removed in expansion; values of @set, or just plain values which are empty arrays are retained", - "input": "flatten-0004-in.jsonld", - "expect": "flatten-0004-out.jsonld" - }, { - "@id": "#t0005", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "do not expand aliased @id/@type", - "purpose": "If a keyword is aliased, it is not used when flattening", - "input": "flatten-0005-in.jsonld", - "expect": "flatten-0005-out.jsonld" - }, { - "@id": "#t0006", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "alias keywords", - "purpose": "Aliased keywords expand in resulting document", - "input": "flatten-0006-in.jsonld", - "expect": "flatten-0006-out.jsonld" - }, { - "@id": "#t0007", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "date type-coercion", - "purpose": "Expand strings to expanded value with @type: xsd:dateTime", - "input": "flatten-0007-in.jsonld", - "expect": "flatten-0007-out.jsonld" - }, { - "@id": "#t0008", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "@value with @language", - "purpose": "Keep expanded values with @language, drop non-conforming value objects containing just @language", - "input": "flatten-0008-in.jsonld", - "expect": "flatten-0008-out.jsonld" - }, { - "@id": "#t0009", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "@graph with terms", - "purpose": "Use of @graph to contain multiple nodes within array", - "input": "flatten-0009-in.jsonld", - "expect": "flatten-0009-out.jsonld" - }, { - "@id": "#t0010", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "native types", - "purpose": "Flattening native scalar retains native scalar within expanded value", - "input": "flatten-0010-in.jsonld", - "expect": "flatten-0010-out.jsonld" - }, { - "@id": "#t0011", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "coerced @id", - "purpose": "A value of a property with @type: @id coercion expands to a node reference", - "input": "flatten-0011-in.jsonld", - "expect": "flatten-0011-out.jsonld" - }, { - "@id": "#t0012", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "@graph with embed", - "purpose": "Flattening objects containing chained objects flattens all objects", - "input": "flatten-0012-in.jsonld", - "expect": "flatten-0012-out.jsonld" - }, { - "@id": "#t0013", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "flatten already expanded", - "purpose": "Flattening an expanded/flattened document maintains input document", - "input": "flatten-0013-in.jsonld", - "expect": "flatten-0013-out.jsonld" - }, { - "@id": "#t0014", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "@set of @value objects with keyword aliases", - "purpose": "Flattening aliased @set and @value", - "input": "flatten-0014-in.jsonld", - "expect": "flatten-0014-out.jsonld" - }, { - "@id": "#t0015", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "collapse set of sets, keep empty lists", - "purpose": "An array of multiple @set nodes are collapsed into a single array", - "input": "flatten-0015-in.jsonld", - "expect": "flatten-0015-out.jsonld" - }, { - "@id": "#t0016", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "context reset", - "purpose": "Setting @context to null within an embedded object resets back to initial context state", - "input": "flatten-0016-in.jsonld", - "expect": "flatten-0016-out.jsonld" - }, { - "@id": "#t0017", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "@graph and @id aliased", - "purpose": "Flattening with @graph and @id aliases", - "input": "flatten-0017-in.jsonld", - "expect": "flatten-0017-out.jsonld" - }, { - "@id": "#t0018", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "override default @language", - "purpose": "override default @language in terms; only language-tag strings", - "input": "flatten-0018-in.jsonld", - "expect": "flatten-0018-out.jsonld" - }, { - "@id": "#t0019", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "remove @value = null", - "purpose": "Flattening a value of null removes the value", - "input": "flatten-0019-in.jsonld", - "expect": "flatten-0019-out.jsonld" - }, { - "@id": "#t0020", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "do not remove @graph if not at top-level", - "purpose": "@graph used under a node is retained", - "input": "flatten-0020-in.jsonld", - "expect": "flatten-0020-out.jsonld" - }, { - "@id": "#t0021", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "do not remove @graph at top-level if not only property", - "purpose": "@graph used at the top level is retained if there are other properties", - "input": "flatten-0021-in.jsonld", - "expect": "flatten-0021-out.jsonld" - }, { - "@id": "#t0022", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "flatten value with default language", - "purpose": "Flattening with a default language applies that language to string values", - "input": "flatten-0022-in.jsonld", - "expect": "flatten-0022-out.jsonld" - }, { - "@id": "#t0023", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Flattening list/set with coercion", - "purpose": "Flattening lists and sets with properties having coercion coerces list/set values", - "input": "flatten-0023-in.jsonld", - "expect": "flatten-0023-out.jsonld" - }, { - "@id": "#t0024", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Multiple contexts", - "purpose": "Tests that contexts in an array are merged", - "input": "flatten-0024-in.jsonld", - "expect": "flatten-0024-out.jsonld" - }, { - "@id": "#t0025", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Problematic IRI flattening tests", - "purpose": "Flattening different kinds of terms and Compact IRIs", - "input": "flatten-0025-in.jsonld", - "expect": "flatten-0025-out.jsonld" - }, { - "@id": "#t0026", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Term definition with @id: @type", - "purpose": "Flattening term mapping to @type uses @type syntax", - "input": "flatten-0026-in.jsonld", - "expect": "flatten-0026-out.jsonld" - }, { - "@id": "#t0027", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Duplicate values in @list and @set", - "purpose": "Duplicate values in @list and @set are not merged", - "input": "flatten-0027-in.jsonld", - "expect": "flatten-0027-out.jsonld" - }, { - "@id": "#t0028", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Use @vocab in properties and @type but not in @id", - "purpose": "@vocab is used to compact properties and @type, but is not used for @id", - "input": "flatten-0028-in.jsonld", - "expect": "flatten-0028-out.jsonld" - }, { - "@id": "#t0029", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Relative IRIs", - "purpose": "@base is used to compact @id; test with different relative IRIs", - "input": "flatten-0029-in.jsonld", - "expect": "flatten-0029-out.jsonld" - }, { - "@id": "#t0030", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Language maps", - "purpose": "Language Maps expand values to include @language", - "input": "flatten-0030-in.jsonld", - "expect": "flatten-0030-out.jsonld" - }, { - "@id": "#t0031", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "type-coercion of native types", - "purpose": "Flattening native types with type coercion adds the coerced type to an expanded value representation and retains the native value representation", - "input": "flatten-0031-in.jsonld", - "expect": "flatten-0031-out.jsonld" - }, { - "@id": "#t0032", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Null term and @vocab", - "purpose": "Mapping a term to null decouples it from @vocab", - "input": "flatten-0032-in.jsonld", - "expect": "flatten-0032-out.jsonld" - }, { - "@id": "#t0033", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Using @vocab with with type-coercion", - "purpose": "Verifies that terms can be defined using @vocab", - "input": "flatten-0033-in.jsonld", - "expect": "flatten-0033-out.jsonld" - }, { - "@id": "#t0034", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Multiple properties expanding to the same IRI", - "purpose": "Verifies multiple values from separate terms are deterministically made multiple values of the IRI associated with the terms", - "input": "flatten-0034-in.jsonld", - "expect": "flatten-0034-out.jsonld" - }, { - "@id": "#t0035", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Language maps with @vocab, default language, and colliding property", - "purpose": "Pathological tests of language maps", - "input": "flatten-0035-in.jsonld", - "expect": "flatten-0035-out.jsonld" - }, { - "@id": "#t0036", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Flattening @index", - "purpose": "Flattening index maps for terms defined with @container: @index", - "input": "flatten-0036-in.jsonld", - "expect": "flatten-0036-out.jsonld" - }, { - "@id": "#t0037", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Flattening reverse properties", - "purpose": "Flattening @reverse keeps @reverse", - "input": "flatten-0037-in.jsonld", - "expect": "flatten-0037-out.jsonld" - }, { - "@id": "#t0038", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Flattening blank node labels", - "purpose": "Blank nodes are not relabeled during expansion", - "input": "flatten-0038-in.jsonld", - "expect": "flatten-0038-out.jsonld" - }, { - "@id": "#t0039", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Using terms in a reverse-maps", - "purpose": "Terms within @reverse are expanded", - "input": "flatten-0039-in.jsonld", - "expect": "flatten-0039-out.jsonld" - }, { - "@id": "#t0040", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "language and index expansion on non-objects", - "purpose": "Only invoke language and index map expansion if the value is a JSON object", - "input": "flatten-0040-in.jsonld", - "expect": "flatten-0040-out.jsonld" - }, { - "@id": "#t0041", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Free-floating sets and lists", - "purpose": "Free-floating values in sets are removed, free-floating lists are removed completely", - "input": "flatten-0041-in.jsonld", - "expect": "flatten-0041-out.jsonld" - }, { - "@id": "#t0042", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "List objects not equivalent", - "purpose": "Lists objects are implicit unlabeled blank nodes and thus never equivalent", - "input": "flatten-0042-in.jsonld", - "expect": "flatten-0042-out.jsonld" - }, { - "@id": "#t0043", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Sample test manifest extract", - "purpose": "Flatten a test manifest", - "input": "flatten-0043-in.jsonld", - "expect": "flatten-0043-out.jsonld" - }, { - "@id": "#t0044", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "compactArrays option", - "purpose": "Setting compactArrays to false causes single element arrays to be retained", - "option": { - "compactArrays": false - }, - "input": "flatten-0044-in.jsonld", - "context": "flatten-0044-context.jsonld", - "expect": "flatten-0044-out.jsonld" - }, { - "@id": "#t0045", - "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"], - "name": "Blank nodes with reverse properties", - "purpose": "Proper (re-)labeling of blank nodes if used with reverse properties.", - "input": "flatten-0045-in.jsonld", - "expect": "flatten-0045-out.jsonld" - } - ] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld deleted file mode 100644 index ba0b5b1b..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/frame-0002-in.jsonld +++ /dev/null @@ -1,28 +0,0 @@ -{ - "@context": { - "dc": "http://purl.org/dc/elements/1.1/", - "ex": "http://example.org/vocab#", - "ex:contains": {"@type": "@id"} - }, - "@graph": [ - { - "@id": "http://example.org/test/#library", - "@type": "ex:Library", - "ex:contains": "http://example.org/test#book" - }, - { - "@id": "http://example.org/test#book", - "@type": "ex:Book", - "dc:contributor": "Writer", - "dc:title": "My Book", - "ex:contains": "http://example.org/test#chapter" - }, - { - "@id": "http://example.org/test#chapter", - "@type": "ex:Chapter", - "dc:description": "Fun", - "dc:title": "Chapter One", - "ex:act": "ex:ActOne" - } - ] -} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld deleted file mode 100644 index db497ada..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/frame-0002-out.jsonld +++ /dev/null @@ -1,23 +0,0 @@ -{ - "@context": { - "dc": "http://purl.org/dc/elements/1.1/", - "ex": "http://example.org/vocab#" - }, - "@graph": [{ - "@id": "http://example.org/test/#library", - "@type": "ex:Library", - "ex:contains": { - "@id": "http://example.org/test#book", - "@type": "ex:Book", - "dc:contributor": "Writer", - "dc:title": "My Book", - "ex:contains": { - "@id": "http://example.org/test#chapter", - "@type": "ex:Chapter", - "dc:description": "Fun", - "dc:title": "Chapter One", - "ex:act": "ex:ActOne" - } - } - }] -} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld deleted file mode 100644 index 89933feb..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/fromRdf-context.jsonld +++ /dev/null @@ -1,11 +0,0 @@ -{ - "@context": { - "object1": { "@id": "http://example.org/object/1" }, - "object2": { "@id": "http://example.org/object/2" }, - "object3": { "@id": "http://example.org/object/3" }, - "value": { - "@id": "http://example.org/value", - "@value": "@id" - } - } -} diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld index 8478617d..2718fa26 100644 --- a/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld +++ b/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld @@ -1,8 +1,7 @@ { "@type": "mf:Manifest", - "test-context": "fromRdf-context.jsonld", "name": "From RDF", - "description": "JSON-LD sorting graphs and nodes when running compact", + "description": "JSON-LD sorting graphs and nodes when running FromRDF", "input": "fromRdf-in.json", "sequence": [ { diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld deleted file mode 100644 index bdcb83cd..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-in.jsonld +++ /dev/null @@ -1,14 +0,0 @@ -{ - "@context": { - "ex": "http://example.org/vocab#" - }, - "@id": "http://example.org/test#example1", - "ex:p": [ - { - "@id": "http://example.org/test#example2" - }, - { - "@id": "http://example.org/test#example2" - } - ] -} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq b/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq deleted file mode 100644 index 529056c8..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/normalize-0002-out.nq +++ /dev/null @@ -1 +0,0 @@ - . diff --git a/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld deleted file mode 100644 index d4dcc360..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/normalize-manifest.jsonld +++ /dev/null @@ -1,353 +0,0 @@ -{ - "@context": "http://json-ld.org/test-suite/context.jsonld", - "@id": "", - "@type": "mf:Manifest", - "name": "Normalization", - "description": "JSON-LD to normalized RDF tests output N-Quads and use string comparison.", - "baseIri": "http://json-ld.org/test-suite/tests/", - "sequence": [ - { - "@id": "#t0001", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "simple id", - "input": "normalize-0001-in.jsonld", - "expect": "normalize-0001-out.nq" - }, { - "@id": "#t0002", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "duplicate property iri values", - "input": "normalize-0002-in.jsonld", - "expect": "normalize-0002-out.nq" - }, { - "@id": "#t0003", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "bnode", - "input": "normalize-0003-in.jsonld", - "expect": "normalize-0003-out.nq" - }, { - "@id": "#t0004", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "bnode plus embed w/subject", - "input": "normalize-0004-in.jsonld", - "expect": "normalize-0004-out.nq" - }, { - "@id": "#t0005", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "bnode embed", - "input": "normalize-0005-in.jsonld", - "expect": "normalize-0005-out.nq" - }, { - "@id": "#t0006", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "multiple rdf types", - "input": "normalize-0006-in.jsonld", - "expect": "normalize-0006-out.nq" - }, { - "@id": "#t0007", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "coerce CURIE value", - "input": "normalize-0007-in.jsonld", - "expect": "normalize-0007-out.nq" - }, { - "@id": "#t0008", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "single subject complex", - "input": "normalize-0008-in.jsonld", - "expect": "normalize-0008-out.nq" - }, { - "@id": "#t0009", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "multiple subjects - complex", - "input": "normalize-0009-in.jsonld", - "expect": "normalize-0009-out.nq" - }, { - "@id": "#t0010", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "type", - "input": "normalize-0010-in.jsonld", - "expect": "normalize-0010-out.nq" - }, { - "@id": "#t0011", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "type-coerced type", - "input": "normalize-0011-in.jsonld", - "expect": "normalize-0011-out.nq" - }, { - "@id": "#t0012", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "type-coerced type, remove duplicate reference", - "input": "normalize-0012-in.jsonld", - "expect": "normalize-0012-out.nq" - }, { - "@id": "#t0013", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "type-coerced type, cycle", - "input": "normalize-0013-in.jsonld", - "expect": "normalize-0013-out.nq" - }, { - "@id": "#t0014", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "check types", - "input": "normalize-0014-in.jsonld", - "expect": "normalize-0014-out.nq" - }, { - "@id": "#t0015", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "top level context", - "input": "normalize-0015-in.jsonld", - "expect": "normalize-0015-out.nq" - }, { - "@id": "#t0016", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - dual link - embed", - "input": "normalize-0016-in.jsonld", - "expect": "normalize-0016-out.nq" - }, { - "@id": "#t0017", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - dual link - non-embed", - "input": "normalize-0017-in.jsonld", - "expect": "normalize-0017-out.nq" - }, { - "@id": "#t0018", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - self link", - "input": "normalize-0018-in.jsonld", - "expect": "normalize-0018-out.nq" - }, { - "@id": "#t0019", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - disjoint self links", - "input": "normalize-0019-in.jsonld", - "expect": "normalize-0019-out.nq" - }, { - "@id": "#t0020", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - diamond", - "input": "normalize-0020-in.jsonld", - "expect": "normalize-0020-out.nq" - }, { - "@id": "#t0021", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - circle of 2", - "input": "normalize-0021-in.jsonld", - "expect": "normalize-0021-out.nq" - }, { - "@id": "#t0022", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 2", - "input": "normalize-0022-in.jsonld", - "expect": "normalize-0022-out.nq" - }, { - "@id": "#t0023", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - circle of 3", - "input": "normalize-0023-in.jsonld", - "expect": "normalize-0023-out.nq" - }, { - "@id": "#t0024", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (1-2-3)", - "input": "normalize-0024-in.jsonld", - "expect": "normalize-0024-out.nq" - }, { - "@id": "#t0025", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (1-3-2)", - "input": "normalize-0025-in.jsonld", - "expect": "normalize-0025-out.nq" - }, { - "@id": "#t0026", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (2-1-3)", - "input": "normalize-0026-in.jsonld", - "expect": "normalize-0026-out.nq" - }, { - "@id": "#t0027", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (2-3-1)", - "input": "normalize-0027-in.jsonld", - "expect": "normalize-0027-out.nq" - }, { - "@id": "#t0028", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (3-2-1)", - "input": "normalize-0028-in.jsonld", - "expect": "normalize-0028-out.nq" - }, { - "@id": "#t0029", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - double circle of 3 (3-1-2)", - "input": "normalize-0029-in.jsonld", - "expect": "normalize-0029-out.nq" - }, { - "@id": "#t0030", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "blank node - point at circle of 3", - "input": "normalize-0030-in.jsonld", - "expect": "normalize-0030-out.nq" - }, { - "@id": "#t0031", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "bnode (1)", - "input": "normalize-0031-in.jsonld", - "expect": "normalize-0031-out.nq" - }, { - "@id": "#t0032", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "bnode (2)", - "input": "normalize-0032-in.jsonld", - "expect": "normalize-0032-out.nq" - }, { - "@id": "#t0033", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "disjoint identical subgraphs (1)", - "input": "normalize-0033-in.jsonld", - "expect": "normalize-0033-out.nq" - }, { - "@id": "#t0034", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "disjoint identical subgraphs (2)", - "input": "normalize-0034-in.jsonld", - "expect": "normalize-0034-out.nq" - }, { - "@id": "#t0035", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered w/strings (1)", - "input": "normalize-0035-in.jsonld", - "expect": "normalize-0035-out.nq" - }, { - "@id": "#t0036", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered w/strings (2)", - "input": "normalize-0036-in.jsonld", - "expect": "normalize-0036-out.nq" - }, { - "@id": "#t0037", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered w/strings (3)", - "input": "normalize-0037-in.jsonld", - "expect": "normalize-0037-out.nq" - }, { - "@id": "#t0038", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered 4 bnodes, reordered 2 properties (1)", - "input": "normalize-0038-in.jsonld", - "expect": "normalize-0038-out.nq" - }, { - "@id": "#t0039", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered 4 bnodes, reordered 2 properties (2)", - "input": "normalize-0039-in.jsonld", - "expect": "normalize-0039-out.nq" - }, { - "@id": "#t0040", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered 6 bnodes (1)", - "input": "normalize-0040-in.jsonld", - "expect": "normalize-0040-out.nq" - }, { - "@id": "#t0041", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered 6 bnodes (2)", - "input": "normalize-0041-in.jsonld", - "expect": "normalize-0041-out.nq" - }, { - "@id": "#t0042", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "reordered 6 bnodes (3)", - "input": "normalize-0042-in.jsonld", - "expect": "normalize-0042-out.nq" - }, { - "@id": "#t0043", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "literal with language", - "input": "normalize-0043-in.jsonld", - "expect": "normalize-0043-out.nq" - }, { - "@id": "#t0044", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "evil (1)", - "input": "normalize-0044-in.jsonld", - "expect": "normalize-0044-out.nq" - }, { - "@id": "#t0045", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "evil (2)", - "input": "normalize-0045-in.jsonld", - "expect": "normalize-0045-out.nq" - }, { - "@id": "#t0046", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "evil (3)", - "input": "normalize-0046-in.jsonld", - "expect": "normalize-0046-out.nq" - }, { - "@id": "#t0047", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "deep diff (1)", - "input": "normalize-0047-in.jsonld", - "expect": "normalize-0047-out.nq" - }, { - "@id": "#t0048", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "deep diff (2)", - "input": "normalize-0048-in.jsonld", - "expect": "normalize-0048-out.nq" - }, { - "@id": "#t0049", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "remove null", - "input": "normalize-0049-in.jsonld", - "expect": "normalize-0049-out.nq" - }, { - "@id": "#t0050", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "nulls", - "input": "normalize-0050-in.jsonld", - "expect": "normalize-0050-out.nq" - }, { - "@id": "#t0051", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "merging subjects", - "input": "normalize-0051-in.jsonld", - "expect": "normalize-0051-out.nq" - }, { - "@id": "#t0052", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "alias keywords", - "input": "normalize-0052-in.jsonld", - "expect": "normalize-0052-out.nq" - }, { - "@id": "#t0053", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "@list", - "input": "normalize-0053-in.jsonld", - "expect": "normalize-0053-out.nq" - }, { - "@id": "#t0054", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "t-graph", - "input": "normalize-0054-in.jsonld", - "expect": "normalize-0054-out.nq" - }, { - "@id": "#t0055", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "simple reorder (1)", - "input": "normalize-0055-in.jsonld", - "expect": "normalize-0055-out.nq" - }, { - "@id": "#t0056", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "simple reorder (2)", - "input": "normalize-0056-in.jsonld", - "expect": "normalize-0056-out.nq" - }, { - "@id": "#t0057", - "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"], - "name": "unnamed graph", - "input": "normalize-0057-in.jsonld", - "expect": "normalize-0057-out.nq" - } - ] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json deleted file mode 100644 index 681f6787..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-in.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@context": { - "@vocab": "http://example/vocab#" - }, - "@id": "", - "term": "object" -} diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld b/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld deleted file mode 100644 index e4fc2882..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/remote-doc-0002-out.jsonld +++ /dev/null @@ -1,4 +0,0 @@ -[{ - "@id": "https://json-ld.org/test-suite/tests/remote-doc-0002-in.json", - "http://example/vocab#term": [{"@value": "object"}] -}] diff --git a/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld deleted file mode 100644 index e9d9b4aa..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/remote-doc-manifest.jsonld +++ /dev/null @@ -1,129 +0,0 @@ -{ - "@context": "http://json-ld.org/test-suite/context.jsonld", - "@id": "", - "@type": "mf:Manifest", - "description": "Tests appropriate document loading behavior as defined in the API", - "name": "Remote document", - "baseIri": "http://json-ld.org/test-suite/tests/", - "sequence": [ - { - "@id": "#t0001", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON-LD document", - "purpose": "Document loader loads a JSON-LD document.", - "input": "remote-doc-0001-in.jsonld", - "expect": "remote-doc-0001-out.jsonld" - }, { - "@id": "#t0002", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON document", - "purpose": "Document loader loads a JSON document.", - "input": "remote-doc-0002-in.json", - "expect": "remote-doc-0002-out.jsonld" - }, { - "@id": "#t0003", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON document with extension-type", - "purpose": "Document loader loads a JSON document having an extension mime-subtype.", - "option": { - "contentType": "application/jldTest+json" - }, - "input": "remote-doc-0003-in.jldt", - "expect": "remote-doc-0003-out.jsonld" - }, { - "@id": "#t0004", - "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], - "name": "loading an unknown type raises loading document failed", - "purpose": "Loading a document with a non-JSON mime type raises loading document failed", - "option": { - "contentType": "application/jldTest" - }, - "input": "remote-doc-0004-in.jldte", - "expect": "loading document failed" - }, { - "@id": "#t0005", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Load JSON-LD through 301 redirect", - "purpose": "Loading a document with a redirect should use the redirected URL as document base", - "option": { - "redirectTo": "remote-doc-0001-in.jsonld", - "httpStatus": 301 - }, - "input": "remote-doc-0005-in.jsonld", - "expect": "remote-doc-0001-out.jsonld" - }, { - "@id": "#t0006", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Load JSON-LD through 303 redirect", - "purpose": "Loading a document with a redirect should use the redirected URL as document base", - "option": { - "redirectTo": "remote-doc-0001-in.jsonld", - "httpStatus": 303 - }, - "input": "remote-doc-0006-in.jsonld", - "expect": "remote-doc-0001-out.jsonld" - }, { - "@id": "#t0007", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "Load JSON-LD through 307 redirect", - "purpose": "Loading a document with a redirect should use the redirected URL as document base", - "option": { - "redirectTo": "remote-doc-0001-in.jsonld", - "httpStatus": 307 - }, - "input": "remote-doc-0007-in.jsonld", - "expect": "remote-doc-0001-out.jsonld" - }, { - "@id": "#t0008", - "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], - "name": "Non-existant file (404)", - "purpose": "Loading a non-existant file raises loading document failed error", - "input": "remote-doc-0008-in.jsonld", - "expect": "loading document failed" - }, { - "@id": "#t0009", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON-LD document with link", - "purpose": "If a context is specified in a link header, it is not used for JSON-LD.", - "option": { - "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" - }, - "input": "remote-doc-0009-in.jsonld", - "expect": "remote-doc-0009-out.jsonld" - }, { - "@id": "#t0010", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON document with link", - "purpose": "If a context is specified in a link header, it is used for JSON.", - "option": { - "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" - }, - "input": "remote-doc-0010-in.json", - "expect": "remote-doc-0010-out.jsonld" - }, { - "@id": "#t0011", - "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"], - "name": "load JSON document with extension-type with link", - "purpose": "If a context is specified in a link header, it is used for a JSON extension type.", - "input": "remote-doc-0011-in.jldt", - "option": { - "contentType": "application/jldTest+json", - "httpLink": "; rel=\"http://www.w3.org/ns/json-ld#context\"" - }, - "expect": "remote-doc-0011-out.jsonld" - }, { - "@id": "#t0012", - "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"], - "name": "Multiple context link headers", - "purpose": "Loading a file when multiple link headers are returned is an error", - "option": { - "httpLink": [ - "; rel=\"http://www.w3.org/ns/json-ld#context\"", - "; rel=\"http://www.w3.org/ns/json-ld#context\"" - ] - }, - "input": "remote-doc-0012-in.json", - "expect": "multiple context link headers" - } - ] -} diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld deleted file mode 100644 index bd662d13..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-in.jsonld +++ /dev/null @@ -1,5 +0,0 @@ -{ - "@context": {"foaf": "http://xmlns.com/foaf/0.1/"}, - "@id": "http://greggkellogg.net/foaf#me", - "foaf:name": "Gregg Kellogg" -} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq b/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq deleted file mode 100644 index f7238bfc..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/toRdf-0002-out.nq +++ /dev/null @@ -1 +0,0 @@ - "Gregg Kellogg" . diff --git a/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld deleted file mode 100644 index 8abb3e57..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/toRdf-manifest.jsonld +++ /dev/null @@ -1,812 +0,0 @@ -{ - "@context": "http://json-ld.org/test-suite/context.jsonld", - "@id": "", - "@type": "mf:Manifest", - "name": "Transform JSON-LD to RDF", - "description": "JSON-LD to RDF tests generate N-Quads output and use string comparison.", - "baseIri": "http://json-ld.org/test-suite/tests/", - "sequence": [ - { - "@id": "#t0001", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Plain literal with URIs", - "purpose": "Tests generation of a triple using full URIs and a plain literal.", - "input": "toRdf-0001-in.jsonld", - "expect": "toRdf-0001-out.nq" - }, { - "@id": "#t0002", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Plain literal with CURIE from default context", - "purpose": "Tests generation of a triple using a CURIE defined in the default context.", - "input": "toRdf-0002-in.jsonld", - "expect": "toRdf-0002-out.nq" - }, { - "@id": "#t0003", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Default subject is BNode", - "purpose": "Tests that a BNode is created if no explicit subject is set.", - "input": "toRdf-0003-in.jsonld", - "expect": "toRdf-0003-out.nq" - }, { - "@id": "#t0004", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Literal with language tag", - "purpose": "Tests that a plain literal is created with a language tag.", - "input": "toRdf-0004-in.jsonld", - "expect": "toRdf-0004-out.nq" - }, { - "@id": "#t0005", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Extended character set literal", - "purpose": "Tests that a literal may be created using extended characters.", - "input": "toRdf-0005-in.jsonld", - "expect": "toRdf-0005-out.nq" - }, { - "@id": "#t0006", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Typed literal", - "purpose": "Tests creation of a literal with a datatype.", - "input": "toRdf-0006-in.jsonld", - "expect": "toRdf-0006-out.nq" - }, { - "@id": "#t0007", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Tests 'a' generates rdf:type and object is implicit IRI", - "purpose": "Verify that 'a' is an alias for rdf:type, and the object is created as an IRI.", - "input": "toRdf-0007-in.jsonld", - "expect": "toRdf-0007-out.nq" - }, { - "@id": "#t0008", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test prefix defined in @context", - "purpose": "Generate an IRI using a prefix defined within an @context.", - "input": "toRdf-0008-in.jsonld", - "expect": "toRdf-0008-out.nq" - }, { - "@id": "#t0009", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test using an empty suffix", - "purpose": "An empty suffix may be used.", - "input": "toRdf-0009-in.jsonld", - "expect": "toRdf-0009-out.nq" - }, { - "@id": "#t0010", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test object processing defines object", - "purpose": "A property referencing an associative array gets object from subject of array.", - "input": "toRdf-0010-in.jsonld", - "expect": "toRdf-0010-out.nq" - }, { - "@id": "#t0011", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test object processing defines object with implicit BNode", - "purpose": "If no @ is specified, a BNode is created, and will be used as the object of an enclosing property.", - "input": "toRdf-0011-in.jsonld", - "expect": "toRdf-0011-out.nq" - }, { - "@id": "#t0012", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Multiple Objects for a Single Property", - "purpose": "Tests that Multiple Objects are for a Single Property using array syntax.", - "input": "toRdf-0012-in.jsonld", - "expect": "toRdf-0012-out.nq" - }, { - "@id": "#t0013", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Creation of an empty list", - "purpose": "Tests that @list: [] generates an empty list.", - "input": "toRdf-0013-in.jsonld", - "expect": "toRdf-0013-out.nq" - }, { - "@id": "#t0014", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Creation of a list with single element", - "purpose": "Tests that @list generates a list.", - "input": "toRdf-0014-in.jsonld", - "expect": "toRdf-0014-out.nq" - }, { - "@id": "#t0015", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Creation of a list with multiple elements", - "purpose": "Tests that list with multiple elements.", - "input": "toRdf-0015-in.jsonld", - "expect": "toRdf-0015-out.nq" - }, { - "@id": "#t0016", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Empty IRI expands to resource location", - "purpose": "Expanding an empty IRI uses the test file location.", - "input": "toRdf-0016-in.jsonld", - "expect": "toRdf-0016-out.nq" - }, { - "@id": "#t0017", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Relative IRI expands relative resource location", - "purpose": "Expanding a relative IRI uses the test file location.", - "input": "toRdf-0017-in.jsonld", - "expect": "toRdf-0017-out.nq" - }, { - "@id": "#t0018", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Frag ID expands relative resource location", - "purpose": "Expanding a fragment uses the test file location.", - "input": "toRdf-0018-in.jsonld", - "expect": "toRdf-0018-out.nq" - }, { - "@id": "#t0019", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test type coercion to anyURI", - "purpose": "Tests coercion of object to anyURI when specified.", - "input": "toRdf-0019-in.jsonld", - "expect": "toRdf-0019-out.nq" - }, { - "@id": "#t0020", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test type coercion to typed literal", - "purpose": "Tests coercion of object to a typed literal when specified.", - "input": "toRdf-0020-in.jsonld", - "expect": "toRdf-0020-out.nq" - }, { - "@id": "#t0022", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test coercion of double value", - "purpose": "Tests that a decimal value generates a xsd:double typed literal;.", - "input": "toRdf-0022-in.jsonld", - "expect": "toRdf-0022-out.nq" - }, { - "@id": "#t0023", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test coercion of integer value", - "purpose": "Tests that a decimal value generates a xsd:integer typed literal.", - "input": "toRdf-0023-in.jsonld", - "expect": "toRdf-0023-out.nq" - }, { - "@id": "#t0024", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test coercion of boolean value", - "purpose": "Tests that a decimal value generates a xsd:boolean typed literal.", - "input": "toRdf-0024-in.jsonld", - "expect": "toRdf-0024-out.nq" - }, { - "@id": "#t0025", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test list coercion with single element", - "purpose": "Tests that an array with a single element on a property with @list coercion creates an RDF Collection.", - "input": "toRdf-0025-in.jsonld", - "expect": "toRdf-0025-out.nq" - }, { - "@id": "#t0026", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Test creation of multiple types", - "purpose": "Tests that @type with an array of types creates multiple types.", - "input": "toRdf-0026-in.jsonld", - "expect": "toRdf-0026-out.nq" - }, { - "@id": "#t0027", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Simple named graph (Wikidata)", - "purpose": "Using @graph with other keys places triples in a named graph.", - "input": "toRdf-0027-in.jsonld", - "expect": "toRdf-0027-out.nq" - }, { - "@id": "#t0028", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Simple named graph", - "purpose": "Signing a graph.", - "input": "toRdf-0028-in.jsonld", - "expect": "toRdf-0028-out.nq" - }, { - "@id": "#t0029", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "named graph with embedded named graph", - "purpose": "Tests that named graphs containing named graphs flatten to single level of graph naming.", - "input": "toRdf-0029-in.jsonld", - "expect": "toRdf-0029-out.nq" - }, { - "@id": "#t0030", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "top-level graph with string subject reference", - "purpose": "Tests graphs containing subject references as strings.", - "input": "toRdf-0030-in.jsonld", - "expect": "toRdf-0030-out.nq" - }, { - "@id": "#t0031", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Reverse property", - "purpose": "Tests conversion of reverse properties.", - "input": "toRdf-0031-in.jsonld", - "expect": "toRdf-0031-out.nq" - }, { - "@id": "#t0032", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@context reordering", - "purpose": "Tests that generated triples do not depend on order of @context.", - "input": "toRdf-0032-in.jsonld", - "expect": "toRdf-0032-out.nq" - }, { - "@id": "#t0033", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@id reordering", - "purpose": "Tests that generated triples do not depend on order of @id.", - "input": "toRdf-0033-in.jsonld", - "expect": "toRdf-0033-out.nq" - }, { - "@id": "#t0034", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "context properties reordering", - "purpose": "Tests that generated triples do not depend on order of properties inside @context.", - "input": "toRdf-0034-in.jsonld", - "expect": "toRdf-0034-out.nq" - }, { - "@id": "#t0035", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "non-fractional numbers converted to xsd:double", - "purpose": "xsd:double's canonical lexical is used when converting numbers without fraction that are coerced to xsd:double", - "input": "toRdf-0035-in.jsonld", - "expect": "toRdf-0035-out.nq" - }, { - "@id": "#t0036", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Use nodeMapGeneration bnode labels", - "purpose": "The toRDF algorithm does not relabel blank nodes; it reuses the counter from the nodeMapGeneration to generate new ones", - "input": "toRdf-0036-in.jsonld", - "expect": "toRdf-0036-out.nq" - }, { - "@id": "#t0041", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "drop free-floating nodes", - "purpose": "Free-floating nodes do not generate RDF triples", - "input": "toRdf-0041-in.jsonld", - "expect": "toRdf-0041-out.nq" - }, { - "@id": "#t0042", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "basic", - "purpose": "Basic RDF conversion", - "input": "toRdf-0042-in.jsonld", - "expect": "toRdf-0042-out.nq" - }, { - "@id": "#t0043", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "drop null and unmapped properties", - "purpose": "Properties mapped to null or which are never mapped are dropped", - "input": "toRdf-0043-in.jsonld", - "expect": "toRdf-0043-out.nq" - }, { - "@id": "#t0044", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "optimize @set, keep empty arrays", - "purpose": "RDF version of expand-0004", - "input": "toRdf-0044-in.jsonld", - "expect": "toRdf-0044-out.nq" - }, { - "@id": "#t0045", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "do not expand aliased @id/@type", - "purpose": "RDF version of expand-0005", - "input": "toRdf-0045-in.jsonld", - "expect": "toRdf-0045-out.nq" - }, { - "@id": "#t0046", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "alias keywords", - "purpose": "RDF version of expand-0006", - "input": "toRdf-0046-in.jsonld", - "expect": "toRdf-0046-out.nq" - }, { - "@id": "#t0047", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "date type-coercion", - "purpose": "Type-coerced dates generate typed literals", - "input": "toRdf-0047-in.jsonld", - "expect": "toRdf-0047-out.nq" - }, { - "@id": "#t0048", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@value with @language", - "purpose": "RDF version of expand-0008", - "input": "toRdf-0048-in.jsonld", - "expect": "toRdf-0048-out.nq" - }, { - "@id": "#t0049", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@graph with terms", - "purpose": "RDF version of expand-0009", - "input": "toRdf-0049-in.jsonld", - "expect": "toRdf-0049-out.nq" - }, { - "@id": "#t0050", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "native types", - "purpose": "Native types generate typed literals", - "input": "toRdf-0050-in.jsonld", - "expect": "toRdf-0050-out.nq" - }, { - "@id": "#t0051", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "coerced @id", - "purpose": "RDF version of expand-0011", - "input": "toRdf-0051-in.jsonld", - "expect": "toRdf-0051-out.nq" - }, { - "@id": "#t0052", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@graph with embed", - "purpose": "RDF version of expand-0012", - "input": "toRdf-0052-in.jsonld", - "expect": "toRdf-0052-out.nq" - }, { - "@id": "#t0053", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "expand already expanded", - "purpose": "RDF version of expand-0013", - "input": "toRdf-0053-in.jsonld", - "expect": "toRdf-0053-out.nq" - }, { - "@id": "#t0054", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@set of @value objects with keyword aliases", - "purpose": "RDF version of expand-0014", - "input": "toRdf-0054-in.jsonld", - "expect": "toRdf-0054-out.nq" - }, { - "@id": "#t0055", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "collapse set of sets, keep empty lists", - "purpose": "RDF version of expand-0015", - "input": "toRdf-0055-in.jsonld", - "expect": "toRdf-0055-out.nq" - }, { - "@id": "#t0056", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "context reset", - "purpose": "RDF version of expand-0016", - "input": "toRdf-0056-in.jsonld", - "expect": "toRdf-0056-out.nq" - }, { - "@id": "#t0057", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@graph and @id aliased", - "purpose": "RDF version of expand-0017", - "input": "toRdf-0057-in.jsonld", - "expect": "toRdf-0057-out.nq" - }, { - "@id": "#t0058", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "override default @language", - "purpose": "RDF version of expand-0018", - "input": "toRdf-0058-in.jsonld", - "expect": "toRdf-0058-out.nq" - }, { - "@id": "#t0059", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "remove @value = null", - "purpose": "RDF version of expand-0019", - "input": "toRdf-0059-in.jsonld", - "expect": "toRdf-0059-out.nq" - }, { - "@id": "#t0060", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "do not remove @graph if not at top-level", - "purpose": "Embedded @graph without @id creates BNode-labeled named graph", - "input": "toRdf-0060-in.jsonld", - "expect": "toRdf-0060-out.nq" - }, { - "@id": "#t0061", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "do not remove @graph at top-level if not only property", - "purpose": "RDF version of expand-0021", - "input": "toRdf-0061-in.jsonld", - "expect": "toRdf-0061-out.nq" - }, { - "@id": "#t0062", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "expand value with default language", - "purpose": "RDF version of expand-0022", - "input": "toRdf-0062-in.jsonld", - "expect": "toRdf-0062-out.nq" - }, { - "@id": "#t0063", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Lists and sets of properties with list/set coercion", - "purpose": "RDF version of expand-0023", - "input": "toRdf-0063-in.jsonld", - "expect": "toRdf-0063-out.nq" - }, { - "@id": "#t0064", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Multiple contexts", - "purpose": "RDF version of expand-0024", - "input": "toRdf-0064-in.jsonld", - "expect": "toRdf-0064-out.nq" - }, { - "@id": "#t0065", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Problematic IRI expansion tests", - "purpose": "RDF version of expand-0025", - "input": "toRdf-0065-in.jsonld", - "expect": "toRdf-0065-out.nq" - }, { - "@id": "#t0066", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expanding term mapping to @type uses @type syntax", - "purpose": "RDF version of expand-0026", - "input": "toRdf-0066-in.jsonld", - "expect": "toRdf-0066-out.nq" - }, { - "@id": "#t0067", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Keep duplicate values in @list and @set", - "purpose": "RDF version of expand-0027", - "input": "toRdf-0067-in.jsonld", - "expect": "toRdf-0067-out.nq" - }, { - "@id": "#t0068", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Use @vocab in properties and @type but not in @id", - "purpose": "RDF version of expand-0028", - "input": "toRdf-0068-in.jsonld", - "expect": "toRdf-0068-out.nq" - }, { - "@id": "#t0069", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Relative IRIs", - "purpose": "RDF version of expand-0029", - "input": "toRdf-0069-in.jsonld", - "expect": "toRdf-0069-out.nq" - }, { - "@id": "#t0070", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Language maps", - "purpose": "RDF version of expand-0030", - "input": "toRdf-0070-in.jsonld", - "expect": "toRdf-0070-out.nq" - }, { - "@id": "#t0071", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "type-coercion of native types", - "purpose": "RDF version of expand-0031", - "input": "toRdf-0071-in.jsonld", - "expect": "toRdf-0071-out.nq" - }, { - "@id": "#t0072", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Mapping a term to null decouples it from @vocab", - "purpose": "RDF version of expand-0032", - "input": "toRdf-0072-in.jsonld", - "expect": "toRdf-0072-out.nq" - }, { - "@id": "#t0073", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Using @vocab with with type-coercion", - "purpose": "RDF version of expand-0033", - "input": "toRdf-0073-in.jsonld", - "expect": "toRdf-0073-out.nq" - }, { - "@id": "#t0074", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Multiple properties expanding to the same IRI", - "purpose": "RDF version of expand-0034", - "input": "toRdf-0074-in.jsonld", - "expect": "toRdf-0074-out.nq" - }, { - "@id": "#t0075", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Language maps with @vocab, default language, and colliding property", - "purpose": "RDF version of expand-0035", - "input": "toRdf-0075-in.jsonld", - "expect": "toRdf-0075-out.nq" - }, { - "@id": "#t0076", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expanding @index", - "purpose": "RDF version of expand-0036", - "input": "toRdf-0076-in.jsonld", - "expect": "toRdf-0076-out.nq" - }, { - "@id": "#t0077", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expanding @reverse", - "purpose": "RDF version of expand-0037", - "input": "toRdf-0077-in.jsonld", - "expect": "toRdf-0077-out.nq" - }, { - "@id": "#t0078", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Drop blank node predicates by default", - "purpose": "Triples with blank node predicates are dropped by default.", - "input": "toRdf-0078-in.jsonld", - "expect": "toRdf-0078-out.nq" - }, { - "@id": "#t0079", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Using terms in a reverse-maps", - "purpose": "RDF version of expand-0039", - "input": "toRdf-0079-in.jsonld", - "expect": "toRdf-0079-out.nq" - }, { - "@id": "#t0080", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "language and index expansion on non-objects", - "purpose": "RDF version of expand-0040", - "input": "toRdf-0080-in.jsonld", - "expect": "toRdf-0080-out.nq" - }, { - "@id": "#t0081", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Reset the default language", - "purpose": "RDF version of expand-0041", - "input": "toRdf-0081-in.jsonld", - "expect": "toRdf-0081-out.nq" - }, { - "@id": "#t0082", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expanding reverse properties", - "purpose": "RDF version of expand-0042", - "input": "toRdf-0082-in.jsonld", - "expect": "toRdf-0082-out.nq" - }, { - "@id": "#t0083", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Using reverse properties inside a @reverse-container", - "purpose": "RDF version of expand-0043", - "input": "toRdf-0083-in.jsonld", - "expect": "toRdf-0083-out.nq" - }, { - "@id": "#t0084", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Ensure index maps use language mapping", - "purpose": "RDF version of expand-0044", - "input": "toRdf-0084-in.jsonld", - "expect": "toRdf-0084-out.nq" - }, { - "@id": "#t0085", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Top-level value objects are removed", - "purpose": "RDF version of expand-0045", - "input": "toRdf-0085-in.jsonld", - "expect": "toRdf-0085-out.nq" - }, { - "@id": "#t0086", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Free-floating nodes are removed", - "purpose": "RDF version of expand-0046", - "input": "toRdf-0086-in.jsonld", - "expect": "toRdf-0086-out.nq" - }, { - "@id": "#t0087", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Remove free-floating set values and lists", - "purpose": "RDF version of expand-0047", - "input": "toRdf-0087-in.jsonld", - "expect": "toRdf-0087-out.nq" - }, { - "@id": "#t0088", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Terms are ignored in @id", - "purpose": "RDF version of expand-0048", - "input": "toRdf-0088-in.jsonld", - "expect": "toRdf-0088-out.nq" - }, { - "@id": "#t0089", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Using strings as value of a reverse property", - "purpose": "RDF version of expand-0049", - "input": "toRdf-0089-in.jsonld", - "expect": "toRdf-0089-out.nq" - }, { - "@id": "#t0090", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Term definitions with prefix separate from prefix definitions", - "purpose": "RDF version of expand-0050", - "input": "toRdf-0090-in.jsonld", - "expect": "toRdf-0090-out.nq" - }, { - "@id": "#t0091", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expansion of keyword aliases in term definitions", - "purpose": "RDF version of expand-0051", - "input": "toRdf-0091-in.jsonld", - "expect": "toRdf-0091-out.nq" - }, { - "@id": "#t0092", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "@vocab-relative IRIs in term definitions", - "purpose": "RDF version of expand-0052", - "input": "toRdf-0092-in.jsonld", - "expect": "toRdf-0092-out.nq" - }, { - "@id": "#t0093", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand absolute IRI with @type: @vocab", - "purpose": "RDF version of expand-0053", - "input": "toRdf-0093-in.jsonld", - "expect": "toRdf-0093-out.nq" - }, { - "@id": "#t0094", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand term with @type: @vocab", - "purpose": "RDF version of expand-0054", - "input": "toRdf-0094-in.jsonld", - "expect": "toRdf-0094-out.nq" - }, { - "@id": "#t0095", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand @vocab-relative term with @type: @vocab", - "purpose": "RDF version of expand-0055", - "input": "toRdf-0095-in.jsonld", - "expect": "toRdf-0095-out.nq" - }, { - "@id": "#t0096", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Use terms with @type: @vocab but not with @type: @id", - "purpose": "RDF version of expand-0056", - "input": "toRdf-0096-in.jsonld", - "expect": "toRdf-0096-out.nq" - }, { - "@id": "#t0097", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand relative IRI with @type: @vocab", - "purpose": "RDF version of expand-0057", - "input": "toRdf-0097-in.jsonld", - "expect": "toRdf-0097-out.nq" - }, { - "@id": "#t0098", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand compact IRI with @type: @vocab", - "purpose": "RDF version of expand-0058", - "input": "toRdf-0098-in.jsonld", - "expect": "toRdf-0098-out.nq" - }, { - "@id": "#t0099", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Reset @vocab by setting it to null", - "purpose": "RDF version of expand-0059", - "input": "toRdf-0099-in.jsonld", - "expect": "toRdf-0099-out.nq" - }, { - "@id": "#t0100", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Overwrite document base with @base and reset it again", - "purpose": "RDF version of expand-0060", - "input": "toRdf-0100-in.jsonld", - "expect": "toRdf-0100-out.nq" - }, { - "@id": "#t0101", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Coercing native types to arbitrary datatypes", - "purpose": "RDF version of expand-0061", - "input": "toRdf-0101-in.jsonld", - "expect": "toRdf-0101-out.nq" - }, { - "@id": "#t0102", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Various relative IRIs with with @base", - "purpose": "RDF version of expand-0062", - "input": "toRdf-0102-in.jsonld", - "expect": "toRdf-0102-out.nq" - }, { - "@id": "#t0103", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand a reverse property with an index-container", - "purpose": "RDF version of expand-0063", - "input": "toRdf-0103-in.jsonld", - "expect": "toRdf-0103-out.nq" - }, { - "@id": "#t0104", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Expand reverse property whose values are unlabeled blank nodes", - "purpose": "RDF version of expand-0064", - "input": "toRdf-0104-in.jsonld", - "expect": "toRdf-0104-out.nq" - }, { - "@id": "#t0105", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Keys that are not mapped to an IRI in a reverse-map are dropped", - "purpose": "RDF version of expand-0065", - "input": "toRdf-0105-in.jsonld", - "expect": "toRdf-0105-out.nq" - }, { - "@id": "#t0106", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Use @vocab to expand keys in reverse-maps", - "purpose": "RDF version of expand-0066", - "input": "toRdf-0106-in.jsonld", - "expect": "toRdf-0106-out.nq" - }, { - "@id": "#t0107", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "prefix:://sufffix not a compact IRI", - "purpose": "RDF version of expand-0067", - "input": "toRdf-0107-in.jsonld", - "expect": "toRdf-0107-out.nq" - }, { - "@id": "#t0108", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "_::sufffix not a compact IRI", - "purpose": "RDF version of expand-0068", - "input": "toRdf-0108-in.jsonld", - "expect": "toRdf-0108-out.nq" - }, { - "@id": "#t0109", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Compact IRI as term with type mapping", - "purpose": "RDF version of expand-0069", - "input": "toRdf-0109-in.jsonld", - "expect": "toRdf-0109-out.nq" - }, { - "@id": "#t0110", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Redefine compact IRI with itself", - "purpose": "RDF version of expand-0070", - "input": "toRdf-0110-in.jsonld", - "expect": "toRdf-0110-out.nq" - }, { - "@id": "#t0111", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Redefine terms looking like compact IRIs", - "purpose": "RDF version of expand-0071", - "input": "toRdf-0111-in.jsonld", - "expect": "toRdf-0111-out.nq" - }, { - "@id": "#t0112", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Redefine term using @vocab, not itself", - "purpose": "RDF version of expand-0072", - "input": "toRdf-0112-in.jsonld", - "expect": "toRdf-0112-out.nq" - }, { - "@id": "#t0113", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Dataset with a IRI named graph", - "purpose": "Basic use of creating a named graph using an IRI name", - "input": "toRdf-0113-in.jsonld", - "expect": "toRdf-0113-out.nq" - }, { - "@id": "#t0114", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Dataset with a IRI named graph", - "purpose": "Basic use of creating a named graph using a BNode name", - "input": "toRdf-0114-in.jsonld", - "expect": "toRdf-0114-out.nq" - }, { - "@id": "#t0115", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Dataset with a default and two named graphs", - "purpose": "Dataset with a default and two named graphs (IRI and BNode)", - "input": "toRdf-0115-in.jsonld", - "expect": "toRdf-0115-out.nq" - }, { - "@id": "#t0116", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Dataset from node with embedded named graph", - "purpose": "Embedding @graph in a node creates a named graph", - "input": "toRdf-0116-in.jsonld", - "expect": "toRdf-0116-out.nq" - }, { - "@id": "#t0117", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Dataset from node with embedded named graph (bnode)", - "purpose": "Embedding @graph in a node creates a named graph. Graph name is created if there is no subject", - "input": "toRdf-0117-in.jsonld", - "expect": "toRdf-0117-out.nq" - }, { - "@id": "#t0118", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "produce generalized RDF flag", - "purpose": "Triples with blank node predicates are not dropped if the produce generalized RDF flag is true.", - "option": { - "produceGeneralizedRdf": true - }, - "input": "toRdf-0118-in.jsonld", - "expect": "toRdf-0118-out.nq" - }, { - "@id": "#t0119", - "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"], - "name": "Blank nodes with reverse properties", - "purpose": "Proper (re-)labeling of blank nodes if used with reverse properties.", - "input": "toRdf-0119-in.jsonld", - "expect": "toRdf-0119-out.nq" - } - ] -} diff --git a/test/json-ld.net.tests/SortingTests.cs b/test/json-ld.net.tests/SortingTests.cs index 37cb0ba0..8b4ce88b 100644 --- a/test/json-ld.net.tests/SortingTests.cs +++ b/test/json-ld.net.tests/SortingTests.cs @@ -1,6 +1,5 @@ using JsonLD.Core; using JsonLD.Util; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -21,7 +20,7 @@ public void RunJsonLdProcessor(string id, SortingTestCase testCase) } else { - if (!JsonLdUtils.DeepCompare(result, testCase.output)) + if (!JsonLdUtils.DeepCompare(result, testCase.output, true)) { #if DEBUG Console.WriteLine(id); @@ -41,8 +40,8 @@ public void RunJsonLdProcessor(string id, SortingTestCase testCase) public class SortingTestCase { public JToken input { get; set; } - public JToken context { get; set; } public JToken output { get; set; } + public JToken context { get; set; } public JToken frame { get; set; } public JToken error { get; set; } public Func run { get; set; } @@ -51,13 +50,8 @@ public class SortingTestCase private static string[] GetManifests() { return new[] { - //"compact-manifest.jsonld" - //"expand-manifest.jsonld", - //"flatten-manifest.jsonld", - //"frame-manifest.jsonld", - //"toRdf-manifest.jsonld", "fromRdf-manifest.jsonld", - //"normalize-manifest.jsonld" + //"compact-manifest.jsonld" }; } @@ -73,12 +67,11 @@ public static IEnumerable SortingTestCases() foreach (JObject testcase in manifestJson["sequence"]) { - Func run; + Func run = null; SortingTestCase newCase = new SortingTestCase(); newCase.input = jsonFetcher.GetJson(manifestJson["input"], rootDirectory); newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory); - newCase.context = jsonFetcher.GetJson(manifestJson["test-context"], rootDirectory); var options = new JsonLdOptions(); @@ -86,60 +79,37 @@ public static IEnumerable SortingTestCases() if (sortType == "jld:GraphsAndNodes") { - options.SetSortGraphs(true); - options.SetSortGraphNodes(true); + options.SetSortGraphsFromRdf(true); + options.SetSortGraphNodesFromRdf(true); } else if (sortType == "jld:Graphs") { - options.SetSortGraphs(true); - options.SetSortGraphNodes(false); + options.SetSortGraphsFromRdf(true); + options.SetSortGraphNodesFromRdf(false); } else if (sortType == "jld:Nodes") { - options.SetSortGraphs(false); - options.SetSortGraphNodes(true); + options.SetSortGraphsFromRdf(false); + options.SetSortGraphNodesFromRdf(true); } else if (sortType == "jld:None") { - options.SetSortGraphs(false); - options.SetSortGraphNodes(false); + options.SetSortGraphsFromRdf(false); + options.SetSortGraphNodesFromRdf(false); } JsonLdApi jsonLdApi = new JsonLdApi(options); - Context activeCtx = new Context(newCase.context, options); var testType = (string)testcase["test-type"]; - //if (testType == "jld:Compact") + if (testType == "jld:Compact") { - // run = () => jsonLdApi.FromRDF(rdf); + newCase.context = jsonFetcher.GetJson(manifestJson["test-context"], rootDirectory); + Context activeCtx = new Context(newCase.context, options); + + run = () => jsonLdApi.Compact(activeCtx, null, newCase.input); } - //else if (testType == "jld:Expand") - //{ - // //run = () => JsonLdProcessor.Expand(newCase.input, options); - //} - //else if (testType == "jld:Flatten") - //{ - // //run = () => JsonLdProcessor.Flatten(newCase.input, newCase.context, options); - //} - //else if (testType == "jld:Frame") - //{ - // //run = () => JsonLdProcessor.Frame(newCase.input, newCase.frame, options); - //} - //else if (testType == "jld:Normalize") - //{ - // run = () => new JValue( - // RDFDatasetUtils.ToNQuads((RDFDataset)JsonLdProcessor.Normalize(newCase.input, options)).Replace("\n", "\r\n") - // ); - //} - //else if (testType == "jld:ToRDF") - //{ - // options.format = "application/nquads"; - // //run = () => new JValue( - // // ((string)JsonLdProcessor.ToRDF(newCase.input, options)).Replace("\n", "\r\n") - // //); - //} - //else if (testType == "jld:FromRDF") + else if (testType == "jld:FromRDF") { JToken quads = newCase.input["quads"]; RDFDataset rdf = new RDFDataset(); @@ -158,10 +128,10 @@ public static IEnumerable SortingTestCases() run = () => jsonLdApi.FromRDF(rdf); } - //else - //{ - // run = () => { throw new Exception("Couldn't find a test type, apparently."); }; - //} + else + { + run = () => { throw new Exception("Couldn't find a test type, apparently."); }; + } newCase.run = run; diff --git a/test/json-ld.net.tests/W3C/compact-0010-out.jsonld b/test/json-ld.net.tests/W3C/compact-0010-out.jsonld index 43b3d1d5..d082ddb0 100644 --- a/test/json-ld.net.tests/W3C/compact-0010-out.jsonld +++ b/test/json-ld.net.tests/W3C/compact-0010-out.jsonld @@ -1,20 +1,34 @@ { - "@context": { - "homepage": { - "@id": "http://xmlns.com/foaf/0.1/homepage", - "@type": "@id" + "@context": { + "homepage": { + "@id": "http://xmlns.com/foaf/0.1/homepage", + "@type": "@id" + }, + "name": "http://xmlns.com/foaf/0.1/name" }, - "name": "http://xmlns.com/foaf/0.1/name" - }, - "@graph": [ - { - "@id": "http://example.com/john", - "homepage": "http://john.doe.org/", - "name": "John Doe" - }, - { - "@id": "http://example.com/jane", - "name": "Jane Doe" - } - ] + "@graph": [ + { + "@id": "http://example.com/john", + "homepage": "http://john.doe.org/", + "name": "John Doe" + }, + { + "@id": "http://example.com/jane", + "name": "Jane Doe" + } + ] } + +[ + { + "@id": "http://example.com/john", + "http://xmlns.com/foaf/0.1/homepage": { + "@id": "http://john.doe.org/" + }, + "http://xmlns.com/foaf/0.1/name": "John Doe" + }, + { + "@id": "http://example.com/jane", + "http://xmlns.com/foaf/0.1/name": "Jane Doe" + } +] diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4f236a6f..5e5c1333 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -28,7 +28,13 @@ - + + PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -49,57 +55,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - \ No newline at end of file From af6061039ae9758c80964bde500cf13ed9df4c54 Mon Sep 17 00:00:00 2001 From: dnllowe Date: Sun, 16 Jun 2019 20:41:05 -0400 Subject: [PATCH 029/255] Removes line spaces that were added --- src/json-ld.net/Core/JsonLdApi.cs | 14 -------------- src/json-ld.net/Core/JsonLdProcessor.cs | 4 ---- src/json-ld.net/Core/NormalizeUtils.cs | 2 -- 3 files changed, 20 deletions(-) diff --git a/src/json-ld.net/Core/JsonLdApi.cs b/src/json-ld.net/Core/JsonLdApi.cs index ea373f4d..6672070a 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -122,9 +122,7 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e JObject result = new JObject(); // 7) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); - foreach (string expandedProperty in keys) { JToken expandedValue = elem[expandedProperty]; @@ -492,9 +490,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el JObject result = new JObject(); // 7) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); - foreach (string key in keys) { JToken value = elem[key]; @@ -811,9 +807,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el expandedValue = new JArray(); // 7.6.2) JArray indexKeys = new JArray(value.GetKeys()); - indexKeys.SortInPlace(); - foreach (string index in indexKeys) { JToken indexValue = ((JObject)value)[index]; @@ -1295,9 +1289,7 @@ private void GenerateNodeMap(JToken element, JObject nodeMap, } // 6.11) JArray keys = new JArray(element.GetKeys()); - keys.SortInPlace(); - foreach (string property_1 in keys) { var eachProperty_1 = property_1; @@ -1443,9 +1435,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes bool explicitOn = GetFrameFlag(frame, "@explicit", state.@explicit); // add matches to output JArray ids = new JArray(matches.GetKeys()); - ids.SortInPlace(); - foreach (string id in ids) { if (property == null) @@ -1508,9 +1498,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes // iterate over subject properties JObject element = (JObject)matches[id]; JArray props = new JArray(element.GetKeys()); - props.SortInPlace(); - foreach (string prop in props) { // copy keywords to output @@ -1587,9 +1575,7 @@ private void Frame(JsonLdApi.FramingContext state, JObject nodes } // handle defaults props = new JArray(frame.GetKeys()); - props.SortInPlace(); - foreach (string prop_1 in props) { // skip keywords diff --git a/src/json-ld.net/Core/JsonLdProcessor.cs b/src/json-ld.net/Core/JsonLdProcessor.cs index 22609555..b77acbb1 100644 --- a/src/json-ld.net/Core/JsonLdProcessor.cs +++ b/src/json-ld.net/Core/JsonLdProcessor.cs @@ -200,9 +200,7 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) entry["@graph"] = new JArray(); } JArray keys = new JArray(graph.GetKeys()); - keys.SortInPlace(); - foreach (string id in keys) { JObject node = (JObject)graph[id]; @@ -216,9 +214,7 @@ public static JToken Flatten(JToken input, JToken context, JsonLdOptions opts) JArray flattened = new JArray(); // 6) JArray keys_1 = new JArray(defaultGraph.GetKeys()); - keys_1.SortInPlace(); - foreach (string id_1 in keys_1) { JObject node = (JObject)defaultGraph[id_1 diff --git a/src/json-ld.net/Core/NormalizeUtils.cs b/src/json-ld.net/Core/NormalizeUtils.cs index 5e430295..82d3bc48 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -45,7 +45,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // done, name blank nodes bool named = false; IList hashes = new List(unique.Keys); - hashes.SortInPlace(); foreach (string hash in hashes) @@ -75,7 +74,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // names duplicate hash bnodes // enumerate duplicate hash groups in sorted order hashes = new List(duplicates.Keys); - hashes.SortInPlace(); // process each group From 47779110d78e5b26642374b215374604588b788e Mon Sep 17 00:00:00 2001 From: dnllowe Date: Sun, 16 Jun 2019 20:47:25 -0400 Subject: [PATCH 030/255] Updates to csproj version --- src/json-ld.net/Core/NormalizeUtils.cs | 4 ---- src/json-ld.net/json-ld.net.csproj | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/json-ld.net/Core/NormalizeUtils.cs b/src/json-ld.net/Core/NormalizeUtils.cs index 82d3bc48..bf746edc 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -46,7 +46,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) bool named = false; IList hashes = new List(unique.Keys); hashes.SortInPlace(); - foreach (string hash in hashes) { string bnode = unique[hash]; @@ -75,7 +74,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // enumerate duplicate hash groups in sorted order hashes = new List(duplicates.Keys); hashes.SortInPlace(); - // process each group for (int pgi = 0; ; pgi++) { @@ -113,7 +111,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) // sort normalized output normalized.SortInPlace(); - // handle output format if (options.format != null) { @@ -147,7 +144,6 @@ public virtual object HashBlankNodes(IEnumerable unnamed_) { // name bnodes in hash order results.SortInPlace(new _IComparer_145()); - foreach (NormalizeUtils.HashResult r in results) { // name all bnodes in path namer in diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 7d0875b9..6fbc0930 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -3,7 +3,7 @@ JSON-LD processor for .NET Implements the W3C JSON-LD 1.0 standard. - 1.0.7.1 + 1.0.7 NuGet;linked-data-dotnet netstandard1.3;netstandard2.0;netcoreapp2.1 json-ld.net @@ -17,7 +17,6 @@ Implements the W3C JSON-LD 1.0 standard. false false false - true From 4b310d516a28629990866c6c0306429c7e9714d0 Mon Sep 17 00:00:00 2001 From: Daniel Lowe Date: Sun, 16 Jun 2019 21:04:02 -0400 Subject: [PATCH 031/255] Rename test case --- test/json-ld.net.tests/SortingTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/SortingTests.cs b/test/json-ld.net.tests/SortingTests.cs index 8b4ce88b..1975263e 100644 --- a/test/json-ld.net.tests/SortingTests.cs +++ b/test/json-ld.net.tests/SortingTests.cs @@ -11,7 +11,7 @@ namespace JsonLD.Test public class SortingTests { [Theory, MemberData(nameof(SortingTestCases))] - public void RunJsonLdProcessor(string id, SortingTestCase testCase) + public void RunJsonLdApi(string id, SortingTestCase testCase) { JToken result = testCase.run(); if (testCase.error != null) From 5a5662fbe6b6ba1249645d339d5b1357a579fe2f Mon Sep 17 00:00:00 2001 From: dnllowe Date: Sun, 16 Jun 2019 21:06:43 -0400 Subject: [PATCH 032/255] Removes leftover test code --- .../W3C/compact-0010-out.jsonld | 48 +++++++------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/test/json-ld.net.tests/W3C/compact-0010-out.jsonld b/test/json-ld.net.tests/W3C/compact-0010-out.jsonld index d082ddb0..43b3d1d5 100644 --- a/test/json-ld.net.tests/W3C/compact-0010-out.jsonld +++ b/test/json-ld.net.tests/W3C/compact-0010-out.jsonld @@ -1,34 +1,20 @@ { - "@context": { - "homepage": { - "@id": "http://xmlns.com/foaf/0.1/homepage", - "@type": "@id" - }, - "name": "http://xmlns.com/foaf/0.1/name" + "@context": { + "homepage": { + "@id": "http://xmlns.com/foaf/0.1/homepage", + "@type": "@id" }, - "@graph": [ - { - "@id": "http://example.com/john", - "homepage": "http://john.doe.org/", - "name": "John Doe" - }, - { - "@id": "http://example.com/jane", - "name": "Jane Doe" - } - ] -} - -[ - { - "@id": "http://example.com/john", - "http://xmlns.com/foaf/0.1/homepage": { - "@id": "http://john.doe.org/" - }, - "http://xmlns.com/foaf/0.1/name": "John Doe" + "name": "http://xmlns.com/foaf/0.1/name" }, - { - "@id": "http://example.com/jane", - "http://xmlns.com/foaf/0.1/name": "Jane Doe" - } -] + "@graph": [ + { + "@id": "http://example.com/john", + "homepage": "http://john.doe.org/", + "name": "John Doe" + }, + { + "@id": "http://example.com/jane", + "name": "Jane Doe" + } + ] +} From 490eb33a9da7bdec249ac075c7b0481d379d79f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 4 May 2020 11:54:35 +0200 Subject: [PATCH 033/255] Configure stalebot Configure stalebot --- .github/stale.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000..cff40f55 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,18 @@ +# 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 +# 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 From b0462ad0e143888ef0430bbc9e4809513417da6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 4 May 2020 12:04:54 +0200 Subject: [PATCH 034/255] Replace Travis with GitHub Actions --- .github/workflows/dotnet.yml | 33 +++++++++++++++++++++++++++++++++ .travis.yml | 14 -------------- 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/dotnet.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 00000000..1ca89c87 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,33 @@ +name: dotnet + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.1.401 + + - name: Install dependencies + run: dotnet restore + + - name: Build + run: dotnet build --configuration Release --no-restore + + - name: Test + run: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" + + - name: Codecov + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + run: bash <(curl -s https://codecov.io/bash) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e175a37e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: csharp -mono: none -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - - DOTNET_CLI_TELEMETRY_OPTOUT=1 - - secure: LyfZri+LDXaez/OqC/JU+HMNQeDebmf+SYPZUOGDtWeYBWsYdpsIuhQj5PgfV5aNwSMeefxjFPk/27Cw8D7M7SDcIavBoZbP5fCBqGr9FQKRWkDizaKqP1Mnmu5bFCCr7+7jgTueFk2NZ60rj6vJsmmDtIrMoGF07RzqPySgfLM= -dotnet: 2.1.401 -install: -- dotnet restore -script: -- dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" -after_success: -- bash <(curl -s https://codecov.io/bash) From a21986082d1071744ccfb5382c76c9119b0d82d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 4 May 2020 12:12:38 +0200 Subject: [PATCH 035/255] Replace status badge --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8c7ace6f..df0f99cd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A [JSON-LD][jsonld] processor for .NET. [![NuGet][nuget-badge]][nuget] -[![Build Status][travis-badge]][travis] +![Build Status][gha-badge] [![codecov][codecov-badge]][codecov] This project has adopted the [Microsoft Open Source Code of Conduct][coc]. @@ -49,5 +49,4 @@ This project began life as a [Sharpen][sharpen]-based auto-port from [dnc-tutorial]: https://www.microsoft.com/net/core [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg - [travis]: https://travis-ci.org/linked-data-dotnet/json-ld.net - [travis-badge]: https://img.shields.io/travis/linked-data-dotnet/json-ld.net.svg + [gha-badge]: https://github.com/linked-data-dotnet/json-ld.net/workflows/dotnet/badge.svg From 4f2e48f4e975071ba055ca9e54e52710fe667f48 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 13:06:27 +0000 Subject: [PATCH 036/255] Bump xunit.runner.visualstudio from 2.3.1 to 2.4.1 Bumps [xunit.runner.visualstudio](https://github.com/xunit/xunit) from 2.3.1 to 2.4.1. - [Release notes](https://github.com/xunit/xunit/releases) - [Commits](https://github.com/xunit/xunit/compare/2.3.1...2.4.1) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index e743c9bb..20c5d04d 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 4589375684a9e42b93f5829e299fb89b2d526d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Mon, 4 May 2020 15:01:48 +0200 Subject: [PATCH 037/255] Add rebase workflow --- .github/workflows/rebase.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 00000000..1bbb4658 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,26 @@ +name: rebase + +on: + issue_comment: + types: [created] + +jobs: + rebase: + name: Rebase + if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + with: + fetch-depth: 0 + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.3 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # https://github.amrom.workers.devmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 + always_job: + name: Always run job + runs-on: ubuntu-latest + steps: + - name: Always run + run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped." From 397c669d7703be04420b257b5a5888657b035757 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 13:40:45 +0000 Subject: [PATCH 038/255] Bump System.Text.RegularExpressions from 4.1.0 to 4.3.1 Bumps System.Text.RegularExpressions from 4.1.0 to 4.3.1. Signed-off-by: dependabot-preview[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 611ba8ea..62c05260 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -34,6 +34,6 @@ Implements the W3C JSON-LD 1.0 standard. - + \ No newline at end of file From 137d1941d78e88507c1df4c2eb2a6181075aa500 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 13:44:54 +0000 Subject: [PATCH 039/255] Bump System.Dynamic.Runtime from 4.0.11 to 4.3.0 Bumps System.Dynamic.Runtime from 4.0.11 to 4.3.0. Signed-off-by: dependabot-preview[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 62c05260..20f2cde2 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -32,7 +32,7 @@ Implements the W3C JSON-LD 1.0 standard. $(DefineConstants);IS_CORECLR - + From 2518985cd7e5a2e70f737b9a697dbb70104f3aa0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 13:47:56 +0000 Subject: [PATCH 040/255] Bump coverlet.msbuild from 2.3.1 to 2.8.1 Bumps [coverlet.msbuild](https://github.com/tonerdo/coverlet) from 2.3.1 to 2.8.1. - [Release notes](https://github.com/tonerdo/coverlet/releases) - [Commits](https://github.com/tonerdo/coverlet/commits) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 20c5d04d..ce651500 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -20,7 +20,7 @@ - + From 1934d80628406da684441b576a96aa01f3ae3ea6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 08:19:33 +0000 Subject: [PATCH 041/255] Bump Microsoft.NET.Test.Sdk from 15.5.0 to 16.6.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 15.5.0 to 16.6.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v15.5.0...v16.6.1) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index ce651500..11287989 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From ced23f9a8fb6135e377ad4de44d77cc86a391abf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 12:28:51 +0000 Subject: [PATCH 042/255] Bump xunit from 2.3.1 to 2.4.1 Bumps [xunit](https://github.com/xunit/xunit) from 2.3.1 to 2.4.1. - [Release notes](https://github.com/xunit/xunit/releases) - [Commits](https://github.com/xunit/xunit/compare/2.3.1...2.4.1) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 11287989..15d039b7 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 6a33d6046773692c50f43eab24fc12e66f2ff629 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 12:32:08 +0000 Subject: [PATCH 043/255] Bump System.Security.Cryptography.Algorithms from 4.2.0 to 4.3.1 Bumps System.Security.Cryptography.Algorithms from 4.2.0 to 4.3.1. Signed-off-by: dependabot-preview[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 20f2cde2..1d4f881c 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -33,7 +33,7 @@ Implements the W3C JSON-LD 1.0 standard. - + \ No newline at end of file From e4956844f534098f8f94f0381ddfd4c33d23be0c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 08:41:12 +0000 Subject: [PATCH 044/255] Bump coverlet.msbuild from 2.8.1 to 2.9.0 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 2.8.1 to 2.9.0. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 15d039b7..cab162c8 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -20,7 +20,7 @@ - + From 69820b32a2fa5179ad596ea4e72cdf35d270904b Mon Sep 17 00:00:00 2001 From: "Daniel L. Lowe" Date: Mon, 1 Jun 2020 23:19:51 -0400 Subject: [PATCH 045/255] Updates test Moves to ExtendedFunctionalityTests Refactors to create room for more extended functionality tests --- .../Sorting}/fromRdf-in.json | 0 .../Sorting}/fromRdf-manifest.jsonld | 0 .../Sorting}/fromRdf-out-no-sorting.jsonld | 0 .../fromRdf-out-sort-graph-nodes.jsonld | 0 .../fromRdf-out-sort-graphs-and-nodes.jsonld | 0 .../Sorting}/fromRdf-out-sort-graphs.jsonld | 0 ...Tests.cs => ExtendedFunctionalityTests.cs} | 44 ++++----- .../Sorting/W3C/compact-context.jsonld | 4 - .../Sorting/W3C/compact-in.jsonld | 89 ------------------- .../Sorting/W3C/compact-manifest.jsonld | 41 --------- .../json-ld.net.tests.csproj | 21 ++--- 11 files changed, 28 insertions(+), 171 deletions(-) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-in.json (100%) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-manifest.jsonld (100%) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-out-no-sorting.jsonld (100%) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-out-sort-graph-nodes.jsonld (100%) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-out-sort-graphs-and-nodes.jsonld (100%) rename test/json-ld.net.tests/{Sorting/W3C => ExtendedFunctionality/Sorting}/fromRdf-out-sort-graphs.jsonld (100%) rename test/json-ld.net.tests/{SortingTests.cs => ExtendedFunctionalityTests.cs} (80%) delete mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld delete mode 100644 test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-in.json similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-in.json diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-manifest.jsonld similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-manifest.jsonld diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-no-sorting.jsonld similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-out-no-sorting.jsonld rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-no-sorting.jsonld diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graph-nodes.jsonld similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graph-nodes.jsonld rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graph-nodes.jsonld diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graphs-and-nodes.jsonld similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs-and-nodes.jsonld rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graphs-and-nodes.jsonld diff --git a/test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld b/test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graphs.jsonld similarity index 100% rename from test/json-ld.net.tests/Sorting/W3C/fromRdf-out-sort-graphs.jsonld rename to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-out-sort-graphs.jsonld diff --git a/test/json-ld.net.tests/SortingTests.cs b/test/json-ld.net.tests/ExtendedFunctionalityTests.cs similarity index 80% rename from test/json-ld.net.tests/SortingTests.cs rename to test/json-ld.net.tests/ExtendedFunctionalityTests.cs index 1975263e..41c18dd0 100644 --- a/test/json-ld.net.tests/SortingTests.cs +++ b/test/json-ld.net.tests/ExtendedFunctionalityTests.cs @@ -8,10 +8,12 @@ namespace JsonLD.Test { - public class SortingTests + public class ExtendedFunctionalityTests { - [Theory, MemberData(nameof(SortingTestCases))] - public void RunJsonLdApi(string id, SortingTestCase testCase) + public const string ManifestRoot = "ExtendedFunctionality"; + + [Theory, MemberData(nameof(ExtendedFunctionalityCases))] + public void ExtendedFunctionalityTestPasses(string id, ExtendedFunctionalityTestCase testCase) { JToken result = testCase.run(); if (testCase.error != null) @@ -37,7 +39,7 @@ public void RunJsonLdApi(string id, SortingTestCase testCase) } } - public class SortingTestCase + public class ExtendedFunctionalityTestCase { public JToken input { get; set; } public JToken output { get; set; } @@ -47,28 +49,33 @@ public class SortingTestCase public Func run { get; set; } } - private static string[] GetManifests() + public static IEnumerable ExtendedFunctionalityCases() { - return new[] { - "fromRdf-manifest.jsonld", - //"compact-manifest.jsonld" - }; + foreach (var testCase in SortingTestCases()) + { + yield return testCase; + } } + private static string[] SortingManifests = + { + "fromRdf-manifest.jsonld" + }; + public static IEnumerable SortingTestCases() { - var manifests = GetManifests(); var jsonFetcher = new JsonFetcher(); - var rootDirectory = Path.Combine("Sorting", "W3C"); - - foreach (string manifest in manifests) + var rootDirectory = Path.Combine(ManifestRoot, "Sorting"); + var cases = new List { }; + + foreach (string manifest in SortingManifests) { JToken manifestJson = jsonFetcher.GetJson(manifest, rootDirectory); foreach (JObject testcase in manifestJson["sequence"]) { Func run = null; - SortingTestCase newCase = new SortingTestCase(); + ExtendedFunctionalityTestCase newCase = new ExtendedFunctionalityTestCase(); newCase.input = jsonFetcher.GetJson(manifestJson["input"], rootDirectory); newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory); @@ -102,14 +109,7 @@ public static IEnumerable SortingTestCases() var testType = (string)testcase["test-type"]; - if (testType == "jld:Compact") - { - newCase.context = jsonFetcher.GetJson(manifestJson["test-context"], rootDirectory); - Context activeCtx = new Context(newCase.context, options); - - run = () => jsonLdApi.Compact(activeCtx, null, newCase.input); - } - else if (testType == "jld:FromRDF") + if (testType == "jld:FromRDF") { JToken quads = newCase.input["quads"]; RDFDataset rdf = new RDFDataset(); diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld deleted file mode 100644 index fab1a804..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/compact-context.jsonld +++ /dev/null @@ -1,4 +0,0 @@ -{ - "@context": { - } -} \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld deleted file mode 100644 index 5a11289c..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/compact-in.jsonld +++ /dev/null @@ -1,89 +0,0 @@ -[ - { - "@id": "http://example.org/node/3", - "@graph": [ - { - "@id": "http://example.org/object/3", - "http://example.org/value": [ - { - "@id": "n3-o3-value" - } - ] - }, - { - "@id": "http://example.org/object/1", - "http://example.org/value": [ - { - "@id": "n3-o1-value" - } - ] - }, - { - "@id": "http://example.org/object/2", - "http://example.org/value": [ - { - "@id": "n3-o2-value" - } - ] - } - ] - }, - { - "@id": "http://example.org/node/1", - "@graph": [ - { - "@id": "http://example.org/object/3", - "http://example.org/value": [ - { - "@id": "n1-o3-value" - } - ] - }, - { - "@id": "http://example.org/object/1", - "http://example.org/value": [ - { - "@id": "n1-o1-value" - } - ] - }, - { - "@id": "http://example.org/object/2", - "http://example.org/value": [ - { - "@id": "n1-o2-value" - } - ] - } - ] - }, - { - "@id": "http://example.org/node/2", - "@graph": [ - { - "@id": "http://example.org/object/3", - "http://example.org/value": [ - { - "@id": "n2-o3-value" - } - ] - }, - { - "@id": "http://example.org/object/1", - "http://example.org/value": [ - { - "@id": "n2-o1-value" - } - ] - }, - { - "@id": "http://example.org/object/2", - "http://example.org/value": [ - { - "@id": "n2-o2-value" - } - ] - } - ] - } -] \ No newline at end of file diff --git a/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld b/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld deleted file mode 100644 index bff774d4..00000000 --- a/test/json-ld.net.tests/Sorting/W3C/compact-manifest.jsonld +++ /dev/null @@ -1,41 +0,0 @@ -{ - "@type": "mf:Manifest", - "name": "Compaction", - "description": "JSON-LD sorting graphs and nodes when running Compact", - "test-context": "compact-context.jsonld", - "input": "compact-in.jsonld", - "sequence": [ - { - "@id": "#t0001", - "sort-type": "jld:GraphsAndNodes", - "test-type": "jld:Compact", - "name": "sort graphs and nodes", - "purpose": "graphs and nodes sorted when running Compact", - "expect": "compact-out-sort-graphs-and-nodes.jsonld" - }, - { - "@id": "#t0002", - "sort-type": "jld:Graphs", - "test-type": "jld:Compact", - "name": "sort graphs only", - "purpose": "graphs sorted when running Compact", - "expect": "compact-out-sort-graphs.jsonld" - }, - { - "@id": "#t0003", - "sort-type": "jld:Nodes", - "test-type": "jld:Compact", - "name": "sort graph nodes only", - "purpose": "graph nodes sorted when running Compact", - "expect": "compact-out-sort-graph-nodes.jsonld" - }, - { - "@id": "#t0004", - "sort-type": "jld:None", - "test-type": "jld:Compact", - "name": "sort nothing", - "purpose": "sort nothing running Compact", - "expect": "compact-out-no-sorting.jsonld" - } - ] -} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 7feb73e3..372434ce 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -28,31 +28,22 @@ - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + PreserveNewest From 0e35a8f1556d6303cbdb7bf5af5e1cf4f8c3ec3a Mon Sep 17 00:00:00 2001 From: "Daniel L. Lowe" Date: Mon, 1 Jun 2020 23:22:59 -0400 Subject: [PATCH 046/255] Some cleanup --- test/json-ld.net.tests/ExtendedFunctionalityTests.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/json-ld.net.tests/ExtendedFunctionalityTests.cs b/test/json-ld.net.tests/ExtendedFunctionalityTests.cs index 41c18dd0..f0c4f68e 100644 --- a/test/json-ld.net.tests/ExtendedFunctionalityTests.cs +++ b/test/json-ld.net.tests/ExtendedFunctionalityTests.cs @@ -10,7 +10,7 @@ namespace JsonLD.Test { public class ExtendedFunctionalityTests { - public const string ManifestRoot = "ExtendedFunctionality"; + private const string ManifestRoot = "ExtendedFunctionality"; [Theory, MemberData(nameof(ExtendedFunctionalityCases))] public void ExtendedFunctionalityTestPasses(string id, ExtendedFunctionalityTestCase testCase) @@ -62,11 +62,10 @@ public static IEnumerable ExtendedFunctionalityCases() "fromRdf-manifest.jsonld" }; - public static IEnumerable SortingTestCases() + private static IEnumerable SortingTestCases() { var jsonFetcher = new JsonFetcher(); var rootDirectory = Path.Combine(ManifestRoot, "Sorting"); - var cases = new List { }; foreach (string manifest in SortingManifests) { From 8bcf798d4d3ac52ba23150e958a609df4978f8b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2020 08:29:07 +0000 Subject: [PATCH 047/255] Bump xunit.runner.visualstudio from 2.4.1 to 2.4.2 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/commits/v2.4.2) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index cab162c8..d59bfc0b 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 00c05effbe2c4c22afbc25845958b84abb282fa7 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Sun, 5 Jul 2020 10:41:42 +0100 Subject: [PATCH 048/255] Updated README file --- README.md | 600 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 582 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index df0f99cd..751f7771 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,39 @@ # json-ld.net -A [JSON-LD][jsonld] processor for .NET. - [![NuGet][nuget-badge]][nuget] ![Build Status][gha-badge] [![codecov][codecov-badge]][codecov] -This project has adopted the [Microsoft Open Source Code of Conduct][coc]. -For more information see the [Code of Conduct FAQ][coc-faq] or contact -[opencode@microsoft.com][ms-mail] with any additional questions or comments. +## Introduction +This library is an implementation of the JSON-LD specification in C#. + +JSON, as specified in RFC7159, is a simple language for representing objects on the Web. Linked Data is a way of describing content across different documents or Web sites. Web resources are described using IRIs, and typically are dereferencable entities that may be used to find more information, creating a "Web of Knowledge". JSON-LD is intended to be a simple publishing method for expressing not only Linked Data in JSON, but for adding semantics to existing JSON. + +JSON-LD is designed as a light-weight syntax that can be used to express Linked Data. It is primarily intended to be a way to express Linked Data in JavaScript and other Web-based programming environments. It is also useful when building interoperable Web Services and when storing Linked Data in JSON-based document storage engines. It is practical and designed to be as simple as possible, utilizing the large number of JSON parsers and existing code that is in use today. It is designed to be able to express key-value pairs, RDF data, RDFa data, Microformats data, and Microdata. That is, it supports every major Web-based structured data model in use today. + +The syntax does not require many applications to change their JSON, but easily add meaning by adding context in a way that is either in-band or out-of-band. The syntax is designed to not disturb already deployed systems running on JSON, but provide a smooth migration path from JSON to JSON with added semantics. Finally, the format is intended to be fast to parse, fast to generate, stream-based and document-based processing compatible, and require a very small memory footprint in order to operate. + +You can read more about JSON-LD on the [JSON-LD website](jsonld). + +## Conformance + +This library aims to conform with the following: + +* [JSON-LD 1.0][JSON-LD 1.0], W3C Recommendation, 2014-01-16, and any [errata][errata] +* [JSON-LD 1.0 Processing Algorithms and API][JSON-LD 1.0 API], W3C Recommendation, 2014-01-16, and any [errata][errata] +* [JSON-LD 1.0 Framing][JSON-LD 1.0 Framing], Unofficial Draft, 2012-08-30 +* Working Group [test suite][WG test suite] + +The [JSON-LD Working Group][JSON-LD WG] is now developing JSON-LD 1.1. Library +updates to conform with newer specifications will happen as features stabilize +and development time and resources permit. + +* [JSON-LD 1.1][JSON-LD WG 1.1], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG latest] +* [JSON-LD 1.1 Processing Algorithms and API][JSON-LD WG 1.1 API], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG API latest] +* [JSON-LD 1.1 Framing][JSON-LD WG 1.1 Framing], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG Framing latest] + +The [test runner][] is often updated to note or skip newer tests that are not +yet supported. ## Supported frameworks @@ -16,14 +41,530 @@ For more information see the [Code of Conduct FAQ][coc-faq] or contact * .NET Standard 1.3 and 2.0 * Portable .NET 4.5, Windows 8 +## Installation + +### dotnet CLI + +```sh +dotnet new console +dotnet add package json-ld.net +``` + +```csharp +using JsonLD.Core; +using Newtonsoft.Json.Linq; +using System; + +namespace JsonLD.Demo +{ + internal class Program + { + private static void Main() + { + var json = "{'@context':{'test':'http://www.test.com/'},'test:hello':'world'}"; + var document = JObject.Parse(json); + var expanded = JsonLdProcessor.Expand(document); + Console.WriteLine(expanded); + } + } +} + +``` + +## Examples +-------- + +Example data and context used throughout examples below: + +#### doc.json +```json +{ + "@id": "http://example.org/ld-experts", + "http://schema.org/name": "LD Experts", + "http://schema.org/member": [{ + "@type": "http://schema.org/Person", + "http://schema.org/name": "Manu Sporny", + "http://schema.org/url": {"@id": "http://manu.sporny.org/"}, + "http://schema.org/image": {"@id": "http://manu.sporny.org/images/manu.png"} + }] +} +``` + +#### context.json +```json +{ + "name": "http://schema.org/name", + "member": "http://schema.org/member", + "homepage": {"@id": "http://schema.org/url", "@type": "@id"}, + "image": {"@id": "http://schema.org/image", "@type": "@id"}, + "Person": "http://schema.org/Person", + "@vocab": "http://example.org/", + "@base": "http://example.org/" +} +``` + + +### [compact](http://json-ld.org/spec/latest/json-ld/#compacted-document-form) + +```csharp +var doc = JObject.Parse(_docJson); +var context = JObject.Parse(_contextJson); +var opts = new JsonLdOptions(); +var compacted = JsonLdProcessor.Compact(doc, context, opts); +Console.WriteLine(compacted); + +/* + +Output: +{ + "@id": "ld-experts", + "member": { + "@type": "Person", + "image": "http://manu.sporny.org/images/manu.png", + "name": "Manu Sporny", + "homepage": "http://manu.sporny.org/" + }, + "name": "LD Experts", + "@context": . . . +} + +*/ +``` + + +### [expand](http://json-ld.org/spec/latest/json-ld/#expanded-document-form) + +```csharp +var expanded = JsonLdProcessor.Expand(compacted); +Console.WriteLine(expanded); + +/* + +Output: +[ + { + "@id": "http://test.com/ld-experts", + "http://schema.org/member": [ + { + "http://schema.org/url": [ + { + "@id": "http://manu.sporny.org/" + } + ], + "http://schema.org/image": [ + { + "@id": "http://manu.sporny.org/images/manu.png" + } + ], + "http://schema.org/name": [ + { + "@value": "Manu Sporny" + } + ] + } + ], + "http://schema.org/name": [ + { + "@value": "LD Experts" + } + ] + } +] + +*/ + + +*/ +``` + + +### [flatten](http://json-ld.org/spec/latest/json-ld/#flattened-document-form) + +```csharp +var doc = JObject.Parse(_docJson); +var context = JObject.Parse(_contextJson); +var opts = new JsonLdOptions(); +var flattened = JsonLdProcessor.Flatten(doc, context, opts); +Console.WriteLine(flattened); + +/* + +Output: +{ + "@context": . . ., + "@graph": [ + { + "@id": "_:b0", + "@type": "Person", + "image": "http://manu.sporny.org/images/manu.png", + "name": "Manu Sporny", + "homepage": "http://manu.sporny.org/" + }, + { + "@id": "ld-experts", + "member": { + "@id": "_:b0" + }, + "name": "LD Experts" + } + ] +} + +*/ + +``` + + +### [frame](http://json-ld.org/spec/latest/json-ld-framing/#introduction) + +For the framing example below, the framing document is defined as follows: + +```json +{ + "@context": { + "name": "http://schema.org/name", + "member": {"@id": "http://schema.org/member", "@type": "@id"}, + "homepage": {"@id": "http://schema.org/url", "@type": "@id"}, + "image": {"@id": "http://schema.org/image", "@type": "@id"}, + "Person": "http://schema.org/Person" + }, + "@type": "Person" +} +``` + +And we use it like this: +```csharp +var doc = JObject.Parse(_docJson); +var frame = JObject.Parse(_frameJson); +var opts = new JsonLdOptions(); +var flattened = JsonLdProcessor.Frame(doc, frame, opts); +Console.WriteLine(flattened); + +/* + +Output: +{ + "@context": . . ., + "@graph": [ + { + "@id": "_:b0", + "@type": "Person", + "image": "http://manu.sporny.org/images/manu.png", + "name": "Manu Sporny", + "homepage": "http://manu.sporny.org/" + } + ] +} + +*/ +``` + + +### [normalize](http://json-ld.github.io/normalization/spec/) (aka canonize) + +Normalized is a graph of objects that is a canonical representation of the document that can be used for hashing, comparison, etc. + +```csharp +var doc = JObject.Parse(_docJson); +var opts = new JsonLdOptions(); +var normalized = (RDFDataset)JsonLdProcessor.Normalize(doc, opts); +Console.WriteLine(normalized.Dump()); + +/* + +Output: +@default + subject + type blank node + value _:c14n0 + predicate + type IRI + value http://schema.org/image + object + type IRI + value http://manu.sporny.org/images/manu.png + --- + subject + type blank node + value _:c14n0 + predicate + type IRI + value http://schema.org/name + object + type literal + value Manu Sporny + datatype http://www.w3.org/2001/XMLSchema#string + --- + subject + type blank node + value _:c14n0 + predicate + type IRI + value http://schema.org/url + object + type IRI + value http://manu.sporny.org/ + --- + subject + type blank node + value _:c14n0 + predicate + type IRI + value http://www.w3.org/1999/02/22-rdf-syntax-ns#type + object + type IRI + value http://schema.org/Person + --- + subject + type IRI + value http://example.org/ld-experts + predicate + type IRI + value http://schema.org/member + object + type blank node + value _:c14n0 + --- + subject + type IRI + value http://example.org/ld-experts + predicate + type IRI + value http://schema.org/name + object + type literal + value LD Experts + datatype http://www.w3.org/2001/XMLSchema#string + --- + +*/ +``` + + +### ToRDF (N-Quads) + +```csharp +var doc = JObject.Parse(_docJson); +var opts = new JsonLdOptions(); +var rdf = (RDFDataset)JsonLdProcessor.ToRDF(doc, opts); + +var serialized = RDFDatasetUtils.ToNQuads(rdf); // serialize RDF to string +Console.WriteLine(serialized); + +/* + +Output: + _:b0 . + "LD Experts" . +_:b0 . +_:b0 "Manu Sporny" . +_:b0 . +_:b0 . + +*/ +``` + +_or_ using a custom RDF renderer object + +```csharp +private class JSONLDTripleCallback : IJSONLDTripleCallback +{ + public object Call(RDFDataset dataset) => + RDFDatasetUtils.ToNQuads(dataset); // serialize the RDF dataset as NQuads +} + +internal static void Run() +{ + var doc = JObject.Parse(_docJson); + var callback = new JSONLDTripleCallback(); + var serialized = JsonLdProcessor.ToRDF(doc, callback); + Console.WriteLine(serialized); + + /* + + Output: + _:b0 . + "LD Experts" . + _:b0 . + _:b0 "Manu Sporny" . + _:b0 . + _:b0 . + + */ +} +``` + +### fromRDF (N-Quads) + +```csharp +var opts = new JsonLdOptions(); +var jsonld = JsonLdProcessor.FromRDF(serialized, opts); +Console.WriteLine(jsonld); + +/* + +Output: +[ + { + "@id": "_:b0", + "http://schema.org/image": [ + { + "@id": "http://manu.sporny.org/images/manu.png" + } + ], + "http://schema.org/name": [ + { + "@value": "Manu Sporny" + } + ], + "http://schema.org/url": [ + { + "@id": "http://manu.sporny.org/" + } + ], + "@type": [ + "http://schema.org/Person" + ] + }, + { + "@id": "http://example.org/ld-experts", + "http://schema.org/member": [ + { + "@id": "_:b0" + } + ], + "http://schema.org/name": [ + { + "@value": "LD Experts" + } + ] + } +] +*/ +``` + +_or_ using a custom RDF parser + +```csharp +private class CustomRDFParser : IRDFParser +{ + public RDFDataset Parse(JToken input) + { + // by public decree, references to example.org are normalized to https going forward... + var converted = ((string)input).Replace("http://example.org/", "https://example.org/"); + return RDFDatasetUtils.ParseNQuads(converted); + } +} + +internal static void Run() +{ + var parser = new CustomRDFParser(); + var jsonld = JsonLdProcessor.FromRDF(_serialized, parser); + Console.WriteLine(jsonld); + + /* + + Output: + [ + { + "@id": "_:b0", + "http://schema.org/image": [ + { + "@id": "http://manu.sporny.org/images/manu.png" + } + ], + "http://schema.org/name": [ + { + "@value": "Manu Sporny" + } + ], + "http://schema.org/url": [ + { + "@id": "http://manu.sporny.org/" + } + ], + "@type": [ + "http://schema.org/Person" + ] + }, + { + "@id": "https://example.org/ld-experts", + "http://schema.org/member": [ + { + "@id": "_:b0" + } + ], + "http://schema.org/name": [ + { + "@value": "LD Experts" + } + ] + } + ] + */ +} +``` + + +### Custom documentLoader + +```csharp +public class CustomDocumentLoader : DocumentLoader +{ + private static readonly string _cachedExampleOrgContext = Res.ReadString("context.json"); + + public override RemoteDocument LoadDocument(string url) + { + if (url == "http://example.org/context.jsonld") // we have this cached locally + { + var doc = new JObject(new JProperty("@context", JObject.Parse(_cachedExampleOrgContext))); + return new RemoteDocument(url, doc); + } + else + { + return base.LoadDocument(url); + } + } +} + +public static void Run() +{ + var doc = JObject.Parse(_docJson); + var remoteContext = JObject.Parse("{'@context':'http://example.org/context.jsonld'}"); + var opts = new JsonLdOptions { documentLoader = new CustomDocumentLoader() }; + var compacted = JsonLdProcessor.Compact(doc, remoteContext, opts); + Console.WriteLine(compacted); + + /* + + Output: + { + "@id": "http://example.org/ld-experts", + "member": { + "@type": "Person", + "image": "http://manu.sporny.org/images/manu.png", + "name": "Manu Sporny", + "homepage": "http://manu.sporny.org/" + }, + "name": "LD Experts" + } + + */ +} +``` + + ## Contributing +This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact [opencode@microsoft.com][ms-mail] with any additional questions or comments. + Pull requests for json-ld.net are welcome, to get started install the latest tools for .NET Core: * [.NET Core][dnc] * [.NET Core tutorial][dnc-tutorial] + ### Build and Tests On Windows, you can execute `build.ps1`, which will create a nupkg and run @@ -32,21 +573,44 @@ tests for both .NET desktop and .NET Core. On both Windows and all other supported operating systems, you can run `dotnet build` to build and `dotnet test` to run the tests. + ## Origin This project began life as a [Sharpen][sharpen]-based auto-port from [jsonld-java][jsonld-java]. - [jsonld]: https://json-ld.org/ - [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html - [jsonld-java]: https://github.com/jsonld-java/jsonld-java - [nuget]: https://www.nuget.org/packages/json-ld.net/ - [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg - [coc]: https://opensource.microsoft.com/codeofconduct/ - [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ - [ms-mail]: mailto:opencode@microsoft.com - [dnc]: https://dot.net - [dnc-tutorial]: https://www.microsoft.com/net/core - [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net - [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg - [gha-badge]: https://github.com/linked-data-dotnet/json-ld.net/workflows/dotnet/badge.svg +Documentation for this library is in part drawn from https://github.com/linked-data-dotnet/json-ld.net + + [coc]: https://opensource.microsoft.com/codeofconduct/ + [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ + [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net + [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg + + [ms-mail]: mailto:opencode@microsoft.com + [dnc]: https://dot.net + [dnc-tutorial]: https://www.microsoft.com/net/core + + [gha-badge]: https://github.com/linked-data-dotnet/json-ld.net/workflows/dotnet/badge.svg + + [jsonld]: https://json-ld.org/ + [jsonld-java]: https://github.com/jsonld-java/jsonld-java + + [JSON-LD 1.0]: http://www.w3.org/TR/2014/REC-json-ld-20140116/ + [JSON-LD 1.0 API]: http://www.w3.org/TR/2014/REC-json-ld-api-20140116/ + [JSON-LD 1.0 Framing]: https://json-ld.org/spec/ED/json-ld-framing/20120830/ + + [JSON-LD WG 1.1]: https://www.w3.org/TR/json-ld11/ + [JSON-LD WG 1.1 API]: https://www.w3.org/TR/json-ld11-api/ + [JSON-LD WG 1.1 Framing]: https://www.w3.org/TR/json-ld11-framing/ + + [JSON-LD WG latest]: https://w3c.github.io/json-ld-syntax/ + [JSON-LD WG API latest]: https://w3c.github.io/json-ld-api/ + [JSON-LD WG Framing latest]: https://w3c.github.io/json-ld-framing/ + + [nuget]: https://www.nuget.org/packages/json-ld.net/ + [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg + + [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html + + [test runner]: https://github.com/linked-data-dotnet/json-ld.net/tree/master/test/json-ld.net.tests + [WG test suite]: https://github.com/w3c/json-ld-api/tree/master/tests From cea302b3e7f87b8a4f57ce2d2cd32f44e3df0d61 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 20:30:27 +0100 Subject: [PATCH 049/255] Added codeowners and contributors.md --- CODEOWNERS | 1 + contributors.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 CODEOWNERS create mode 100644 contributors.md diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000..903f3f58 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @asbjornu @goofballlogic diff --git a/contributors.md b/contributors.md new file mode 100644 index 00000000..9392a960 --- /dev/null +++ b/contributors.md @@ -0,0 +1,21 @@ +# Contributors and maintainers + +We maintain this list as a way to track who's currently involved in the project. +Please use PRs to this document to propose adding new maintainers / +contributors. + +[![Contributors](https://contributors-img.web.app/image?repo=linked-data-dotnet/json-ld.net)](https://github.com/linked-data-dotnet/json-ld.net/graphs/contributors) + +Made with [contributors-img](https://contributors-img.web.app). + +**N.B.** please propose names ordered alphabetically by username. + +## Admins + + - [Asbjørn Ulsberg](https://github.com/asbjornu ) + - [Andrew Stewart Gibson](https://github.com/goofballLogic) + +## Contributors + + - [Tomasz Pluskiewicz](https://github.com/tpluscode) + - [Ben Abelshausen](https://github.com/xivk) From e2e7c884b2102d4cb1af01eedb61738d3d8a3c34 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:47:54 +0100 Subject: [PATCH 050/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 751f7771..f34a99d2 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ namespace JsonLD.Demo Example data and context used throughout examples below: #### doc.json + ```json { "@id": "http://example.org/ld-experts", From 7b4dfe014aa5aa97044011dad699d75c07a85906 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:49:55 +0100 Subject: [PATCH 051/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f34a99d2..190b76e0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ JSON, as specified in RFC7159, is a simple language for representing objects on JSON-LD is designed as a light-weight syntax that can be used to express Linked Data. It is primarily intended to be a way to express Linked Data in JavaScript and other Web-based programming environments. It is also useful when building interoperable Web Services and when storing Linked Data in JSON-based document storage engines. It is practical and designed to be as simple as possible, utilizing the large number of JSON parsers and existing code that is in use today. It is designed to be able to express key-value pairs, RDF data, RDFa data, Microformats data, and Microdata. That is, it supports every major Web-based structured data model in use today. -The syntax does not require many applications to change their JSON, but easily add meaning by adding context in a way that is either in-band or out-of-band. The syntax is designed to not disturb already deployed systems running on JSON, but provide a smooth migration path from JSON to JSON with added semantics. Finally, the format is intended to be fast to parse, fast to generate, stream-based and document-based processing compatible, and require a very small memory footprint in order to operate. +The syntax does not require many applications to change their JSON, but easily add meaning by adding context in a way that is either in-band or out-of-band. The syntax is designed to not disturb already deployed systems running on JSON, but provide a smooth migration path from plain JSON to semantically enhanced JSON. Finally, the format is intended to be fast to parse, fast to generate, stream-based and document-based processing compatible, and require a very small memory footprint in order to operate. You can read more about JSON-LD on the [JSON-LD website](jsonld). From cafb911a24d6f303d4ebec6a0fa7d51362709220 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:50:05 +0100 Subject: [PATCH 052/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 190b76e0..f3248dd7 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ JSON-LD is designed as a light-weight syntax that can be used to express Linked The syntax does not require many applications to change their JSON, but easily add meaning by adding context in a way that is either in-band or out-of-band. The syntax is designed to not disturb already deployed systems running on JSON, but provide a smooth migration path from plain JSON to semantically enhanced JSON. Finally, the format is intended to be fast to parse, fast to generate, stream-based and document-based processing compatible, and require a very small memory footprint in order to operate. -You can read more about JSON-LD on the [JSON-LD website](jsonld). +You can read more about JSON-LD on the [JSON-LD website][jsonld]. ## Conformance From 4401d535ab54ae282f811f655b71ada19711ad77 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:54:00 +0100 Subject: [PATCH 053/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3248dd7..a8b34a98 100644 --- a/README.md +++ b/README.md @@ -596,7 +596,7 @@ Documentation for this library is in part drawn from https://github.com/linked-d [jsonld]: https://json-ld.org/ [jsonld-java]: https://github.com/jsonld-java/jsonld-java - [JSON-LD 1.0]: http://www.w3.org/TR/2014/REC-json-ld-20140116/ + [json-ld-1.0]: http://www.w3.org/TR/2014/REC-json-ld-20140116/ [JSON-LD 1.0 API]: http://www.w3.org/TR/2014/REC-json-ld-api-20140116/ [JSON-LD 1.0 Framing]: https://json-ld.org/spec/ED/json-ld-framing/20120830/ From 3b73f3688fe997d6af12561e7051d9a3d1df3ae2 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:54:31 +0100 Subject: [PATCH 054/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a8b34a98..933218fe 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ Example data and context used throughout examples below: ``` #### context.json + ```json { "name": "http://schema.org/name", From ca934be80f8346965d021dbc4a63acec37d90398 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:54:54 +0100 Subject: [PATCH 055/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 933218fe..0f62c4cb 100644 --- a/README.md +++ b/README.md @@ -261,10 +261,9 @@ Output: */ ``` +### Normalize -### [normalize](http://json-ld.github.io/normalization/spec/) (aka canonize) - -Normalized is a graph of objects that is a canonical representation of the document that can be used for hashing, comparison, etc. +[Normalization](http://json-ld.github.io/normalization/spec/) (aka. canonicalization) converts the document into a graph of objects that is a canonical representation of the document that can be used for hashing, comparison, etc. ```csharp var doc = JObject.Parse(_docJson); From ef015dfbc0835f312af6c8dfe6574a66c293728f Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:55:50 +0100 Subject: [PATCH 056/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f62c4cb..c01e3f73 100644 --- a/README.md +++ b/README.md @@ -341,8 +341,9 @@ Output: */ ``` +### ToRDF -### ToRDF (N-Quads) + (N-Quads) ```csharp var doc = JObject.Parse(_docJson); From 78e4d49f5d33bfabea684ea109376c167a6b1aa4 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:55:59 +0100 Subject: [PATCH 057/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c01e3f73..7738d580 100644 --- a/README.md +++ b/README.md @@ -396,7 +396,9 @@ internal static void Run() } ``` -### fromRDF (N-Quads) +### FromRDF + + (N-Quads) ```csharp var opts = new JsonLdOptions(); From 90ce90a11a720488010d76e0016e059a04b03de1 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:56:09 +0100 Subject: [PATCH 058/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7738d580..5fedd4f4 100644 --- a/README.md +++ b/README.md @@ -447,7 +447,7 @@ Output: */ ``` -_or_ using a custom RDF parser +_or_ using a custom RDF parser: ```csharp private class CustomRDFParser : IRDFParser From 405d0d62209c10efe27326a2755e86020f829098 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 21:59:47 +0100 Subject: [PATCH 059/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5fedd4f4..cbc2df72 100644 --- a/README.md +++ b/README.md @@ -509,8 +509,7 @@ internal static void Run() } ``` - -### Custom documentLoader +### Custom DocumentLoader ```csharp public class CustomDocumentLoader : DocumentLoader From fe6f0b77243526c575784831abed11cd15c72cd3 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:09:46 +0100 Subject: [PATCH 060/255] lines broken into 80 characters or less (except where for code samples or URLs) --- README.md | 61 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index cbc2df72..87081475 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,31 @@ ## Introduction This library is an implementation of the JSON-LD specification in C#. -JSON, as specified in RFC7159, is a simple language for representing objects on the Web. Linked Data is a way of describing content across different documents or Web sites. Web resources are described using IRIs, and typically are dereferencable entities that may be used to find more information, creating a "Web of Knowledge". JSON-LD is intended to be a simple publishing method for expressing not only Linked Data in JSON, but for adding semantics to existing JSON. - -JSON-LD is designed as a light-weight syntax that can be used to express Linked Data. It is primarily intended to be a way to express Linked Data in JavaScript and other Web-based programming environments. It is also useful when building interoperable Web Services and when storing Linked Data in JSON-based document storage engines. It is practical and designed to be as simple as possible, utilizing the large number of JSON parsers and existing code that is in use today. It is designed to be able to express key-value pairs, RDF data, RDFa data, Microformats data, and Microdata. That is, it supports every major Web-based structured data model in use today. - -The syntax does not require many applications to change their JSON, but easily add meaning by adding context in a way that is either in-band or out-of-band. The syntax is designed to not disturb already deployed systems running on JSON, but provide a smooth migration path from plain JSON to semantically enhanced JSON. Finally, the format is intended to be fast to parse, fast to generate, stream-based and document-based processing compatible, and require a very small memory footprint in order to operate. +JSON, as specified in RFC7159, is a simple language for representing objects on +the Web. Linked Data is a way of describing content across different documents +or Web sites. Web resources are described using IRIs, and typically are +dereferencable entities that may be used to find more information, creating a +"Web of Knowledge". JSON-LD is intended to be a simple publishing method for +expressing not only Linked Data in JSON, but for adding semantics to existing +JSON. + +JSON-LD is designed as a light-weight syntax that can be used to express Linked +Data. It is primarily intended to be a way to express Linked Data in JavaScript +and other Web-based programming environments. It is also useful when building +interoperable Web Services and when storing Linked Data in JSON-based document +storage engines. It is practical and designed to be as simple as possible, +utilizing the large number of JSON parsers and existing code that is in use +today. It is designed to be able to express key-value pairs, RDF data, RDFa +data, Microformats data, and Microdata. That is, it supports every major +Web-based structured data model in use today. + +The syntax does not require many applications to change their JSON, but easily +add meaning by adding context in a way that is either in-band or out-of-band. +The syntax is designed to not disturb already deployed systems running on JSON, +but provide a smooth migration path from plain JSON to semantically enhanced +JSON. Finally, the format is intended to be fast to parse, fast to generate, +stream-based and document-based processing compatible, and require a very small +memory footprint in order to operate. You can read more about JSON-LD on the [JSON-LD website][jsonld]. @@ -19,8 +39,10 @@ You can read more about JSON-LD on the [JSON-LD website][jsonld]. This library aims to conform with the following: -* [JSON-LD 1.0][JSON-LD 1.0], W3C Recommendation, 2014-01-16, and any [errata][errata] -* [JSON-LD 1.0 Processing Algorithms and API][JSON-LD 1.0 API], W3C Recommendation, 2014-01-16, and any [errata][errata] +* [JSON-LD 1.0][JSON-LD 1.0], W3C Recommendation, 2014-01-16, and any +[errata][errata] +* [JSON-LD 1.0 Processing Algorithms and API][JSON-LD 1.0 API], W3C +Recommendation, 2014-01-16, and any [errata][errata] * [JSON-LD 1.0 Framing][JSON-LD 1.0 Framing], Unofficial Draft, 2012-08-30 * Working Group [test suite][WG test suite] @@ -28,12 +50,15 @@ The [JSON-LD Working Group][JSON-LD WG] is now developing JSON-LD 1.1. Library updates to conform with newer specifications will happen as features stabilize and development time and resources permit. -* [JSON-LD 1.1][JSON-LD WG 1.1], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG latest] -* [JSON-LD 1.1 Processing Algorithms and API][JSON-LD WG 1.1 API], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG API latest] -* [JSON-LD 1.1 Framing][JSON-LD WG 1.1 Framing], W3C Working Draft, 2018-12-14 or [newer][JSON-LD WG Framing latest] +* [JSON-LD 1.1][JSON-LD WG 1.1], W3C Working Draft, 2018-12-14 or +[newer][JSON-LD WG latest] +* [JSON-LD 1.1 Processing Algorithms and API][JSON-LD WG 1.1 API], W3C Working +Draft, 2018-12-14 or [newer][JSON-LD WG API latest] +* [JSON-LD 1.1 Framing][JSON-LD WG 1.1 Framing], W3C Working Draft, 2018-12-14 +or [newer][JSON-LD WG Framing latest] -The [test runner][] is often updated to note or skip newer tests that are not -yet supported. +The [test runner][test runner] is often updated to note or skip newer tests that +are not yet supported. ## Supported frameworks @@ -263,7 +288,10 @@ Output: ### Normalize -[Normalization](http://json-ld.github.io/normalization/spec/) (aka. canonicalization) converts the document into a graph of objects that is a canonical representation of the document that can be used for hashing, comparison, etc. +[Normalization](http://json-ld.github.io/normalization/spec/) (aka. +canonicalization) converts the document into a graph of objects that is a +canonical representation of the document that can be used for hashing, +comparison, etc. ```csharp var doc = JObject.Parse(_docJson); @@ -559,7 +587,9 @@ public static void Run() ## Contributing -This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc-faq] or contact [opencode@microsoft.com][ms-mail] with any additional questions or comments. +This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For +more information see the [Code of Conduct FAQ][coc-faq] or contact +[opencode@microsoft.com][ms-mail] with any additional questions or comments. Pull requests for json-ld.net are welcome, to get started install the latest tools for .NET Core: @@ -582,7 +612,8 @@ On both Windows and all other supported operating systems, you can run This project began life as a [Sharpen][sharpen]-based auto-port from [jsonld-java][jsonld-java]. -Documentation for this library is in part drawn from https://github.com/linked-data-dotnet/json-ld.net +Documentation for this library is in part drawn from +https://github.com/linked-data-dotnet/json-ld.net [coc]: https://opensource.microsoft.com/codeofconduct/ [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ From 5bb50937f3ef3c197e5c7c1b0d9da8cb54e8fc84 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:24:58 +0100 Subject: [PATCH 061/255] fixed link bugs and normalised to use kebab-case for link references --- README.md | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 87081475..ad2f4c5b 100644 --- a/README.md +++ b/README.md @@ -39,25 +39,25 @@ You can read more about JSON-LD on the [JSON-LD website][jsonld]. This library aims to conform with the following: -* [JSON-LD 1.0][JSON-LD 1.0], W3C Recommendation, 2014-01-16, and any +* [JSON-LD 1.0][json-ld-10], W3C Recommendation, 2014-01-16, and any [errata][errata] -* [JSON-LD 1.0 Processing Algorithms and API][JSON-LD 1.0 API], W3C +* [JSON-LD 1.0 Processing Algorithms and API][json-ld-10-api], W3C Recommendation, 2014-01-16, and any [errata][errata] -* [JSON-LD 1.0 Framing][JSON-LD 1.0 Framing], Unofficial Draft, 2012-08-30 -* Working Group [test suite][WG test suite] +* [JSON-LD 1.0 Framing][json-ld-10-framing], Unofficial Draft, 2012-08-30 +* Working Group [test suite][wg-test-suite] -The [JSON-LD Working Group][JSON-LD WG] is now developing JSON-LD 1.1. Library +The [JSON-LD Working Group][json-ld-wg] is now developing JSON-LD 1.1. Library updates to conform with newer specifications will happen as features stabilize and development time and resources permit. -* [JSON-LD 1.1][JSON-LD WG 1.1], W3C Working Draft, 2018-12-14 or -[newer][JSON-LD WG latest] -* [JSON-LD 1.1 Processing Algorithms and API][JSON-LD WG 1.1 API], W3C Working -Draft, 2018-12-14 or [newer][JSON-LD WG API latest] -* [JSON-LD 1.1 Framing][JSON-LD WG 1.1 Framing], W3C Working Draft, 2018-12-14 -or [newer][JSON-LD WG Framing latest] +* [JSON-LD 1.1][json-ld-wg-11], W3C Working Draft, 2018-12-14 or +[newer][json-ld-wg-latest] +* [JSON-LD 1.1 Processing Algorithms and API][json-ld-wg-11-api], W3C Working +Draft, 2018-12-14 or [newer][json-ld-wg-api-latest] +* [JSON-LD 1.1 Framing][json-ld-wg-11-framing], W3C Working Draft, 2018-12-14 +or [newer][json-ld-wg-framing-latest] -The [test runner][test runner] is often updated to note or skip newer tests that +The [test runner][test-runner] is often updated to note or skip newer tests that are not yet supported. ## Supported frameworks @@ -620,6 +620,8 @@ https://github.com/linked-data-dotnet/json-ld.net [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg + [errata]: http://www.w3.org/2014/json-ld-errata + [ms-mail]: mailto:opencode@microsoft.com [dnc]: https://dot.net [dnc-tutorial]: https://www.microsoft.com/net/core @@ -629,22 +631,22 @@ https://github.com/linked-data-dotnet/json-ld.net [jsonld]: https://json-ld.org/ [jsonld-java]: https://github.com/jsonld-java/jsonld-java - [json-ld-1.0]: http://www.w3.org/TR/2014/REC-json-ld-20140116/ - [JSON-LD 1.0 API]: http://www.w3.org/TR/2014/REC-json-ld-api-20140116/ - [JSON-LD 1.0 Framing]: https://json-ld.org/spec/ED/json-ld-framing/20120830/ + [json-ld-10]: http://www.w3.org/TR/2014/REC-json-ld-20140116/ + [json-ld-10-api]: http://www.w3.org/TR/2014/REC-json-ld-api-20140116/ + [json-ld-10-framing]: https://json-ld.org/spec/ED/json-ld-framing/20120830/ - [JSON-LD WG 1.1]: https://www.w3.org/TR/json-ld11/ - [JSON-LD WG 1.1 API]: https://www.w3.org/TR/json-ld11-api/ - [JSON-LD WG 1.1 Framing]: https://www.w3.org/TR/json-ld11-framing/ + [json-ld-wg-11]: https://www.w3.org/TR/json-ld11/ + [json-ld-wg-11-api]: https://www.w3.org/TR/json-ld11-api/ + [json-ld-wg-11-framing]: https://www.w3.org/TR/json-ld11-framing/ - [JSON-LD WG latest]: https://w3c.github.io/json-ld-syntax/ - [JSON-LD WG API latest]: https://w3c.github.io/json-ld-api/ - [JSON-LD WG Framing latest]: https://w3c.github.io/json-ld-framing/ + [json-ld-wg-latest]: https://w3c.github.io/json-ld-syntax/ + [json-ld-wg-api-latest]: https://w3c.github.io/json-ld-api/ + [json-ld-wg-framing-latest]: https://w3c.github.io/json-ld-framing/ [nuget]: https://www.nuget.org/packages/json-ld.net/ [nuget-badge]: https://img.shields.io/nuget/v/json-ld.net.svg [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html - [test runner]: https://github.com/linked-data-dotnet/json-ld.net/tree/master/test/json-ld.net.tests - [WG test suite]: https://github.com/w3c/json-ld-api/tree/master/tests + [test-runner]: https://github.com/linked-data-dotnet/json-ld.net/tree/master/test/json-ld.net.tests + [wg-test-suite]: https://github.com/w3c/json-ld-api/tree/master/tests From ae58f1ddce33d3c127b17d26d1bda35368e58deb Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:26:50 +0100 Subject: [PATCH 062/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad2f4c5b..ceb4e5e1 100644 --- a/README.md +++ b/README.md @@ -241,8 +241,9 @@ Output: ``` +### Frame -### [frame](http://json-ld.org/spec/latest/json-ld-framing/#introduction) +[Frame](http://json-ld.org/spec/latest/json-ld-framing/#introduction). For the framing example below, the framing document is defined as follows: From a90cd39d642135476c57a823345b6d6c313ce1d6 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:27:09 +0100 Subject: [PATCH 063/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ceb4e5e1..97ff5ac3 100644 --- a/README.md +++ b/README.md @@ -204,8 +204,9 @@ Output: */ ``` +### Flatten -### [flatten](http://json-ld.org/spec/latest/json-ld/#flattened-document-form) +[Flatten](http://json-ld.org/spec/latest/json-ld/#flattened-document-form). ```csharp var doc = JObject.Parse(_docJson); From 5c673382a9ba0f369f0248bebd105ab5d8c0d645 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:27:23 +0100 Subject: [PATCH 064/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 97ff5ac3..cb623852 100644 --- a/README.md +++ b/README.md @@ -158,8 +158,9 @@ Output: */ ``` +### Expand -### [expand](http://json-ld.org/spec/latest/json-ld/#expanded-document-form) +[Expand](http://json-ld.org/spec/latest/json-ld/#expanded-document-form). ```csharp var expanded = JsonLdProcessor.Expand(compacted); From 6ea46a58d46f6fd59b9208a8caf27dfe60b0da0f Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:31:11 +0100 Subject: [PATCH 065/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb623852..c766a6e4 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,7 @@ For the framing example below, the framing document is defined as follows: ``` And we use it like this: + ```csharp var doc = JObject.Parse(_docJson); var frame = JObject.Parse(_frameJson); From 536400796ec12b261d1e0fd34c11f372b4d53888 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 22:31:25 +0100 Subject: [PATCH 066/255] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Asbjørn Ulsberg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c766a6e4..3ea8f250 100644 --- a/README.md +++ b/README.md @@ -130,8 +130,9 @@ Example data and context used throughout examples below: } ``` +### Compact -### [compact](http://json-ld.org/spec/latest/json-ld/#compacted-document-form) +[Compact](http://json-ld.org/spec/latest/json-ld/#compacted-document-form). ```csharp var doc = JObject.Parse(_docJson); From 70ab9c68e5dfed51069c5a3cd90f2b75873f5415 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Tue, 7 Jul 2020 23:10:21 +0100 Subject: [PATCH 067/255] descriptions of various algorithms and utility methods added --- README.md | 68 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3ea8f250..39870e7d 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,12 @@ Example data and context used throughout examples below: ### Compact -[Compact](http://json-ld.org/spec/latest/json-ld/#compacted-document-form). +[Compaction](http://json-ld.org/spec/latest/json-ld/#compacted-document-form) is +the process of applying a developer-supplied context to shorten IRIs to terms or +compact IRIs, and JSON-LD values expressed in expanded form to simple values +such as strings or numbers. Often this makes it simpler to work with a document +as the data is expressed in application-specific terms. Compacted documents are +also typically easier to read for humans. ```csharp var doc = JObject.Parse(_docJson); @@ -161,7 +166,11 @@ Output: ### Expand -[Expand](http://json-ld.org/spec/latest/json-ld/#expanded-document-form). + +[Exapansion](http://json-ld.org/spec/latest/json-ld/#expanded-document-form) is +the process of taking a JSON-LD document and applying a @context such that all +IRIs, types, and values are expanded so that the @context is no longer +necessary. ```csharp var expanded = JsonLdProcessor.Expand(compacted); @@ -208,7 +217,11 @@ Output: ### Flatten -[Flatten](http://json-ld.org/spec/latest/json-ld/#flattened-document-form). +[Flattening](http://json-ld.org/spec/latest/json-ld/#flattened-document-form) +collects all properties of a node in a single JSON object and labels all blank +nodes with blank node identifiers. This ensures a shape of the data and +consequently may drastically simplify the code required to process JSON-LD in +certain applications. ```csharp var doc = JObject.Parse(_docJson); @@ -246,7 +259,17 @@ Output: ### Frame -[Frame](http://json-ld.org/spec/latest/json-ld-framing/#introduction). +[Framing](http://json-ld.org/spec/latest/json-ld-framing/#introduction) is used +to shape the data in a JSON-LD document, using an example frame document which +is used to both match the flattened data and show an example of how the +resulting data should be shaped. Matching is performed by using properties +present in the frame to find objects in the data that share common values. +Matching can be done either using all properties present in the frame, or any +property in the frame. By chaining together objects using matched property +values, objects can be embedded within one another. + +A frame also includes a context, which is used for compacting the resulting +framed output. For the framing example below, the framing document is defined as follows: @@ -376,7 +399,20 @@ Output: ### ToRDF - (N-Quads) +JSON-LD is a concrete RDF syntax as described in [RDF 1.1 Concepts and Abstract +Syntax][rdf-11-concepts]. Hence, a JSON-LD document is both an RDF document and a +JSON document and correspondingly represents an instance of an RDF data model. +The procedure to deserialize a JSON-LD document to an +[RDF dataset][rdf-11-dataset] (and, optionally, to [RDF N-Quads][n-quads]) +involves the following steps: + +1. Expand the JSON-LD document, removing any context; this ensures that +properties, types, and values are given their full representation as IRIs and +expanded values. +1. Flatten the document, which turns the document into an array of node objects. +1. Turn each node object into a series of RDF N-Quads. + +The processor's `ToRDF` method carries out these steps for you, like this: ```csharp var doc = JObject.Parse(_docJson); @@ -399,7 +435,7 @@ _:b0 Date: Tue, 4 Aug 2020 07:43:42 +0000 Subject: [PATCH 068/255] Bump xunit.runner.visualstudio from 2.4.2 to 2.4.3 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/v2.4.2...v2.4.3) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 22eb64a6..61a86830 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From ef5f8fbf28889dc809b3549dbd2eb80197e3f974 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 06:28:35 +0000 Subject: [PATCH 069/255] Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.1) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 61a86830..2195496c 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 08800ef914c98b7106a40c437d889660e407ad48 Mon Sep 17 00:00:00 2001 From: Andrew Gibson Date: Wed, 30 Sep 2020 14:58:31 +0100 Subject: [PATCH 070/255] nquad and turle parsers made internal --- src/json-ld.net/Impl/NQuadRDFParser.cs | 2 +- src/json-ld.net/Impl/NQuadTripleCallback.cs | 2 +- src/json-ld.net/Impl/TurtleRDFParser.cs | 2 +- src/json-ld.net/Impl/TurtleTripleCallback.cs | 2 +- src/json-ld.net/Properties/AssemblyInfo.cs | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/json-ld.net/Impl/NQuadRDFParser.cs b/src/json-ld.net/Impl/NQuadRDFParser.cs index 5a0bd32f..a999e10b 100644 --- a/src/json-ld.net/Impl/NQuadRDFParser.cs +++ b/src/json-ld.net/Impl/NQuadRDFParser.cs @@ -4,7 +4,7 @@ namespace JsonLD.Impl { - public class NQuadRDFParser : IRDFParser + internal class NQuadRDFParser : IRDFParser { /// public virtual RDFDataset Parse(JToken input) diff --git a/src/json-ld.net/Impl/NQuadTripleCallback.cs b/src/json-ld.net/Impl/NQuadTripleCallback.cs index 83f60596..83ff8ff0 100644 --- a/src/json-ld.net/Impl/NQuadTripleCallback.cs +++ b/src/json-ld.net/Impl/NQuadTripleCallback.cs @@ -4,7 +4,7 @@ namespace JsonLD.Impl { - public class NQuadTripleCallback : IJSONLDTripleCallback + internal class NQuadTripleCallback : IJSONLDTripleCallback { public virtual object Call(RDFDataset dataset) { diff --git a/src/json-ld.net/Impl/TurtleRDFParser.cs b/src/json-ld.net/Impl/TurtleRDFParser.cs index c282a257..c084dbf0 100644 --- a/src/json-ld.net/Impl/TurtleRDFParser.cs +++ b/src/json-ld.net/Impl/TurtleRDFParser.cs @@ -11,7 +11,7 @@ namespace JsonLD.Impl /// TODO: this probably needs to be changed to use a proper parser/lexer /// /// Tristan - public class TurtleRDFParser : IRDFParser + internal class TurtleRDFParser : IRDFParser { internal class Regex { diff --git a/src/json-ld.net/Impl/TurtleTripleCallback.cs b/src/json-ld.net/Impl/TurtleTripleCallback.cs index c522fce8..4c3b4238 100644 --- a/src/json-ld.net/Impl/TurtleTripleCallback.cs +++ b/src/json-ld.net/Impl/TurtleTripleCallback.cs @@ -4,7 +4,7 @@ namespace JsonLD.Impl { - public class TurtleTripleCallback : IJSONLDTripleCallback + internal class TurtleTripleCallback : IJSONLDTripleCallback { private const int MaxLineLength = 160; diff --git a/src/json-ld.net/Properties/AssemblyInfo.cs b/src/json-ld.net/Properties/AssemblyInfo.cs index 2cef929c..cd64fb7a 100644 --- a/src/json-ld.net/Properties/AssemblyInfo.cs +++ b/src/json-ld.net/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] +[assembly: InternalsVisibleTo("json-ld.net.tests")] From 34ab88c91bd346b1fbe23c8caf18e3c821441e32 Mon Sep 17 00:00:00 2001 From: Andrew Gibson Date: Wed, 30 Sep 2020 15:00:53 +0100 Subject: [PATCH 071/255] utils should not be a public API --- src/json-ld.net/Util/JSONUtils.cs | 2 +- src/json-ld.net/Util/Obj.cs | 2 +- src/json-ld.net/Util/URL.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/json-ld.net/Util/JSONUtils.cs b/src/json-ld.net/Util/JSONUtils.cs index ef01ab5f..37a3510c 100644 --- a/src/json-ld.net/Util/JSONUtils.cs +++ b/src/json-ld.net/Util/JSONUtils.cs @@ -10,7 +10,7 @@ namespace JsonLD.Util { /// A bunch of functions to make loading JSON easy /// tristan - public class JSONUtils + internal class JSONUtils { /// An HTTP Accept header that prefers JSONLD. /// An HTTP Accept header that prefers JSONLD. diff --git a/src/json-ld.net/Util/Obj.cs b/src/json-ld.net/Util/Obj.cs index c6c4cb5e..eec1d6c0 100644 --- a/src/json-ld.net/Util/Obj.cs +++ b/src/json-ld.net/Util/Obj.cs @@ -4,7 +4,7 @@ namespace JsonLD.Util { - public class Obj + internal class Obj { /// /// Used to make getting values from maps embedded in maps embedded in maps diff --git a/src/json-ld.net/Util/URL.cs b/src/json-ld.net/Util/URL.cs index e9de738e..b7c5e8ab 100644 --- a/src/json-ld.net/Util/URL.cs +++ b/src/json-ld.net/Util/URL.cs @@ -7,7 +7,7 @@ namespace JsonLD.Util { - public class URL + internal class URL { public string href = string.Empty; From 3f8025bc475ad2bdaa2d34cefa85a18f251471e8 Mon Sep 17 00:00:00 2001 From: Andrew Gibson Date: Wed, 30 Sep 2020 15:23:29 +0100 Subject: [PATCH 072/255] various parts of the Core namespace should not be public --- src/json-ld.net/Core/Context.cs | 16 ++++++++-------- src/json-ld.net/Core/DocumentLoader.cs | 4 ++-- src/json-ld.net/Core/JSONLDConsts.cs | 2 +- src/json-ld.net/Core/JsonLdError.cs | 8 ++++---- src/json-ld.net/Core/JsonLdUtils.cs | 2 +- src/json-ld.net/Core/RDFDatasetUtils.cs | 2 +- src/json-ld.net/Core/UniqueNamer.cs | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs index ee3fb67d..c1dd1ac0 100644 --- a/src/json-ld.net/Core/Context.cs +++ b/src/json-ld.net/Core/Context.cs @@ -68,7 +68,7 @@ private void Init(JsonLdOptions options) /// /// /// - public virtual JToken CompactValue(string activeProperty, JObject value) + internal virtual JToken CompactValue(string activeProperty, JObject value) { var dict = (IDictionary)value; // 1) @@ -137,7 +137,7 @@ public virtual JToken CompactValue(string activeProperty, JObject value) /// /// JsonLdError /// - public virtual JsonLD.Core.Context Parse(JToken localContext, List remoteContexts) + internal virtual JsonLD.Core.Context Parse(JToken localContext, List remoteContexts) { if (remoteContexts == null) { @@ -318,7 +318,7 @@ public virtual JsonLD.Core.Context Parse(JToken localContext, List remot } /// - public virtual JsonLD.Core.Context Parse(JToken localContext) + internal virtual JsonLD.Core.Context Parse(JToken localContext) { return this.Parse(localContext, new List()); } @@ -952,7 +952,7 @@ public object Clone() /// already generated for the given active context. /// /// the inverse context. - public virtual JObject GetInverse() + internal virtual JObject GetInverse() { // lazily create inverse if (inverse != null) @@ -1144,7 +1144,7 @@ private string SelectTerm(string iri, JArray containers, string typeLanguage /// Retrieve container mapping. /// /// - public virtual string GetContainer(string property) + internal virtual string GetContainer(string property) { // TODO(sblom): Do java semantics of get() on a Map return null if property is null? if (property == null) @@ -1169,7 +1169,7 @@ public virtual string GetContainer(string property) return (string)td["@container"]; } - public virtual bool IsReverseProperty(string property) + internal virtual bool IsReverseProperty(string property) { if (property == null) { @@ -1218,7 +1218,7 @@ internal virtual JObject GetTermDefinition(string key) } /// - public virtual JToken ExpandValue(string activeProperty, JToken value) + internal virtual JToken ExpandValue(string activeProperty, JToken value) { JObject rval = new JObject(); JObject td = GetTermDefinition(activeProperty); @@ -1272,7 +1272,7 @@ public virtual JToken ExpandValue(string activeProperty, JToken value) } /// - public virtual JObject GetContextValue(string activeProperty, string @string) + internal virtual JObject GetContextValue(string activeProperty, string @string) { throw new JsonLdError(JsonLdError.Error.NotImplemented, "getContextValue is only used by old code so far and thus isn't implemented" ); diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index 3eb83dc8..99bde790 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -21,7 +21,7 @@ public virtual RemoteDocument LoadDocument(string url) try { HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); - req.Accept = AcceptHeader; + req.Accept = _acceptHeader; resp = (HttpWebResponse)req.GetResponse(); bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json"; if (!resp.Headers[HttpResponseHeader.ContentType].Contains("json")) @@ -91,7 +91,7 @@ public virtual RemoteDocument LoadDocument(string url) /// An HTTP Accept header that prefers JSONLD. /// An HTTP Accept header that prefers JSONLD. - public const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; + private const string _acceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; // private static volatile IHttpClient httpClient; diff --git a/src/json-ld.net/Core/JSONLDConsts.cs b/src/json-ld.net/Core/JSONLDConsts.cs index 916d8852..802a9023 100644 --- a/src/json-ld.net/Core/JSONLDConsts.cs +++ b/src/json-ld.net/Core/JSONLDConsts.cs @@ -4,7 +4,7 @@ namespace JsonLD.Core { /// URI Constants used in the JSON-LD parser. /// URI Constants used in the JSON-LD parser. - public sealed class JSONLDConsts + internal sealed class JSONLDConsts { public const string RdfSyntaxNs = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; diff --git a/src/json-ld.net/Core/JsonLdError.cs b/src/json-ld.net/Core/JsonLdError.cs index 81b1388f..8f0ee91a 100644 --- a/src/json-ld.net/Core/JsonLdError.cs +++ b/src/json-ld.net/Core/JsonLdError.cs @@ -11,21 +11,21 @@ public class JsonLdError : Exception private JsonLdError.Error type; internal JObject details = null; - public JsonLdError(JsonLdError.Error type, object detail, Exception innerException) + internal JsonLdError(JsonLdError.Error type, object detail, Exception innerException) : base(detail == null ? string.Empty : detail.ToString(), innerException) { // TODO: pretty toString (e.g. print whole json objects) this.type = type; } - public JsonLdError(JsonLdError.Error type, object detail) + internal JsonLdError(JsonLdError.Error type, object detail) : base(detail == null ? string.Empty : detail.ToString()) { // TODO: pretty toString (e.g. print whole json objects) this.type = type; } - public JsonLdError(JsonLdError.Error type) + internal JsonLdError(JsonLdError.Error type) : base(string.Empty) { this.type = type; @@ -171,7 +171,7 @@ public override string ToString() } } - public virtual JsonLdError SetType(JsonLdError.Error error) + internal virtual JsonLdError SetType(JsonLdError.Error error) { this.type = error; return this; diff --git a/src/json-ld.net/Core/JsonLdUtils.cs b/src/json-ld.net/Core/JsonLdUtils.cs index 0ac976e6..b777decd 100644 --- a/src/json-ld.net/Core/JsonLdUtils.cs +++ b/src/json-ld.net/Core/JsonLdUtils.cs @@ -8,7 +8,7 @@ namespace JsonLD.Core { - public class JsonLdUtils + internal class JsonLdUtils { private const int MaxContextUrls = 10; diff --git a/src/json-ld.net/Core/RDFDatasetUtils.cs b/src/json-ld.net/Core/RDFDatasetUtils.cs index df92c92f..4c737b4d 100644 --- a/src/json-ld.net/Core/RDFDatasetUtils.cs +++ b/src/json-ld.net/Core/RDFDatasetUtils.cs @@ -6,7 +6,7 @@ namespace JsonLD.Core { - public class RDFDatasetUtils + internal class RDFDatasetUtils { /// Creates an array of RDF triples for the given graph. /// Creates an array of RDF triples for the given graph. diff --git a/src/json-ld.net/Core/UniqueNamer.cs b/src/json-ld.net/Core/UniqueNamer.cs index 4b74035b..5a71a375 100644 --- a/src/json-ld.net/Core/UniqueNamer.cs +++ b/src/json-ld.net/Core/UniqueNamer.cs @@ -4,7 +4,7 @@ namespace JsonLD.Core { - public class UniqueNamer + internal class UniqueNamer { private readonly string prefix; From 7c891096e18c366d7eca27c2a0426ee6c7f1aed4 Mon Sep 17 00:00:00 2001 From: Andrew Gibson Date: Wed, 30 Sep 2020 15:32:12 +0100 Subject: [PATCH 073/255] an additional member of Context to make internal --- src/json-ld.net/Core/Context.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs index c1dd1ac0..ad69599d 100644 --- a/src/json-ld.net/Core/Context.cs +++ b/src/json-ld.net/Core/Context.cs @@ -22,7 +22,7 @@ public class Context : JObject JObject termDefinitions; - public JObject inverse = null; + internal JObject inverse = null; public Context() : this(new JsonLdOptions()) { From 9dcfa0c28e51e7826f1a93a45151e6a52f9f2322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 14:27:06 +0200 Subject: [PATCH 074/255] Adjust formatting --- .github/workflows/dotnet.yml | 50 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1ca89c87..e5adca45 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,32 +2,38 @@ name: dotnet on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 2.1.401 - - - name: Install dependencies - run: dotnet restore - - - name: Build - run: dotnet build --configuration Release --no-restore - - - name: Test - run: dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[JsonLD.Test*]*" - - - name: Codecov - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - run: bash <(curl -s https://codecov.io/bash) + - uses: actions/checkout@v2 + + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.1.401 + + - name: Install dependencies + run: dotnet restore + + - name: Build + run: dotnet build --configuration Release --no-restore + + - name: Test + run: | + dotnet test \ + . \ + --configuration Release \ + -p:CollectCoverage=true \ + -p:CoverletOutputFormat=opencover \ + -p:Exclude="[JsonLD.Test*]*" + + - name: Codecov + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + run: bash <(curl -s https://codecov.io/bash) From 07789a218f8b29507d6485a5c73a435bf67cde60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 14:28:52 +0200 Subject: [PATCH 075/255] Cache NuGet packages --- .github/workflows/dotnet.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e5adca45..505cb0ab 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -18,6 +18,12 @@ jobs: with: dotnet-version: 2.1.401 + - uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: ${{ runner.os }}-nuget- + - name: Install dependencies run: dotnet restore From 4751656017732b62d2e4373c247cb0b95537a2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 14:30:07 +0200 Subject: [PATCH 076/255] Break out tests to a separate build --- .github/workflows/dotnet.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 505cb0ab..5c50add3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,11 +30,27 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore + - uses: actions/upload-artifact@v2 + with: + name: build + path: . + + test: + runs-on: ubuntu-latest + needs: build + + steps: + - uses: actions/download-artifact@v1 + with: + name: build + - name: Test run: | dotnet test \ . \ --configuration Release \ + --no-build \ + --no-restore \ -p:CollectCoverage=true \ -p:CoverletOutputFormat=opencover \ -p:Exclude="[JsonLD.Test*]*" From d01a5061fba7e473022f58229bc213a4e6c079fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 14:45:22 +0200 Subject: [PATCH 077/255] Extract to the current directory and do ls -la after for debugging --- .github/workflows/dotnet.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5c50add3..1d06b22a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -40,9 +40,12 @@ jobs: needs: build steps: - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v2 with: name: build + path: . + + - run: ls -la - name: Test run: | From 2629b892b8327ccef7a7d09a4fcdb678f3ee191d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 16:04:54 +0200 Subject: [PATCH 078/255] Add GitVersion and NuGet Pack jobs --- .github/workflows/dotnet.yml | 50 ++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1d06b22a..f852aeff 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -7,6 +7,24 @@ on: branches: [master] jobs: + gitversion: + runs-on: ubuntu-latest + + outputs: + fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - uses: gittools/actions/gitversion/setup@v0.9.3 + with: + versionSpec: "5.x" + + - id: gitversion + uses: gittools/actions/gitversion/execute@v0.9.3 + build: runs-on: ubuntu-latest @@ -45,8 +63,6 @@ jobs: name: build path: . - - run: ls -la - - name: Test run: | dotnet test \ @@ -62,3 +78,33 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} run: bash <(curl -s https://codecov.io/bash) + + nuget-pack: + runs-on: ubuntu-latest + needs: [build, gitversion] + + steps: + - uses: actions/download-artifact@v2 + with: + name: build + path: . + + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.1.401 + + - name: NuGet Pack + run: | + dotnet pack \ + --include-source \ + --no-build \ + --no-restore \ + -p:PackageVersion="${{ needs.gitversion.outputs.fullSemVer }}" \ + src/json-ld.net/json-ld.net.csproj \ + --output nugets/ + + - uses: actions/upload-artifact@v2 + with: + name: nugets + path: nugets From b096da7822656097936316f6dcd93a0c882fdd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 18:20:42 +0200 Subject: [PATCH 079/255] Specify NuGet package directory --- .github/workflows/dotnet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f852aeff..acb39eae 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -37,6 +37,8 @@ jobs: 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') }} From a5c09250f69c1ccd1f93f8422c5ff73aaec75fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 22:26:23 +0200 Subject: [PATCH 080/255] Remove . for dotnet test --- .github/workflows/dotnet.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index acb39eae..26167c3c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -68,7 +68,6 @@ jobs: - name: Test run: | dotnet test \ - . \ --configuration Release \ --no-build \ --no-restore \ From 0f348f0bfb593ac685a8350ea88f265b38b5b5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 25 Jun 2020 23:18:00 +0200 Subject: [PATCH 081/255] Revert the job-splitting Revert the job-splitting as uploading and downloading the build artifacts take several minutes to complete. --- .github/workflows/dotnet.yml | 52 +++++------------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 26167c3c..b89e90e8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -7,7 +7,7 @@ on: branches: [master] jobs: - gitversion: + build: runs-on: ubuntu-latest outputs: @@ -25,14 +25,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.3 - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v1 with: dotnet-version: 2.1.401 @@ -44,29 +37,11 @@ jobs: key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} restore-keys: ${{ runner.os }}-nuget- - - name: Install dependencies - run: dotnet restore - - - name: Build - run: dotnet build --configuration Release --no-restore - - - uses: actions/upload-artifact@v2 - with: - name: build - path: . - - test: - runs-on: ubuntu-latest - needs: build + - run: dotnet restore - steps: - - uses: actions/download-artifact@v2 - with: - name: build - path: . + - run: dotnet build --configuration Release --no-restore - - name: Test - run: | + - run: | dotnet test \ --configuration Release \ --no-build \ @@ -80,28 +55,13 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} run: bash <(curl -s https://codecov.io/bash) - nuget-pack: - runs-on: ubuntu-latest - needs: [build, gitversion] - - steps: - - uses: actions/download-artifact@v2 - with: - name: build - path: . - - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 2.1.401 - - name: NuGet Pack run: | dotnet pack \ --include-source \ --no-build \ --no-restore \ - -p:PackageVersion="${{ needs.gitversion.outputs.fullSemVer }}" \ + -p:PackageVersion="${{ steps.gitversion.outputs.fullSemVer }}" \ src/json-ld.net/json-ld.net.csproj \ --output nugets/ From 0d7090929a863fe8c095f4198c6fa5f50303d667 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Gibson Date: Fri, 3 Jul 2020 10:24:29 +0100 Subject: [PATCH 082/255] Update dotnet.yml dotnet pack defaults to Debug but we build Release --- .github/workflows/dotnet.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b89e90e8..1bf1d78d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -59,6 +59,7 @@ jobs: run: | dotnet pack \ --include-source \ + --configuration Release \ --no-build \ --no-restore \ -p:PackageVersion="${{ steps.gitversion.outputs.fullSemVer }}" \ From cb0fb9027396aaebded23d7de378874f30b5bbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 1 Oct 2020 23:21:07 +0200 Subject: [PATCH 083/255] Add jobs for package publishing - Add NuGet push to production job `nuget-push-prod`. - Add NuGet push to development job `nuget-push-dev`. - Add job `release-artifacts` to upload `.nuget` to the GitHub Release corresponding to the current tag (if any). --- .github/workflows/dotnet.yml | 67 +++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1bf1d78d..194efc84 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -3,6 +3,7 @@ name: dotnet on: push: branches: [master] + tags: ["*"] pull_request: branches: [master] @@ -18,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.3 + - uses: gittools/actions/gitversion/setup@v0.9.4 with: versionSpec: "5.x" - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.3 + uses: gittools/actions/gitversion/execute@v0.9.4 - uses: actions/setup-dotnet@v1 with: @@ -55,8 +56,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} run: bash <(curl -s https://codecov.io/bash) - - name: NuGet Pack - run: | + - run: | dotnet pack \ --include-source \ --configuration Release \ @@ -64,9 +64,66 @@ jobs: --no-restore \ -p:PackageVersion="${{ steps.gitversion.outputs.fullSemVer }}" \ src/json-ld.net/json-ld.net.csproj \ - --output nugets/ + --output ${{ github.workspace }}/nugets/ - uses: actions/upload-artifact@v2 with: name: nugets path: nugets + + nuget-push-dev: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') != true + needs: build + + steps: + - uses: actions/download-artifact@v2 + with: + name: nugets + + - 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 }} + + - 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: 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 From 3861efaeb277a257e35cfb8368a7c1cdaeeaebcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 2 Oct 2020 02:01:55 +0200 Subject: [PATCH 084/255] Add RepositoryUrl to project file --- src/json-ld.net/json-ld.net.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 3bd4f7cf..62f84ac8 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -17,6 +17,7 @@ Implements the W3C JSON-LD 1.0 standard. false false false + https://github.com/linked-data-dotnet/json-ld.net @@ -36,4 +37,4 @@ Implements the W3C JSON-LD 1.0 standard. - \ No newline at end of file + From 4aa1fe7ecd01a244bea5e0582fdfbf5eac60818c Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Thu, 1 Oct 2020 21:52:09 -0700 Subject: [PATCH 085/255] Add support for HTTP operations on CoreCLR Closes #21 Closes #12 --- src/json-ld.net/Core/DocumentLoader.cs | 230 +++++--------------- src/json-ld.net/Util/JSONUtils.cs | 58 ++--- test/json-ld.net.tests/ConformanceTests.cs | 12 +- test/json-ld.net.tests/JsonFetcher.cs | 4 +- test/json-ld.net.tests/NQuadsParserTests.cs | 4 +- 5 files changed, 99 insertions(+), 209 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index 3eb83dc8..799e988e 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -6,31 +6,73 @@ using JsonLD.Util; using System.Net; using System.Collections.Generic; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; +using System.Runtime.InteropServices; namespace JsonLD.Core { public class DocumentLoader { + const int MAX_REDIRECTS = 20; + + /// An HTTP Accept header that prefers JSONLD. + /// An HTTP Accept header that prefers JSONLD. + public const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; + + /// + public RemoteDocument LoadDocument(string url) + { + return LoadDocumentAsync(url).GetAwaiter().GetResult(); + } + /// - public virtual RemoteDocument LoadDocument(string url) + public async Task LoadDocumentAsync(string url) { -#if !PORTABLE && !IS_CORECLR RemoteDocument doc = new RemoteDocument(url, null); - HttpWebResponse resp; try { - HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); - req.Accept = AcceptHeader; - resp = (HttpWebResponse)req.GetResponse(); - bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json"; - if (!resp.Headers[HttpResponseHeader.ContentType].Contains("json")) + HttpResponseMessage httpResponseMessage; + + int redirects = 0; + int code; + string redirectedUrl = url; + + // Manually follow redirects because .NET Core refuses to auto-follow HTTPS->HTTP redirects. + do + { + HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, redirectedUrl); + httpRequestMessage.Headers.Add("Accept", AcceptHeader); + httpResponseMessage = await JSONUtils._HttpClient.SendAsync(httpRequestMessage); + if (httpResponseMessage.Headers.TryGetValues("Location", out var location)) + { + redirectedUrl = location.First(); + } + + code = (int)httpResponseMessage.StatusCode; + } while (redirects++ < MAX_REDIRECTS && code >= 300 && code < 400); + + if (redirects >= MAX_REDIRECTS) + { + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, $"Too many redirects - {url}"); + } + + if (code >= 400) + { + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, $"HTTP {code} {url}"); + } + + bool isJsonld = httpResponseMessage.Content.Headers.ContentType.MediaType == "application/ld+json"; + + // From RFC 6839, it looks like we should accept application/json and any MediaType ending in "+json". + if (httpResponseMessage.Content.Headers.ContentType.MediaType != "application/json" && !httpResponseMessage.Content.Headers.ContentType.MediaType.EndsWith("+json")) { throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); } - string[] linkHeaders = resp.Headers.GetValues("Link"); - if (!isJsonld && linkHeaders != null) + if (!isJsonld && httpResponseMessage.Headers.TryGetValues("Link", out var linkHeaders)) { linkHeaders = linkHeaders.SelectMany((h) => h.Split(",".ToCharArray())) .Select(h => h.Trim()).ToArray(); @@ -41,189 +83,27 @@ public virtual RemoteDocument LoadDocument(string url) } string header = linkedContexts.First(); string linkedUrl = header.Substring(1, header.IndexOf(">") - 1); - string resolvedUrl = URL.Resolve(url, linkedUrl); + string resolvedUrl = URL.Resolve(redirectedUrl, linkedUrl); var remoteContext = this.LoadDocument(resolvedUrl); doc.contextUrl = remoteContext.documentUrl; doc.context = remoteContext.document; } - Stream stream = resp.GetResponseStream(); + Stream stream = await httpResponseMessage.Content.ReadAsStreamAsync(); - doc.DocumentUrl = req.Address.ToString(); + doc.DocumentUrl = redirectedUrl; doc.Document = JSONUtils.FromInputStream(stream); } catch (JsonLdError) { throw; } - catch (WebException webException) - { - try - { - resp = (HttpWebResponse)webException.Response; - int baseStatusCode = (int)(Math.Floor((double)resp.StatusCode / 100)) * 100; - if (baseStatusCode == 300) - { - string location = resp.Headers[HttpResponseHeader.Location]; - if (!string.IsNullOrWhiteSpace(location)) - { - // TODO: Add recursion break or simply switch to HttpClient so we don't have to recurse on HTTP redirects. - return LoadDocument(location); - } - } - } - catch (Exception innerException) - { - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, innerException); - } - - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, webException); - } catch (Exception exception) { throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url, exception); } return doc; -#else - throw new PlatformNotSupportedException(); -#endif } - /// An HTTP Accept header that prefers JSONLD. - /// An HTTP Accept header that prefers JSONLD. - public const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; - -// private static volatile IHttpClient httpClient; - -// /// -// /// Returns a Map, List, or String containing the contents of the JSON -// /// resource resolved from the URL. -// /// -// /// -// /// Returns a Map, List, or String containing the contents of the JSON -// /// resource resolved from the URL. -// /// -// /// The URL to resolve -// /// -// /// The Map, List, or String that represent the JSON resource -// /// resolved from the URL -// /// -// /// If the JSON was not valid. -// /// -// /// If there was an error resolving the resource. -// /// -// public static object FromURL(URL url) -// { -// MappingJsonFactory jsonFactory = new MappingJsonFactory(); -// InputStream @in = OpenStreamFromURL(url); -// try -// { -// JsonParser parser = jsonFactory.CreateParser(@in); -// try -// { -// JsonToken token = parser.NextToken(); -// Type type; -// if (token == JsonToken.StartObject) -// { -// type = typeof(IDictionary); -// } -// else -// { -// if (token == JsonToken.StartArray) -// { -// type = typeof(IList); -// } -// else -// { -// type = typeof(string); -// } -// } -// return parser.ReadValueAs(type); -// } -// finally -// { -// parser.Close(); -// } -// } -// finally -// { -// @in.Close(); -// } -// } - -// /// -// /// Opens an -// /// Java.IO.InputStream -// /// for the given -// /// Java.Net.URL -// /// , including support -// /// for http and https URLs that are requested using Content Negotiation with -// /// application/ld+json as the preferred content type. -// /// -// /// The URL identifying the source. -// /// An InputStream containing the contents of the source. -// /// If there was an error resolving the URL. -// public static InputStream OpenStreamFromURL(URL url) -// { -// string protocol = url.GetProtocol(); -// if (!JsonLDNet.Shims.EqualsIgnoreCase(protocol, "http") && !JsonLDNet.Shims.EqualsIgnoreCase -// (protocol, "https")) -// { -// // Can't use the HTTP client for those! -// // Fallback to Java's built-in URL handler. No need for -// // Accept headers as it's likely to be file: or jar: -// return url.OpenStream(); -// } -// IHttpUriRequest request = new HttpGet(url.ToExternalForm()); -// // We prefer application/ld+json, but fallback to application/json -// // or whatever is available -// request.AddHeader("Accept", AcceptHeader); -// IHttpResponse response = GetHttpClient().Execute(request); -// int status = response.GetStatusLine().GetStatusCode(); -// if (status != 200 && status != 203) -// { -// throw new IOException("Can't retrieve " + url + ", status code: " + status); -// } -// return response.GetEntity().GetContent(); -// } - -// public static IHttpClient GetHttpClient() -// { -// IHttpClient result = httpClient; -// if (result == null) -// { -// lock (typeof(JSONUtils)) -// { -// result = httpClient; -// if (result == null) -// { -// // Uses Apache SystemDefaultHttpClient rather than -// // DefaultHttpClient, thus the normal proxy settings for the -// // JVM will be used -// DefaultHttpClient client = new SystemDefaultHttpClient(); -// // Support compressed data -// // http://hc.apache.org/httpcomponents-client-ga/tutorial/html/httpagent.html#d5e1238 -// client.AddRequestInterceptor(new RequestAcceptEncoding()); -// client.AddResponseInterceptor(new ResponseContentEncoding()); -// CacheConfig cacheConfig = new CacheConfig(); -// cacheConfig.SetMaxObjectSize(1024 * 128); -// // 128 kB -// cacheConfig.SetMaxCacheEntries(1000); -// // and allow caching -// httpClient = new CachingHttpClient(client, cacheConfig); -// result = httpClient; -// } -// } -// } -// return result; -// } - -// public static void SetHttpClient(IHttpClient nextHttpClient) -// { -// lock (typeof(JSONUtils)) -// { -// httpClient = nextHttpClient; -// } -// } } } diff --git a/src/json-ld.net/Util/JSONUtils.cs b/src/json-ld.net/Util/JSONUtils.cs index ef01ab5f..fda6a8c9 100644 --- a/src/json-ld.net/Util/JSONUtils.cs +++ b/src/json-ld.net/Util/JSONUtils.cs @@ -1,10 +1,13 @@ using System; using System.Collections; using System.IO; +using System.Linq; using JsonLD.Util; using Newtonsoft.Json; using System.Net; using Newtonsoft.Json.Linq; +using System.Net.Http; +using System.Threading.Tasks; namespace JsonLD.Util { @@ -12,28 +15,16 @@ namespace JsonLD.Util /// tristan public class JSONUtils { + const int MAX_REDIRECTS = 20; + static internal HttpClient _HttpClient = new HttpClient(); + /// An HTTP Accept header that prefers JSONLD. - /// An HTTP Accept header that prefers JSONLD. protected internal const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; - //private static readonly ObjectMapper JsonMapper = new ObjectMapper(); - - //private static readonly JsonFactory JsonFactory = new JsonFactory(JsonMapper); - static JSONUtils() { - // Disable default Jackson behaviour to close - // InputStreams/Readers/OutputStreams/Writers - //JsonFactory.Disable(JsonGenerator.Feature.AutoCloseTarget); - // Disable string retention features that may work for most JSON where - // the field names are in limited supply, but does not work for JSON-LD - // where a wide range of URIs are used for subjects and predicates - //JsonFactory.Disable(JsonFactory.Feature.InternFieldNames); - //JsonFactory.Disable(JsonFactory.Feature.CanonicalizeFieldNames); } - // private static volatile IHttpClient httpClient; - /// /// public static JToken FromString(string jsonString) @@ -130,6 +121,11 @@ public static string ToString(JToken obj) return sw.ToString(); } + public static JToken FromURL(Uri url) + { + return FromURLAsync(url).GetAwaiter().GetResult(); + } + /// /// Returns a Map, List, or String containing the contents of the JSON /// resource resolved from the URL. @@ -147,17 +143,29 @@ public static string ToString(JToken obj) /// /// If there was an error resolving the resource. /// - public static JToken FromURL(Uri url) + public static async Task FromURLAsync(Uri url) { -#if !PORTABLE && !IS_CORECLR - HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url); - req.Accept = AcceptHeader; - WebResponse resp = req.GetResponse(); - Stream stream = resp.GetResponseStream(); - return FromInputStream(stream); -#else - throw new PlatformNotSupportedException(); -#endif + HttpResponseMessage httpResponseMessage = null; + int redirects = 0; + + // Manually follow redirects because .NET Core refuses to auto-follow HTTPS->HTTP redirects. + do + { + HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, url); + httpRequestMessage.Headers.Add("Accept", AcceptHeader); + httpResponseMessage = await _HttpClient.SendAsync(httpRequestMessage); + if (httpResponseMessage.Headers.TryGetValues("Location", out var location)) + { + url = new Uri(location.First()); + } + } while (redirects++ < MAX_REDIRECTS && (int)httpResponseMessage.StatusCode >= 300 && (int)httpResponseMessage.StatusCode < 400); + + if (redirects >= MAX_REDIRECTS || (int)httpResponseMessage.StatusCode >= 400) + { + throw new InvalidOperationException("Couldn't load JSON from URL"); + } + + return FromInputStream(await httpResponseMessage.Content.ReadAsStreamAsync()); } } } diff --git a/test/json-ld.net.tests/ConformanceTests.cs b/test/json-ld.net.tests/ConformanceTests.cs index 09bcaf8b..86047654 100644 --- a/test/json-ld.net.tests/ConformanceTests.cs +++ b/test/json-ld.net.tests/ConformanceTests.cs @@ -60,11 +60,8 @@ public class ConformanceCases: IEnumerable "toRdf-manifest.jsonld", "fromRdf-manifest.jsonld", "normalize-manifest.jsonld", -// Test tests are not supported on CORE CLR -#if !PORTABLE && !IS_CORECLR "error-manifest.jsonld", "remote-doc-manifest.jsonld", -#endif }; public ConformanceCases() @@ -80,13 +77,18 @@ public IEnumerator GetEnumerator() foreach (string manifest in manifests) { JToken manifestJson = jsonFetcher.GetJson(manifest, rootDirectory); + var isRemoteTest = (string)manifestJson["name"] == "Remote document"; foreach (JObject testcase in manifestJson["sequence"]) { Func run; ConformanceCase newCase = new ConformanceCase(); - newCase.input = jsonFetcher.GetJson(testcase["input"], rootDirectory); + // Load input file if not remote test. Remote tests load from the web at test execution time. + if (!isRemoteTest) + { + newCase.input = jsonFetcher.GetJson(testcase["input"], rootDirectory); + } newCase.context = jsonFetcher.GetJson(testcase["context"], rootDirectory); newCase.frame = jsonFetcher.GetJson(testcase["frame"], rootDirectory); @@ -192,7 +194,7 @@ public IEnumerator GetEnumerator() run = () => { throw new Exception("Couldn't find a test type, apparently."); }; } - if ((string)manifestJson["name"] == "Remote document") + if (isRemoteTest) { Func innerRun = run; run = () => diff --git a/test/json-ld.net.tests/JsonFetcher.cs b/test/json-ld.net.tests/JsonFetcher.cs index 35ec3092..6e0ece0e 100644 --- a/test/json-ld.net.tests/JsonFetcher.cs +++ b/test/json-ld.net.tests/JsonFetcher.cs @@ -22,8 +22,8 @@ public JToken GetJson(JToken j, string rootDirectory) return JToken.ReadFrom(jreader); } } - catch (Exception e) - { // TODO: this should not be here, figure out why this is needed or catch specific exception. + catch (JsonReaderException) + { return null; } } diff --git a/test/json-ld.net.tests/NQuadsParserTests.cs b/test/json-ld.net.tests/NQuadsParserTests.cs index 860db433..5915d224 100644 --- a/test/json-ld.net.tests/NQuadsParserTests.cs +++ b/test/json-ld.net.tests/NQuadsParserTests.cs @@ -35,7 +35,7 @@ public NQuadsParserTests() } [Theory] - [MemberData("PositiveTestCases")] + [MemberData(nameof(PositiveTestCases))] public void PositiveParseTest(string path) { // given @@ -46,7 +46,7 @@ public void PositiveParseTest(string path) } [Theory] - [MemberData("NegativeTestCases")] + [MemberData(nameof(NegativeTestCases))] public void NegativeParseTest(string path) { // given From a11168a135f64551ae64089fcd8cb8949689724e Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Fri, 2 Oct 2020 11:10:28 -0700 Subject: [PATCH 086/255] Refactored HttpClient usage into utility class --- src/json-ld.net/Core/DocumentLoader.cs | 110 +++++++++++++------------ src/json-ld.net/Util/JSONUtils.cs | 28 +------ src/json-ld.net/Util/LDHttpClient.cs | 52 ++++++++++++ 3 files changed, 111 insertions(+), 79 deletions(-) create mode 100644 src/json-ld.net/Util/LDHttpClient.cs diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index 799e988e..d494cf22 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -15,11 +15,34 @@ namespace JsonLD.Core { public class DocumentLoader { - const int MAX_REDIRECTS = 20; + enum JsonLDContentType + { + JsonLD, + PlainJson, + Other + } - /// An HTTP Accept header that prefers JSONLD. - /// An HTTP Accept header that prefers JSONLD. - public const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; + JsonLDContentType GetJsonLDContentType(string contentTypeStr) + { + JsonLDContentType contentType; + + switch (contentTypeStr) + { + case "application/ld+json": + contentType = JsonLDContentType.JsonLD; + break; + // From RFC 6839, it looks like plain JSON is content type application/json and any MediaType ending in "+json". + case "application/json": + case string type when type.EndsWith("+json"): + contentType = JsonLDContentType.PlainJson; + break; + default: + contentType = JsonLDContentType.Other; + break; + } + + return contentType; + } /// public RemoteDocument LoadDocument(string url) @@ -31,68 +54,50 @@ public RemoteDocument LoadDocument(string url) public async Task LoadDocumentAsync(string url) { RemoteDocument doc = new RemoteDocument(url, null); - try { - HttpResponseMessage httpResponseMessage; + using (HttpResponseMessage response = await JsonLD.Util.LDHttpClient.FetchAsync(url)) + { - int redirects = 0; - int code; - string redirectedUrl = url; + var code = (int)response.StatusCode; - // Manually follow redirects because .NET Core refuses to auto-follow HTTPS->HTTP redirects. - do - { - HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, redirectedUrl); - httpRequestMessage.Headers.Add("Accept", AcceptHeader); - httpResponseMessage = await JSONUtils._HttpClient.SendAsync(httpRequestMessage); - if (httpResponseMessage.Headers.TryGetValues("Location", out var location)) + if (code >= 400) { - redirectedUrl = location.First(); + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, $"HTTP {code} {url}"); } - code = (int)httpResponseMessage.StatusCode; - } while (redirects++ < MAX_REDIRECTS && code >= 300 && code < 400); + var finalUrl = response.RequestMessage.RequestUri.ToString(); - if (redirects >= MAX_REDIRECTS) - { - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, $"Too many redirects - {url}"); - } + var contentType = GetJsonLDContentType(response.Content.Headers.ContentType.MediaType); - if (code >= 400) - { - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, $"HTTP {code} {url}"); - } - - bool isJsonld = httpResponseMessage.Content.Headers.ContentType.MediaType == "application/ld+json"; - - // From RFC 6839, it looks like we should accept application/json and any MediaType ending in "+json". - if (httpResponseMessage.Content.Headers.ContentType.MediaType != "application/json" && !httpResponseMessage.Content.Headers.ContentType.MediaType.EndsWith("+json")) - { - throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); - } + if (contentType == JsonLDContentType.Other) + { + throw new JsonLdError(JsonLdError.Error.LoadingDocumentFailed, url); + } - if (!isJsonld && httpResponseMessage.Headers.TryGetValues("Link", out var linkHeaders)) - { - linkHeaders = linkHeaders.SelectMany((h) => h.Split(",".ToCharArray())) - .Select(h => h.Trim()).ToArray(); - IEnumerable linkedContexts = linkHeaders.Where(v => v.EndsWith("rel=\"http://www.w3.org/ns/json-ld#context\"")); - if (linkedContexts.Count() > 1) + // For plain JSON, see if there's a context document linked in the HTTP response headers. + if (contentType == JsonLDContentType.PlainJson && response.Headers.TryGetValues("Link", out var linkHeaders)) { - throw new JsonLdError(JsonLdError.Error.MultipleContextLinkHeaders); + linkHeaders = linkHeaders.SelectMany((h) => h.Split(",".ToCharArray())) + .Select(h => h.Trim()).ToArray(); + IEnumerable linkedContexts = linkHeaders.Where(v => v.EndsWith("rel=\"http://www.w3.org/ns/json-ld#context\"")); + if (linkedContexts.Count() > 1) + { + throw new JsonLdError(JsonLdError.Error.MultipleContextLinkHeaders); + } + string header = linkedContexts.First(); + string linkedUrl = header.Substring(1, header.IndexOf(">") - 1); + string resolvedUrl = URL.Resolve(finalUrl, linkedUrl); + var remoteContext = this.LoadDocument(resolvedUrl); + doc.contextUrl = remoteContext.documentUrl; + doc.context = remoteContext.document; } - string header = linkedContexts.First(); - string linkedUrl = header.Substring(1, header.IndexOf(">") - 1); - string resolvedUrl = URL.Resolve(redirectedUrl, linkedUrl); - var remoteContext = this.LoadDocument(resolvedUrl); - doc.contextUrl = remoteContext.documentUrl; - doc.context = remoteContext.document; - } - Stream stream = await httpResponseMessage.Content.ReadAsStreamAsync(); + Stream stream = await response.Content.ReadAsStreamAsync(); - doc.DocumentUrl = redirectedUrl; - doc.Document = JSONUtils.FromInputStream(stream); + doc.DocumentUrl = finalUrl; + doc.Document = JSONUtils.FromInputStream(stream); + } } catch (JsonLdError) { @@ -104,6 +109,5 @@ public async Task LoadDocumentAsync(string url) } return doc; } - } } diff --git a/src/json-ld.net/Util/JSONUtils.cs b/src/json-ld.net/Util/JSONUtils.cs index fda6a8c9..ff1df8a7 100644 --- a/src/json-ld.net/Util/JSONUtils.cs +++ b/src/json-ld.net/Util/JSONUtils.cs @@ -15,12 +15,6 @@ namespace JsonLD.Util /// tristan public class JSONUtils { - const int MAX_REDIRECTS = 20; - static internal HttpClient _HttpClient = new HttpClient(); - - /// An HTTP Accept header that prefers JSONLD. - protected internal const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; - static JSONUtils() { } @@ -145,27 +139,9 @@ public static JToken FromURL(Uri url) /// public static async Task FromURLAsync(Uri url) { - HttpResponseMessage httpResponseMessage = null; - int redirects = 0; - - // Manually follow redirects because .NET Core refuses to auto-follow HTTPS->HTTP redirects. - do - { - HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, url); - httpRequestMessage.Headers.Add("Accept", AcceptHeader); - httpResponseMessage = await _HttpClient.SendAsync(httpRequestMessage); - if (httpResponseMessage.Headers.TryGetValues("Location", out var location)) - { - url = new Uri(location.First()); - } - } while (redirects++ < MAX_REDIRECTS && (int)httpResponseMessage.StatusCode >= 300 && (int)httpResponseMessage.StatusCode < 400); - - if (redirects >= MAX_REDIRECTS || (int)httpResponseMessage.StatusCode >= 400) - { - throw new InvalidOperationException("Couldn't load JSON from URL"); + using (var response = await LDHttpClient.FetchAsync(url.ToString())) { + return FromInputStream(await response.Content.ReadAsStreamAsync()); } - - return FromInputStream(await httpResponseMessage.Content.ReadAsStreamAsync()); } } } diff --git a/src/json-ld.net/Util/LDHttpClient.cs b/src/json-ld.net/Util/LDHttpClient.cs new file mode 100644 index 00000000..08623d91 --- /dev/null +++ b/src/json-ld.net/Util/LDHttpClient.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; + +namespace JsonLD.Util +{ + internal static class LDHttpClient + { + const string ACCEPT_HEADER = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1"; + const int MAX_REDIRECTS = 20; + + static HttpClient _hc; + + static LDHttpClient() + { + _hc = new HttpClient(); + _hc.DefaultRequestHeaders.Add("Accept", ACCEPT_HEADER); + } + + static public async Task FetchAsync(string url) + { + int redirects = 0; + int code; + string redirectedUrl = url; + + HttpResponseMessage response; + + // Manually follow redirects because .NET Core refuses to auto-follow HTTPS->HTTP redirects. + do + { + HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, redirectedUrl); + response = await _hc.SendAsync(httpRequestMessage); + if (response.Headers.TryGetValues("Location", out var location)) + { + redirectedUrl = location.First(); + } + + code = (int)response.StatusCode; + } while (redirects++ < MAX_REDIRECTS && code >= 300 && code < 400); + + if (redirects >= MAX_REDIRECTS) + { + throw new HttpRequestException("Too many redirects"); + } + + return response; + } + } +} From 2ab7e59b4654e0a383162f4a3b6bb8e95b8950bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 2 Oct 2020 22:03:14 +0200 Subject: [PATCH 087/255] Push packages on the master branch only --- .github/workflows/dotnet.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 194efc84..18697529 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -73,22 +73,25 @@ jobs: nuget-push-dev: runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') != true + if: github.ref == 'refs/heads/master' needs: build steps: - - uses: actions/download-artifact@v2 + - name: download artifact + uses: actions/download-artifact@v2 with: name: nugets - - uses: actions/setup-dotnet@v1 + - 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 }} - - run: dotnet nuget push "*.nupkg" --skip-duplicate --api-key ${{ 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 From d19bd8c698d0b3303cdcab652fbd99117cfeb51a Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Fri, 2 Oct 2020 13:42:13 -0700 Subject: [PATCH 088/255] Re-add virtual to intended overrideable methods While there are lots of places in the code where `virtual` is there simply because the Java auto-port treated an absence of `final` as intending overrideability, these two places are INTENDED override points. --- src/json-ld.net/Core/DocumentLoader.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index d494cf22..87af52bd 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -45,13 +45,13 @@ JsonLDContentType GetJsonLDContentType(string contentTypeStr) } /// - public RemoteDocument LoadDocument(string url) + public virtual RemoteDocument LoadDocument(string url) { return LoadDocumentAsync(url).GetAwaiter().GetResult(); } /// - public async Task LoadDocumentAsync(string url) + public virtual async Task LoadDocumentAsync(string url) { RemoteDocument doc = new RemoteDocument(url, null); try From 95f7f9dfe471d43cea895ae60301230db6672621 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Fri, 2 Oct 2020 14:31:42 -0700 Subject: [PATCH 089/255] Add `.ConfigureAwait(false)` everywhere we're doing async --- src/json-ld.net/Core/DocumentLoader.cs | 8 ++++---- src/json-ld.net/Util/JSONUtils.cs | 6 +++--- src/json-ld.net/Util/LDHttpClient.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/json-ld.net/Core/DocumentLoader.cs b/src/json-ld.net/Core/DocumentLoader.cs index 87af52bd..9c759ae9 100644 --- a/src/json-ld.net/Core/DocumentLoader.cs +++ b/src/json-ld.net/Core/DocumentLoader.cs @@ -47,7 +47,7 @@ JsonLDContentType GetJsonLDContentType(string contentTypeStr) /// public virtual RemoteDocument LoadDocument(string url) { - return LoadDocumentAsync(url).GetAwaiter().GetResult(); + return LoadDocumentAsync(url).ConfigureAwait(false).GetAwaiter().GetResult(); } /// @@ -56,7 +56,7 @@ public virtual async Task LoadDocumentAsync(string url) RemoteDocument doc = new RemoteDocument(url, null); try { - using (HttpResponseMessage response = await JsonLD.Util.LDHttpClient.FetchAsync(url)) + using (HttpResponseMessage response = await JsonLD.Util.LDHttpClient.FetchAsync(url).ConfigureAwait(false)) { var code = (int)response.StatusCode; @@ -88,12 +88,12 @@ public virtual async Task LoadDocumentAsync(string url) string header = linkedContexts.First(); string linkedUrl = header.Substring(1, header.IndexOf(">") - 1); string resolvedUrl = URL.Resolve(finalUrl, linkedUrl); - var remoteContext = this.LoadDocument(resolvedUrl); + var remoteContext = await this.LoadDocumentAsync(resolvedUrl).ConfigureAwait(false); doc.contextUrl = remoteContext.documentUrl; doc.context = remoteContext.document; } - Stream stream = await response.Content.ReadAsStreamAsync(); + Stream stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false); doc.DocumentUrl = finalUrl; doc.Document = JSONUtils.FromInputStream(stream); diff --git a/src/json-ld.net/Util/JSONUtils.cs b/src/json-ld.net/Util/JSONUtils.cs index ff1df8a7..b0325d8d 100644 --- a/src/json-ld.net/Util/JSONUtils.cs +++ b/src/json-ld.net/Util/JSONUtils.cs @@ -117,7 +117,7 @@ public static string ToString(JToken obj) public static JToken FromURL(Uri url) { - return FromURLAsync(url).GetAwaiter().GetResult(); + return FromURLAsync(url).ConfigureAwait(false).GetAwaiter().GetResult(); } /// @@ -139,8 +139,8 @@ public static JToken FromURL(Uri url) /// public static async Task FromURLAsync(Uri url) { - using (var response = await LDHttpClient.FetchAsync(url.ToString())) { - return FromInputStream(await response.Content.ReadAsStreamAsync()); + using (var response = await LDHttpClient.FetchAsync(url.ToString()).ConfigureAwait(false)) { + return FromInputStream(await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); } } } diff --git a/src/json-ld.net/Util/LDHttpClient.cs b/src/json-ld.net/Util/LDHttpClient.cs index 08623d91..170faa9a 100644 --- a/src/json-ld.net/Util/LDHttpClient.cs +++ b/src/json-ld.net/Util/LDHttpClient.cs @@ -32,7 +32,7 @@ static public async Task FetchAsync(string url) do { HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, redirectedUrl); - response = await _hc.SendAsync(httpRequestMessage); + response = await _hc.SendAsync(httpRequestMessage).ConfigureAwait(false); if (response.Headers.TryGetValues("Location", out var location)) { redirectedUrl = location.First(); From 28502b78d4d3f479a58157ca7945824f97ebf08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 2 Oct 2020 22:43:01 +0200 Subject: [PATCH 090/255] Exempt issues that have an assignee or milestone --- .github/stale.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index cff40f55..09785f4e 100644 --- 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 From 26c06680037fd302df4ee924fe65d1f3c652b241 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sun, 4 Oct 2020 13:05:02 -0700 Subject: [PATCH 091/255] Reduce netstandard version to 1.1 --- src/json-ld.net/json-ld.net.csproj | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 62f84ac8..1baece3b 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -5,36 +5,27 @@ Implements the W3C JSON-LD 1.0 standard. 1.0.7 NuGet;linked-data-dotnet - netstandard1.3;netstandard2.0;netcoreapp2.1 + netstandard1.1;netstandard2.0 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web http://json-ld.org/images/json-ld-logo-64.png https://github.com/linked-data-dotnet/json-ld.net/ https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - 1.6.0 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.6.0 false false false https://github.com/linked-data-dotnet/json-ld.net + + $(DefineConstants);IS_CORECLR + - - - - - - $(DefineConstants);PORTABLE - - - $(DefineConstants);IS_CORECLR - - - + - From 7a8f9ae0803503cd448182086d33eb94c2cb2380 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sun, 4 Oct 2020 14:05:06 -0700 Subject: [PATCH 092/255] Remove obsolete PORTABLE and IS_CORECLR defines --- src/json-ld.net/Core/Context.cs | 3 --- src/json-ld.net/Core/JsonLdApi.cs | 4 ---- src/json-ld.net/Core/JsonLdProcessor.cs | 8 -------- src/json-ld.net/Core/NormalizeUtils.cs | 12 ------------ src/json-ld.net/Util/JavaCompat.cs | 11 ----------- src/json-ld.net/json-ld.net.csproj | 3 --- 6 files changed, 41 deletions(-) diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs index ad69599d..48bd4471 100644 --- a/src/json-ld.net/Core/Context.cs +++ b/src/json-ld.net/Core/Context.cs @@ -14,9 +14,6 @@ namespace JsonLD.Core /// tristan //[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 index 6672070a..6c595f69 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -2196,7 +2196,6 @@ public virtual RDFDataset ToRDF() /// public virtual object Normalize(RDFDataset dataset) { -#if !PORTABLE // create quads and map bnodes to their associated quads IList quads = new List(); IDictionary> bnodes = new Dictionary>(); @@ -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 index b77acbb1..5ba2e7b0 100644 --- 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) /// 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 } /// 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 index bf746edc..6d6adce1 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -29,7 +29,6 @@ public NormalizeUtils(IList quads, IDictionary public virtual object HashBlankNodes(IEnumerable unnamed_) { -#if !PORTABLE IList unnamed = new List(unnamed_); IList nextUnnamed = new List(); IDictionary> duplicates = new Dictionary unnamed_) } } } -#else - throw new PlatformNotSupportedException(); -#endif } private sealed class _IComparer_145 : IComparer @@ -245,7 +241,6 @@ private class HashResult /// (err, result) called once the operation completes. private static NormalizeUtils.HashResult HashPaths(string id, IDictionary> bnodes, UniqueNamer namer, UniqueNamer pathNamer) { -#if !PORTABLE MessageDigest md = null; try @@ -460,9 +455,6 @@ private static NormalizeUtils.HashResult HashPaths(string id, IDictionaryHashes all of the quads about a blank node. @@ -500,7 +492,6 @@ private static string HashQuads(string id, IDictionary private static string Sha1hash(ICollection nquads) { -#if !PORTABLE try { // create SHA-1 digest @@ -515,9 +506,6 @@ private static string Sha1hash(ICollection 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 index 90e4c48f..3c6e0102 100644 --- 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 index 1baece3b..14176aa3 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -19,9 +19,6 @@ Implements the W3C JSON-LD 1.0 standard. false https://github.com/linked-data-dotnet/json-ld.net - - $(DefineConstants);IS_CORECLR - From cc4cf000e5fa2b83a16f96c7320ccbed3daed419 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 12:29:05 -0700 Subject: [PATCH 093/255] Trim more legacy support out of csproj --- src/json-ld.net/json-ld.net.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 14176aa3..d9b94b23 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -13,7 +13,6 @@ Implements the W3C JSON-LD 1.0 standard. https://github.com/linked-data-dotnet/json-ld.net/ https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE $(PackageTargetFallback);dnxcore50;portable-net45+win8 - 1.6.0 false false false From 6add465cbc92e95860b7918cfd22b298843d1941 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 13:47:01 -0700 Subject: [PATCH 094/255] Add support for .NET Framework 4.0 --- src/json-ld.net/json-ld.net.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index d9b94b23..3fc28a80 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -5,7 +5,7 @@ Implements the W3C JSON-LD 1.0 standard. 1.0.7 NuGet;linked-data-dotnet - netstandard1.1;netstandard2.0 + netstandard1.1;netstandard2.0;net40 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web @@ -24,4 +24,9 @@ Implements the W3C JSON-LD 1.0 standard. + + + + + From 580bc7c7a4deb1bacffbc388a86eeb8707c3c871 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Fri, 2 Oct 2020 15:26:47 -0700 Subject: [PATCH 095/255] Add Dockerfile to enable local linux testing on Windows --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..1680d804 --- /dev/null +++ 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 From 8d11bad6bdd819235dfdfb02d07518f696a697d3 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sat, 3 Oct 2020 20:47:48 -0700 Subject: [PATCH 096/255] Added tests for Dockerfile --- test/json-ld.net.tests/DockerTests.cs | 83 +++++++++++++++++++ .../json-ld.net.tests.csproj | 2 + 2 files changed, 85 insertions(+) create mode 100644 test/json-ld.net.tests/DockerTests.cs diff --git a/test/json-ld.net.tests/DockerTests.cs b/test/json-ld.net.tests/DockerTests.cs new file mode 100644 index 00000000..07256fce --- /dev/null +++ b/test/json-ld.net.tests/DockerTests.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.IO; +using System.Linq.Expressions; +using System.Text; +using Xunit; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace JsonLD.Test +{ + public class DockerTests + { + private readonly ITestOutputHelper output; + + public DockerTests(ITestOutputHelper output) + { + this.output = output; + } + + [SkippableFact] + public void DockerBuild() + { + try + { + var exit = ExecDocker("build -t json-ld.net ."); + Assert.Equal(0, exit); + } + catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") + { + Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); + } + } + + [SkippableFact] + public void DockerTest() + { + try + { + // --filter option required to avoid going full inception and + // testing a container inside a container inside a conta... + var exit = ExecDocker($"run --rm json-ld.net dotnet test --filter FullyQualifiedName!~{nameof(DockerTests)}"); + Assert.Equal(0, exit); + } + catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") + { + Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); + } + } + + private int ExecDocker(string args) + { + var workspace = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"); + if (string.IsNullOrEmpty(workspace)) + { + // Current directory for test context is usually REPO_HOME/test/json-ld.net.tests/bin/Release/netcoreapp2.1, + // and we want just REPO_HOME. + workspace = Path.Combine(Directory.GetCurrentDirectory(), "../../../../.."); + } + + var process = Process.Start(new ProcessStartInfo + { + UseShellExecute = false, + RedirectStandardOutput = true, + RedirectStandardError = true, + WorkingDirectory = workspace, + FileName = "docker", + Arguments = args + }); + + process.WaitForExit(); + + output.WriteLine("=======STDOUT======="); + output.WriteLine(process.StandardOutput.ReadToEnd()); + output.WriteLine("\n\n\n\n=======STDERR======="); + output.WriteLine(process.StandardError.ReadToEnd()); + + return process.ExitCode; + } + } +} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 2195496c..4f398f1a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -7,6 +7,7 @@ false false true + JsonLD.Test @@ -24,6 +25,7 @@ + From 72b23a09878bf817b3adca7ca1a5716c04448ca5 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 15:58:37 -0700 Subject: [PATCH 097/255] Add GitHub action workflow to test Dockerfile --- .github/workflows/docker.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..e39e5d1e --- /dev/null +++ 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 \ No newline at end of file From 73509608b64ca2839a1b1804490a9c007cecb57c Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 15:59:49 -0700 Subject: [PATCH 098/255] Remove docker xunit tests --- test/json-ld.net.tests/DockerTests.cs | 83 ------------------- .../json-ld.net.tests.csproj | 1 - 2 files changed, 84 deletions(-) delete mode 100644 test/json-ld.net.tests/DockerTests.cs diff --git a/test/json-ld.net.tests/DockerTests.cs b/test/json-ld.net.tests/DockerTests.cs deleted file mode 100644 index 07256fce..00000000 --- a/test/json-ld.net.tests/DockerTests.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using System.Linq.Expressions; -using System.Text; -using Xunit; -using Xunit.Abstractions; -using Xunit.Sdk; - -namespace JsonLD.Test -{ - public class DockerTests - { - private readonly ITestOutputHelper output; - - public DockerTests(ITestOutputHelper output) - { - this.output = output; - } - - [SkippableFact] - public void DockerBuild() - { - try - { - var exit = ExecDocker("build -t json-ld.net ."); - Assert.Equal(0, exit); - } - catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") - { - Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); - } - } - - [SkippableFact] - public void DockerTest() - { - try - { - // --filter option required to avoid going full inception and - // testing a container inside a container inside a conta... - var exit = ExecDocker($"run --rm json-ld.net dotnet test --filter FullyQualifiedName!~{nameof(DockerTests)}"); - Assert.Equal(0, exit); - } - catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") - { - Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); - } - } - - private int ExecDocker(string args) - { - var workspace = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"); - if (string.IsNullOrEmpty(workspace)) - { - // Current directory for test context is usually REPO_HOME/test/json-ld.net.tests/bin/Release/netcoreapp2.1, - // and we want just REPO_HOME. - workspace = Path.Combine(Directory.GetCurrentDirectory(), "../../../../.."); - } - - var process = Process.Start(new ProcessStartInfo - { - UseShellExecute = false, - RedirectStandardOutput = true, - RedirectStandardError = true, - WorkingDirectory = workspace, - FileName = "docker", - Arguments = args - }); - - process.WaitForExit(); - - output.WriteLine("=======STDOUT======="); - output.WriteLine(process.StandardOutput.ReadToEnd()); - output.WriteLine("\n\n\n\n=======STDERR======="); - output.WriteLine(process.StandardError.ReadToEnd()); - - return process.ExitCode; - } - } -} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4f398f1a..6e77e310 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -25,7 +25,6 @@ - From 86710242d00088b7c6837660c36839381a78bd62 Mon Sep 17 00:00:00 2001 From: Pavlo Datsiuk Date: Thu, 25 Jun 2020 12:30:05 +0300 Subject: [PATCH 099/255] [COMMIT] The proj files have been updated to enable SourceLink [json-ld.net.csproj] --- src/json-ld.net/json-ld.net.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 3fc28a80..782628eb 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -17,7 +17,15 @@ Implements the W3C JSON-LD 1.0 standard. false false https://github.com/linked-data-dotnet/json-ld.net + true + true + snupkg + + + + + From 950223a314b26d6a15b45edae16869478b717981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Sun, 4 Oct 2020 01:16:55 +0200 Subject: [PATCH 100/255] Merge pull request #58 from linked-data-dotnet/feature/release-workflow Add release workflow --- .github/workflows/dotnet.yml | 133 +++++++++++++++++++++++++---- src/json-ld.net/json-ld.net.csproj | 3 +- 2 files changed, 118 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1ca89c87..18697529 100644 --- 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/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 3bd4f7cf..62f84ac8 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -17,6 +17,7 @@ Implements the W3C JSON-LD 1.0 standard. false false false + https://github.com/linked-data-dotnet/json-ld.net @@ -36,4 +37,4 @@ Implements the W3C JSON-LD 1.0 standard. - \ No newline at end of file + From 54b278eb3acccd06373feed659978a4fade38250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 2 Oct 2020 22:43:01 +0200 Subject: [PATCH 101/255] Exempt issues that have an assignee or milestone --- .github/stale.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index cff40f55..09785f4e 100644 --- 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 From 01c644f4f9d7ee8e51e51e88e7c8e3999dbb67a6 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sun, 4 Oct 2020 13:05:02 -0700 Subject: [PATCH 102/255] Reduce netstandard version to 1.1 --- src/json-ld.net/json-ld.net.csproj | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 62f84ac8..1baece3b 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -5,36 +5,27 @@ Implements the W3C JSON-LD 1.0 standard. 1.0.7 NuGet;linked-data-dotnet - netstandard1.3;netstandard2.0;netcoreapp2.1 + netstandard1.1;netstandard2.0 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web http://json-ld.org/images/json-ld-logo-64.png https://github.com/linked-data-dotnet/json-ld.net/ https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - 1.6.0 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.6.0 false false false https://github.com/linked-data-dotnet/json-ld.net + + $(DefineConstants);IS_CORECLR + - - - - - - $(DefineConstants);PORTABLE - - - $(DefineConstants);IS_CORECLR - - - + - From 1e6504458907f5e1fe5de8a1cff64481c8847e87 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sun, 4 Oct 2020 14:05:06 -0700 Subject: [PATCH 103/255] Remove obsolete PORTABLE and IS_CORECLR defines --- src/json-ld.net/Core/Context.cs | 3 --- src/json-ld.net/Core/JsonLdApi.cs | 4 ---- src/json-ld.net/Core/JsonLdProcessor.cs | 8 -------- src/json-ld.net/Core/NormalizeUtils.cs | 12 ------------ src/json-ld.net/Util/JavaCompat.cs | 11 ----------- src/json-ld.net/json-ld.net.csproj | 3 --- 6 files changed, 41 deletions(-) diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs index ee3fb67d..5c096c30 100644 --- a/src/json-ld.net/Core/Context.cs +++ b/src/json-ld.net/Core/Context.cs @@ -14,9 +14,6 @@ namespace JsonLD.Core /// tristan //[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 index 6672070a..6c595f69 100644 --- a/src/json-ld.net/Core/JsonLdApi.cs +++ b/src/json-ld.net/Core/JsonLdApi.cs @@ -2196,7 +2196,6 @@ public virtual RDFDataset ToRDF() /// public virtual object Normalize(RDFDataset dataset) { -#if !PORTABLE // create quads and map bnodes to their associated quads IList quads = new List(); IDictionary> bnodes = new Dictionary>(); @@ -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 index b77acbb1..5ba2e7b0 100644 --- 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) /// 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 } /// 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 index bf746edc..6d6adce1 100644 --- a/src/json-ld.net/Core/NormalizeUtils.cs +++ b/src/json-ld.net/Core/NormalizeUtils.cs @@ -29,7 +29,6 @@ public NormalizeUtils(IList quads, IDictionary public virtual object HashBlankNodes(IEnumerable unnamed_) { -#if !PORTABLE IList unnamed = new List(unnamed_); IList nextUnnamed = new List(); IDictionary> duplicates = new Dictionary unnamed_) } } } -#else - throw new PlatformNotSupportedException(); -#endif } private sealed class _IComparer_145 : IComparer @@ -245,7 +241,6 @@ private class HashResult /// (err, result) called once the operation completes. private static NormalizeUtils.HashResult HashPaths(string id, IDictionary> bnodes, UniqueNamer namer, UniqueNamer pathNamer) { -#if !PORTABLE MessageDigest md = null; try @@ -460,9 +455,6 @@ private static NormalizeUtils.HashResult HashPaths(string id, IDictionaryHashes all of the quads about a blank node. @@ -500,7 +492,6 @@ private static string HashQuads(string id, IDictionary private static string Sha1hash(ICollection nquads) { -#if !PORTABLE try { // create SHA-1 digest @@ -515,9 +506,6 @@ private static string Sha1hash(ICollection 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 index 90e4c48f..3c6e0102 100644 --- 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 index 1baece3b..14176aa3 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -19,9 +19,6 @@ Implements the W3C JSON-LD 1.0 standard. false https://github.com/linked-data-dotnet/json-ld.net - - $(DefineConstants);IS_CORECLR - From 7a687a5ab3373bda333155691519cab4caca50a0 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 12:29:05 -0700 Subject: [PATCH 104/255] Trim more legacy support out of csproj --- src/json-ld.net/json-ld.net.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 14176aa3..d9b94b23 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -13,7 +13,6 @@ Implements the W3C JSON-LD 1.0 standard. https://github.com/linked-data-dotnet/json-ld.net/ https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE $(PackageTargetFallback);dnxcore50;portable-net45+win8 - 1.6.0 false false false From f2fe26a77b2f24e1528612c94303ab19eb524ea8 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 13:47:01 -0700 Subject: [PATCH 105/255] Add support for .NET Framework 4.0 --- src/json-ld.net/json-ld.net.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index d9b94b23..3fc28a80 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -5,7 +5,7 @@ Implements the W3C JSON-LD 1.0 standard. 1.0.7 NuGet;linked-data-dotnet - netstandard1.1;netstandard2.0 + netstandard1.1;netstandard2.0;net40 json-ld.net json-ld.net json-ld;jsonld;json;linked-data;rdf;semantic;web @@ -24,4 +24,9 @@ Implements the W3C JSON-LD 1.0 standard. + + + + + From cd7ed045804d9b3287ee1957b538dbc2e101bd43 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Fri, 2 Oct 2020 15:26:47 -0700 Subject: [PATCH 106/255] Add Dockerfile to enable local linux testing on Windows --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..1680d804 --- /dev/null +++ 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 From 64f02a5813a5b8269ed10ccc6145d6ac99567d61 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Sat, 3 Oct 2020 20:47:48 -0700 Subject: [PATCH 107/255] Added tests for Dockerfile --- test/json-ld.net.tests/DockerTests.cs | 83 +++++++++++++++++++ .../json-ld.net.tests.csproj | 2 + 2 files changed, 85 insertions(+) create mode 100644 test/json-ld.net.tests/DockerTests.cs diff --git a/test/json-ld.net.tests/DockerTests.cs b/test/json-ld.net.tests/DockerTests.cs new file mode 100644 index 00000000..07256fce --- /dev/null +++ b/test/json-ld.net.tests/DockerTests.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.IO; +using System.Linq.Expressions; +using System.Text; +using Xunit; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace JsonLD.Test +{ + public class DockerTests + { + private readonly ITestOutputHelper output; + + public DockerTests(ITestOutputHelper output) + { + this.output = output; + } + + [SkippableFact] + public void DockerBuild() + { + try + { + var exit = ExecDocker("build -t json-ld.net ."); + Assert.Equal(0, exit); + } + catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") + { + Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); + } + } + + [SkippableFact] + public void DockerTest() + { + try + { + // --filter option required to avoid going full inception and + // testing a container inside a container inside a conta... + var exit = ExecDocker($"run --rm json-ld.net dotnet test --filter FullyQualifiedName!~{nameof(DockerTests)}"); + Assert.Equal(0, exit); + } + catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") + { + Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); + } + } + + private int ExecDocker(string args) + { + var workspace = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"); + if (string.IsNullOrEmpty(workspace)) + { + // Current directory for test context is usually REPO_HOME/test/json-ld.net.tests/bin/Release/netcoreapp2.1, + // and we want just REPO_HOME. + workspace = Path.Combine(Directory.GetCurrentDirectory(), "../../../../.."); + } + + var process = Process.Start(new ProcessStartInfo + { + UseShellExecute = false, + RedirectStandardOutput = true, + RedirectStandardError = true, + WorkingDirectory = workspace, + FileName = "docker", + Arguments = args + }); + + process.WaitForExit(); + + output.WriteLine("=======STDOUT======="); + output.WriteLine(process.StandardOutput.ReadToEnd()); + output.WriteLine("\n\n\n\n=======STDERR======="); + output.WriteLine(process.StandardError.ReadToEnd()); + + return process.ExitCode; + } + } +} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 2195496c..4f398f1a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -7,6 +7,7 @@ false false true + JsonLD.Test @@ -24,6 +25,7 @@ + From c631361a0f15a93521d80c5cdc32ce2d11f6bd45 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 15:58:37 -0700 Subject: [PATCH 108/255] Add GitHub action workflow to test Dockerfile --- .github/workflows/docker.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..e39e5d1e --- /dev/null +++ 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 \ No newline at end of file From 83b110ebd0e0a1957e7accb191306aad7205823e Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 15:59:49 -0700 Subject: [PATCH 109/255] Remove docker xunit tests --- test/json-ld.net.tests/DockerTests.cs | 83 ------------------- .../json-ld.net.tests.csproj | 1 - 2 files changed, 84 deletions(-) delete mode 100644 test/json-ld.net.tests/DockerTests.cs diff --git a/test/json-ld.net.tests/DockerTests.cs b/test/json-ld.net.tests/DockerTests.cs deleted file mode 100644 index 07256fce..00000000 --- a/test/json-ld.net.tests/DockerTests.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using System.Linq.Expressions; -using System.Text; -using Xunit; -using Xunit.Abstractions; -using Xunit.Sdk; - -namespace JsonLD.Test -{ - public class DockerTests - { - private readonly ITestOutputHelper output; - - public DockerTests(ITestOutputHelper output) - { - this.output = output; - } - - [SkippableFact] - public void DockerBuild() - { - try - { - var exit = ExecDocker("build -t json-ld.net ."); - Assert.Equal(0, exit); - } - catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") - { - Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); - } - } - - [SkippableFact] - public void DockerTest() - { - try - { - // --filter option required to avoid going full inception and - // testing a container inside a container inside a conta... - var exit = ExecDocker($"run --rm json-ld.net dotnet test --filter FullyQualifiedName!~{nameof(DockerTests)}"); - Assert.Equal(0, exit); - } - catch (Win32Exception ex) when (ex.Message == "The system cannot find the file specified") - { - Skip.If(true, "Couldn't find docker in your path.\nThis is only required for building/testing inside a docker container."); - } - } - - private int ExecDocker(string args) - { - var workspace = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"); - if (string.IsNullOrEmpty(workspace)) - { - // Current directory for test context is usually REPO_HOME/test/json-ld.net.tests/bin/Release/netcoreapp2.1, - // and we want just REPO_HOME. - workspace = Path.Combine(Directory.GetCurrentDirectory(), "../../../../.."); - } - - var process = Process.Start(new ProcessStartInfo - { - UseShellExecute = false, - RedirectStandardOutput = true, - RedirectStandardError = true, - WorkingDirectory = workspace, - FileName = "docker", - Arguments = args - }); - - process.WaitForExit(); - - output.WriteLine("=======STDOUT======="); - output.WriteLine(process.StandardOutput.ReadToEnd()); - output.WriteLine("\n\n\n\n=======STDERR======="); - output.WriteLine(process.StandardError.ReadToEnd()); - - return process.ExitCode; - } - } -} diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4f398f1a..6e77e310 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -25,7 +25,6 @@ - From 15fcbd03cd83cb7540806239b84d6ffc08837875 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 06:31:07 +0000 Subject: [PATCH 110/255] Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 6e77e310..77e81f23 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From c6597af57e12d65045b1bf910c4e06896b7e38f9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 11:09:12 +0000 Subject: [PATCH 111/255] Bump gittools/actions from v0.9.4 to v0.9.7 Bumps [gittools/actions](https://github.com/gittools/actions) from v0.9.4 to v0.9.7. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.4...62f943a7b7e1981bb87a8314f304524657551786) Signed-off-by: dependabot-preview[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 18697529..6089b081 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.4 + - uses: gittools/actions/gitversion/setup@v0.9.7 with: versionSpec: "5.x" - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.4 + uses: gittools/actions/gitversion/execute@v0.9.7 - uses: actions/setup-dotnet@v1 with: From 3ee0937f7ea204313d46245a04684e63ac67aa55 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 11:14:05 +0000 Subject: [PATCH 112/255] Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 77e81f23..24c2ce0c 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 90034137d815a339fd6f8a5dc72e586c6c04396e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 22 Feb 2021 06:07:31 +0000 Subject: [PATCH 113/255] Bump coverlet.msbuild from 2.9.0 to 3.0.3 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 2.9.0 to 3.0.3. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 24c2ce0c..55d170ef 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From fe7d380e76290f6342f2f9693c46c8e6f5a3f00c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 13:39:53 +0000 Subject: [PATCH 114/255] Create Dependabot config file --- .github/dependabot.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..edf3069b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,25 @@ +version: 2 +updates: +- package-ecosystem: nuget + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + ignore: + - dependency-name: Newtonsoft.Json + versions: + - ">= 10.a" + - "< 11" + - dependency-name: Newtonsoft.Json + versions: + - ">= 11.a" + - "< 12" + - dependency-name: Newtonsoft.Json + versions: + - ">= 12.0.a" + - "< 12.1" +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 From 5d4a78f9183a7dce99702ecf5d1d73730ad234c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 23 Apr 2021 09:52:59 +0200 Subject: [PATCH 115/255] Add Tomasz Pluskiewicz as code owner Add @tpluscode as code owner --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 903f3f58..5629666f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @asbjornu @goofballlogic +* @asbjornu @goofballlogic @tpluscode From 34873703d6f0bd247057374e1b32e02bec6c87a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 21 Apr 2021 23:58:36 +0200 Subject: [PATCH 116/255] Rename `master` to `main` --- .github/workflows/docker.yml | 6 +++--- .github/workflows/dotnet.yml | 6 +++--- README.md | 4 ++-- src/json-ld.net/json-ld.net.csproj | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e39e5d1e..2f6d0800 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,10 +2,10 @@ name: docker on: push: - branches: [master] + branches: [main] tags: ["*"] pull_request: - branches: [master] + branches: [main] jobs: docker: @@ -18,4 +18,4 @@ jobs: - name: docker build run: docker build -t json-ld.net . - name: docker test - run: docker run --rm json-ld.net dotnet test \ No newline at end of file + run: docker run --rm json-ld.net dotnet test diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6089b081..5c8c6af4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,10 +2,10 @@ name: dotnet on: push: - branches: [master] + branches: [main] tags: ["*"] pull_request: - branches: [master] + branches: [main] jobs: build: @@ -73,7 +73,7 @@ jobs: nuget-push-dev: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: build steps: diff --git a/README.md b/README.md index 39870e7d..359b0779 100644 --- a/README.md +++ b/README.md @@ -673,7 +673,7 @@ https://github.com/linked-data-dotnet/json-ld.net [coc]: https://opensource.microsoft.com/codeofconduct/ [coc-faq]: https://opensource.microsoft.com/codeofconduct/faq/ [codecov]: https://codecov.io/gh/linked-data-dotnet/json-ld.net - [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/master.svg + [codecov-badge]: https://img.shields.io/codecov/c/github/linked-data-dotnet/json-ld.net/main.svg [errata]: http://www.w3.org/2014/json-ld-errata @@ -707,5 +707,5 @@ https://github.com/linked-data-dotnet/json-ld.net [sharpen]: http://community.versant.com/Projects/html/projectspaces/db4o_product_design/sharpen.html - [test-runner]: https://github.com/linked-data-dotnet/json-ld.net/tree/master/test/json-ld.net.tests + [test-runner]: https://github.com/linked-data-dotnet/json-ld.net/tree/main/test/json-ld.net.tests [wg-test-suite]: https://github.com/w3c/json-ld-api/tree/master/tests diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 782628eb..fa80bcb7 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -11,7 +11,7 @@ Implements the W3C JSON-LD 1.0 standard. json-ld;jsonld;json;linked-data;rdf;semantic;web http://json-ld.org/images/json-ld-logo-64.png https://github.com/linked-data-dotnet/json-ld.net/ - https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE + https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/main/LICENSE $(PackageTargetFallback);dnxcore50;portable-net45+win8 false false From cd02919636dd5857145298228dab880f6e0d148f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 22 Apr 2021 00:01:05 +0200 Subject: [PATCH 117/255] Bump GitVersion from v0.9.7 to v0.9.9 --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5c8c6af4..ad91a599 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.7 + - uses: gittools/actions/gitversion/setup@v0.9.9 with: - versionSpec: "5.x" + versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.7 + uses: gittools/actions/gitversion/execute@v0.9.9 - uses: actions/setup-dotnet@v1 with: From e04aa84f807f906c34926254de505028d4714623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 22 Apr 2021 00:04:41 +0200 Subject: [PATCH 118/255] Bump .NET Core from v2.1.401 to v2.1.815 Hopefully resolves the [No usable version of the libssl was found][1] error. See [this issue][2] for details. [1]: https://github.com/linked-data-dotnet/json-ld.net/pull/103/checks?check_run_id=2404778423#step:7:71 [2]: https://github.com/dotnet/corert/issues/7141 --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ad91a599..e7e7b600 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: - dotnet-version: 2.1.401 + dotnet-version: 2.1.815 - uses: actions/cache@v2 env: From 323cf6f73c714d7b76c6d7ad3fe48749793c0ffc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Apr 2021 08:25:44 +0000 Subject: [PATCH 119/255] Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.4 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.4. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.4) Signed-off-by: dependabot-preview[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 55d170ef..f167cb87 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From e9f0c4b0be5dd72dacf515bef922d67878af90e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Apr 2021 08:34:32 +0000 Subject: [PATCH 120/255] Bump cirrus-actions/rebase from 1.3 to 1.4 Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.3 to 1.4. - [Release notes](https://github.com/cirrus-actions/rebase/releases) - [Commits](https://github.com/cirrus-actions/rebase/compare/1.3...7cea12ac34ab078fa37e87798d8986185afa7bf2) Signed-off-by: dependabot[bot] --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 1bbb4658..35868e81 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@1.3 + uses: cirrus-actions/rebase@1.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.amrom.workers.devmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 From 4198f9aa9f7ee32d93834d7b8ca8eaafa9415b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 5 May 2021 11:36:06 +0200 Subject: [PATCH 121/255] Exempt planning from becoming stale --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 09785f4e..5daeec95 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -9,6 +9,7 @@ exemptLabels: - pinned - security - bug + - planning # Set to true to ignore issues in a milestone (defaults to false) exemptMilestones: true From 24b7acdfb79c821d1f057ca9646055a2feb0353b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 08:04:41 +0000 Subject: [PATCH 122/255] Bump Microsoft.NETFramework.ReferenceAssemblies from 1.0.0 to 1.0.1 Bumps [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index fa80bcb7..e2941fad 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -33,7 +33,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From a6fb1c96a415d07a94cc2ea4ad8e3984c3a953ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 06:18:08 +0000 Subject: [PATCH 123/255] Bump actions/checkout from 2 to 2.3.4 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4) Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- .github/workflows/dotnet.yml | 2 +- .github/workflows/rebase.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2f6d0800..e4281733 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: name: build & run tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - name: docker build diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e7e7b600..b76d8b45 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -15,7 +15,7 @@ jobs: fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 35868e81..704c66a1 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -10,7 +10,7 @@ jobs: if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - name: Automatic Rebase From d2e205b716ef7bdaaf1bae91e7e1a3ace6c4ca73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 11:26:10 +0000 Subject: [PATCH 124/255] Bump actions/setup-dotnet from 1 to 1.8.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1 to 1.8.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1...v1.8.0) Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b76d8b45..8325418b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.9 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v1.8.0 with: dotnet-version: 2.1.815 @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v1.8.0 with: dotnet-version: 3.1 source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v1.8.0 with: dotnet-version: 2.1.401 source-url: https://api.nuget.org/v3/index.json From 4497c36a0d9d9da6fee7483b0248653ae17cde3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 11:37:28 +0000 Subject: [PATCH 125/255] Bump actions/cache from 2 to 2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2...v2.1.5) Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8325418b..f3558452 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 2.1.815 - - uses: actions/cache@v2 + - uses: actions/cache@v2.1.5 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 9cfdbd2798c38df06a280fa5bbed81827bb0bb3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 11:45:02 +0000 Subject: [PATCH 126/255] Bump Microsoft.NETFramework.ReferenceAssemblies from 1.0.1 to 1.0.2 Bumps [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index e2941fad..9df26f58 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -33,7 +33,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From 1f9d8452e50b77a5d3e57f60375a85f6e880b87b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 07:44:33 +0000 Subject: [PATCH 127/255] Bump cirrus-actions/rebase from 1.4 to 1.5 Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.4 to 1.5. - [Release notes](https://github.com/cirrus-actions/rebase/releases) - [Commits](https://github.com/cirrus-actions/rebase/compare/1.4...1.5) Signed-off-by: dependabot[bot] --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 704c66a1..7507b76c 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@1.4 + uses: cirrus-actions/rebase@1.5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.amrom.workers.devmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 From 9d09a1b70b454f379bb51b156f81c293e0d93b31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 06:20:43 +0000 Subject: [PATCH 128/255] Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.4 to 16.10.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.9.4...v16.10.0) Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index f167cb87..7a094f90 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 49f88a09156520cc68ae9e70eac07efdd97970de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 06:52:32 +0000 Subject: [PATCH 129/255] Bump actions/cache from 2.1.5 to 2.1.6 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6) Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f3558452..07771d12 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 2.1.815 - - uses: actions/cache@v2.1.5 + - uses: actions/cache@v2.1.6 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 8ea15403853627c4adf7d020553e117bdfc0a585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Jun 2021 01:07:58 +0000 Subject: [PATCH 130/255] Bump actions/setup-dotnet from 1.8.0 to 1.8.1 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 07771d12..223c8bf4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.9 - - uses: actions/setup-dotnet@v1.8.0 + - uses: actions/setup-dotnet@v1.8.1 with: dotnet-version: 2.1.815 @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1.8.0 + uses: actions/setup-dotnet@v1.8.1 with: dotnet-version: 3.1 source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1.8.0 + - uses: actions/setup-dotnet@v1.8.1 with: dotnet-version: 2.1.401 source-url: https://api.nuget.org/v3/index.json From 5bd39088b2ffb954444f5847d0102d97981d743e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 01:08:29 +0000 Subject: [PATCH 131/255] Bump gittools/actions from 0.9.9 to 0.9.10 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.9 to 0.9.10. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.9...v0.9.10) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 223c8bf4..ababda83 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.9 + - uses: gittools/actions/gitversion/setup@v0.9.10 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.9 + uses: gittools/actions/gitversion/execute@v0.9.10 - uses: actions/setup-dotnet@v1.8.1 with: From ecfe26d4e133daa334e71894de1bdb99cb1ecedf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 01:07:32 +0000 Subject: [PATCH 132/255] Bump coverlet.msbuild from 3.0.3 to 3.1.0 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits/v3.1.0) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 7a094f90..87009ffc 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 927254100a26324e903425100d7a46e59b29907a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 01:22:28 +0000 Subject: [PATCH 133/255] Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 87009ffc..fd0ea7e3 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 353830d535d62dd94ede54f7403cdd67bca4fdac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Sep 2021 01:07:04 +0000 Subject: [PATCH 134/255] Bump actions/setup-dotnet from 1.8.1 to 1.8.2 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1.8.1...v1.8.2) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ababda83..1dabaf19 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.10 - - uses: actions/setup-dotnet@v1.8.1 + - uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 2.1.815 @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1.8.1 + uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 3.1 source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1.8.1 + - uses: actions/setup-dotnet@v1.8.2 with: dotnet-version: 2.1.401 source-url: https://api.nuget.org/v3/index.json From 8702a2d253afb36601a25b68cc43905bcd28b75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:11:58 +0100 Subject: [PATCH 135/255] Change target framework of tests to .NET 6 Change target framework of the test project from `netcoreapp2.1` to `net6.0`. --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index fd0ea7e3..cd1af6cf 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + net6.0 true false false From bf27ac7fd8e0d0afa2d694b146459db7455fabd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:17:52 +0100 Subject: [PATCH 136/255] Bump to .NET 6 in the GitHub Actions workflow --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1dabaf19..ad24a74d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 2.1.815 + dotnet-version: 6.0.x - uses: actions/cache@v2.1.6 env: @@ -85,7 +85,7 @@ jobs: - name: setup dotnet uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 3.1 + dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -105,7 +105,7 @@ jobs: - uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 2.1.401 + dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} From aee55e043e6dc6b266cb972e9c64ee42f576a2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:24:14 +0100 Subject: [PATCH 137/255] Bump to .NET 6 in Docker Bump from `2.1-bionic` to `6.0-focal` in the Docker image. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1680d804..5fcb9c66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ #> 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 +# .NET Core 6.0 on Ubuntu 20.04 LTS +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal WORKDIR /App From 6025d5449a7323375fb2802a07b856af68b5ff1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 13:38:24 +0000 Subject: [PATCH 138/255] Bump actions/checkout from 2.3.4 to 2.4.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- .github/workflows/dotnet.yml | 2 +- .github/workflows/rebase.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e4281733..f3fe7330 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: name: build & run tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.0 with: fetch-depth: 0 - name: docker build diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ad24a74d..9c65e8a8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -15,7 +15,7 @@ jobs: fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.0 with: fetch-depth: 0 diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 7507b76c..373d42f3 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -10,7 +10,7 @@ jobs: if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.0 with: fetch-depth: 0 - name: Automatic Rebase From 9756105aef76f6121125466742c9c9ecd9f6f974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 13:43:30 +0000 Subject: [PATCH 139/255] Bump gittools/actions from 0.9.10 to 0.9.11 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.10 to 0.9.11. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.10...v0.9.11) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 9c65e8a8..3ce9350a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.10 + - uses: gittools/actions/gitversion/setup@v0.9.11 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.10 + uses: gittools/actions/gitversion/execute@v0.9.11 - uses: actions/setup-dotnet@v1.8.2 with: From 283f2734c4e8f5ad253530c5adc073e0eb3a0b59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:15:28 +0000 Subject: [PATCH 140/255] Bump actions/cache from 2.1.6 to 2.1.7 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 3ce9350a..f3365086 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 6.0.x - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 857c105ea049dd071074634be2ef042d854cd9d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:18:10 +0000 Subject: [PATCH 141/255] Bump actions/setup-dotnet from 1.8.2 to 2 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1.8.2 to 2. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1.8.2...v2) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f3365086..cfdb8f80 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.11 - - uses: actions/setup-dotnet@v1.8.2 + - uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1.8.2 + uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1.8.2 + - uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From eddec468687a7420c886611841070dab0d148de7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:24:15 +0000 Subject: [PATCH 142/255] Bump coverlet.msbuild from 3.1.0 to 3.1.2 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 3.1.0 to 3.1.2. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index cd1af6cf..8d077019 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 5fe3d9a7a80561ae3ef6936aadddd3e67058b08c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:27:22 +0000 Subject: [PATCH 143/255] Bump Microsoft.SourceLink.GitHub from 1.0.0 to 1.1.1 Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.0.0 to 1.1.1. - [Release notes](https://github.com/dotnet/sourcelink/releases) - [Commits](https://github.com/dotnet/sourcelink/compare/1.0.0...1.1.1) --- updated-dependencies: - dependency-name: Microsoft.SourceLink.GitHub dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 9df26f58..1023dd56 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -23,7 +23,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From d3b27874ab2a688653e3d329211dfbf6437eee53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:31:12 +0000 Subject: [PATCH 144/255] Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.1.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.1.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.1.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 8d077019..adde1862 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From fac7e7d3c348bc092fa40a4b1c156f65e8bf6ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:11:58 +0100 Subject: [PATCH 145/255] Change target framework of tests to .NET 6 Change target framework of the test project from `netcoreapp2.1` to `net6.0`. --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 6e77e310..d0470f7c 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + net6.0 true false false From d2b94b127467c70a0ebf53c89d76e192e03c34dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:17:52 +0100 Subject: [PATCH 146/255] Bump to .NET 6 in the GitHub Actions workflow # Conflicts: # .github/workflows/dotnet.yml --- .github/workflows/dotnet.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 18697529..ad24a74d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,10 +2,10 @@ name: dotnet on: push: - branches: [master] + branches: [main] tags: ["*"] pull_request: - branches: [master] + branches: [main] jobs: build: @@ -15,22 +15,22 @@ jobs: fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.4 + - uses: gittools/actions/gitversion/setup@v0.9.10 with: - versionSpec: "5.x" + versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.4 + uses: gittools/actions/gitversion/execute@v0.9.10 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 2.1.401 + dotnet-version: 6.0.x - - uses: actions/cache@v2 + - uses: actions/cache@v2.1.6 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: @@ -73,7 +73,7 @@ jobs: nuget-push-dev: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: build steps: @@ -83,9 +83,9 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 3.1 + dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -103,9 +103,9 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v1.8.2 with: - dotnet-version: 2.1.401 + dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} From 66dc84a0358bafba297613c551bc22f332656c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 00:24:14 +0100 Subject: [PATCH 147/255] Bump to .NET 6 in Docker Bump from `2.1-bionic` to `6.0-focal` in the Docker image. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1680d804..5fcb9c66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ #> 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 +# .NET Core 6.0 on Ubuntu 20.04 LTS +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal WORKDIR /App From 0ebc90e4a8a8a3824595207da8cb4310428a88e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 15:47:18 +0100 Subject: [PATCH 148/255] Run GitHub Actions workflows on support branches --- .github/workflows/docker.yml | 6 +++--- .github/workflows/dotnet.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e39e5d1e..25b2b1ea 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,10 +2,10 @@ name: docker on: push: - branches: [master] + branches: [main, support/*] tags: ["*"] pull_request: - branches: [master] + branches: [main, support/*] jobs: docker: @@ -18,4 +18,4 @@ jobs: - name: docker build run: docker build -t json-ld.net . - name: docker test - run: docker run --rm json-ld.net dotnet test \ No newline at end of file + run: docker run --rm json-ld.net dotnet test diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ad24a74d..bdb2bded 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,10 +2,10 @@ name: dotnet on: push: - branches: [main] + branches: [main, support/*] tags: ["*"] pull_request: - branches: [main] + branches: [main, support/*] jobs: build: From 6eaefa10cc799f873ebd63f70f48a92a793649fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 15:56:56 +0100 Subject: [PATCH 149/255] Enable Dependabot for the 1.x support branch Enable Dependabot for the `support/1.x` branch with [`target-branch`](https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates#target-branch). --- .github/dependabot.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index edf3069b..f2b8dd0a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,22 +4,22 @@ updates: directory: "/" schedule: interval: daily - open-pull-requests-limit: 10 - ignore: - - dependency-name: Newtonsoft.Json - versions: - - ">= 10.a" - - "< 11" - - dependency-name: Newtonsoft.Json - versions: - - ">= 11.a" - - "< 12" - - dependency-name: Newtonsoft.Json - versions: - - ">= 12.0.a" - - "< 12.1" + target-branch: main + +- package-ecosystem: nuget + directory: "/" + schedule: + interval: daily + target-branch: support/1.x + +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + target-branch: main + - package-ecosystem: github-actions directory: "/" schedule: interval: daily - open-pull-requests-limit: 10 + target-branch: support/1.x From c42eef0276c68a75e537a023fe6b3affd45f2d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 16:01:28 +0100 Subject: [PATCH 150/255] Add Mergify config --- .github/mergify.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/mergify.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000..543e76ec --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,24 @@ +pull_request_rules: + - name: Automatic approve on dependabot PR + conditions: + - author~=^dependabot(|-preview)\[bot\]$ + actions: + review: + type: APPROVE + + - name: Automatic merge on approval + conditions: + - author~=^dependabot(|-preview)\[bot\]$ + - '#commits-behind=0' # Only merge up to date pull requests + - check-success=build + - check-success=build & run tests + actions: + merge: + + - name: Thank contributor + conditions: + - merged + - -author~=^.*\[bot\]$ + actions: + comment: + message: "Thank you for your contribution, @{{author}}!" From 82f5fcc49266e3e85a2e0e9b6fb2d46d28b0ab02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 16:05:42 +0100 Subject: [PATCH 151/255] Delete rebase workflow as it doesn't really work --- .github/workflows/rebase.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml deleted file mode 100644 index 373d42f3..00000000 --- a/.github/workflows/rebase.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: rebase - -on: - issue_comment: - types: [created] - -jobs: - rebase: - name: Rebase - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.4.0 - with: - fetch-depth: 0 - - name: Automatic Rebase - uses: cirrus-actions/rebase@1.5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # https://github.amrom.workers.devmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 - always_job: - name: Always run job - runs-on: ubuntu-latest - steps: - - name: Always run - run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped." From b178ddb3ccc2964ff40db35314161e177a8b95c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:47 +0000 Subject: [PATCH 152/255] Bump cirrus-actions/rebase from 1.3 to 1.5 Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.3 to 1.5. - [Release notes](https://github.com/cirrus-actions/rebase/releases) - [Commits](https://github.com/cirrus-actions/rebase/compare/1.3...1.5) --- updated-dependencies: - dependency-name: cirrus-actions/rebase dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 1bbb4658..474d1473 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Automatic Rebase - uses: cirrus-actions/rebase@1.3 + uses: cirrus-actions/rebase@1.5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.amrom.workers.devmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 From c20cb3b914545de06f80181ba34a9deceda09e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:49 +0000 Subject: [PATCH 153/255] Bump Newtonsoft.Json from 9.0.1 to 13.0.1 Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 9.0.1 to 13.0.1. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/9.0.1...13.0.1) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 1023dd56..728e89cb 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -27,7 +27,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From 55bb628cf64eb64571869769ff053102415860c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:50 +0000 Subject: [PATCH 154/255] Bump actions/cache from 2.1.6 to 2.1.7 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index bdb2bded..585e5794 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 6.0.x - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 80f6bccbac12cd95d8fd2ab51e40b3cba0898c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:52 +0000 Subject: [PATCH 155/255] Bump Microsoft.NETFramework.ReferenceAssemblies from 1.0.0 to 1.0.2 Bumps [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) from 1.0.0 to 1.0.2. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) --- updated-dependencies: - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 3fc28a80..20a1b98c 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -25,7 +25,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From 43c837092d6b3bebddb070438884085a6b1beb9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:53 +0000 Subject: [PATCH 156/255] Bump actions/setup-dotnet from 1.8.2 to 2 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1.8.2 to 2. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1.8.2...v2) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index bdb2bded..824494c6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.10 - - uses: actions/setup-dotnet@v1.8.2 + - uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v1.8.2 + uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v1.8.2 + - uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From b81f1e78980348c9a6574ac87b42f76f46d15292 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:54 +0000 Subject: [PATCH 157/255] Bump coverlet.msbuild from 2.9.0 to 3.1.2 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 2.9.0 to 3.1.2. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index d0470f7c..97de8c52 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From bf90f5c3cf67006257d2a16d3b9ee51a81eb2898 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:08:56 +0000 Subject: [PATCH 158/255] Bump gittools/actions from 0.9.10 to 0.9.11 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.10 to 0.9.11. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.10...v0.9.11) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index bdb2bded..5bef4d6c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.10 + - uses: gittools/actions/gitversion/setup@v0.9.11 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.10 + uses: gittools/actions/gitversion/execute@v0.9.11 - uses: actions/setup-dotnet@v1.8.2 with: From 485b4d9eac565e4bc4a709b675f70d8e1f0b04bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 16:11:59 +0100 Subject: [PATCH 159/255] Ignore Newtonsoft.Json bumps in 1.x --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f2b8dd0a..2178c555 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,6 +11,8 @@ updates: schedule: interval: daily target-branch: support/1.x + ignore: + - dependency-name: Newtonsoft.Json - package-ecosystem: github-actions directory: "/" From 2c02192606205b6455152b581d42cd9511c25a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 16:16:34 +0100 Subject: [PATCH 160/255] Only approve and merge PRs to main --- .github/mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 543e76ec..9e668864 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,6 +2,7 @@ pull_request_rules: - name: Automatic approve on dependabot PR conditions: - author~=^dependabot(|-preview)\[bot\]$ + - base=main actions: review: type: APPROVE @@ -12,6 +13,7 @@ pull_request_rules: - '#commits-behind=0' # Only merge up to date pull requests - check-success=build - check-success=build & run tests + - base=main actions: merge: From 5abfdff156d3fec419fa72b7ab57f087703dbbec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:17:59 +0000 Subject: [PATCH 161/255] Bump Microsoft.NET.Test.Sdk from 16.7.1 to 17.1.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 17.1.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v17.1.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 97de8c52..adde1862 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From f1d129b20755fb34dfed7658b42b45652a449985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 16:29:15 +0100 Subject: [PATCH 162/255] Fix nuget push path --- .github/workflows/dotnet.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2f0476b3..0b098d76 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -110,7 +110,8 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} - - run: dotnet nuget push nugets/*.nupkg --skip-duplicate + - name: nuget push + run: dotnet nuget push "*.nupkg" --skip-duplicate --api-key ${{ secrets.GITHUB_TOKEN }} release-artifacts: runs-on: ubuntu-latest From c4bbc2c15e252e7273c0e2260b667901ad926d40 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Mon, 5 Oct 2020 22:18:45 -0700 Subject: [PATCH 163/255] Add LINQPad samples to NuGet package --- doc/linqpad-samples/Compact.linq | 14 ++++ doc/linqpad-samples/CustomRDFParser.linq | 31 +++++++ doc/linqpad-samples/CustomRDFRender.linq | 23 ++++++ doc/linqpad-samples/Expand.linq | 16 ++++ doc/linqpad-samples/FileOrder.txt | 11 +++ doc/linqpad-samples/Flatten.linq | 14 ++++ doc/linqpad-samples/Frame.linq | 14 ++++ doc/linqpad-samples/FromRDF.linq | 17 ++++ doc/linqpad-samples/Installation.linq | 13 +++ doc/linqpad-samples/Normalize.linq | 15 ++++ doc/linqpad-samples/RemoteDocumentLoader.linq | 37 +++++++++ doc/linqpad-samples/ToRDF.linq | 16 ++++ doc/linqpad-samples/Utils/ObjectDumper.linq | 80 +++++++++++++++++++ doc/linqpad-samples/Utils/Resources.linq | 19 +++++ doc/linqpad-samples/context.json | 15 ++++ doc/linqpad-samples/doc.json | 16 ++++ doc/linqpad-samples/frame.json | 19 +++++ src/json-ld.net/json-ld.net.csproj | 6 +- 18 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 doc/linqpad-samples/Compact.linq create mode 100644 doc/linqpad-samples/CustomRDFParser.linq create mode 100644 doc/linqpad-samples/CustomRDFRender.linq create mode 100644 doc/linqpad-samples/Expand.linq create mode 100644 doc/linqpad-samples/FileOrder.txt create mode 100644 doc/linqpad-samples/Flatten.linq create mode 100644 doc/linqpad-samples/Frame.linq create mode 100644 doc/linqpad-samples/FromRDF.linq create mode 100644 doc/linqpad-samples/Installation.linq create mode 100644 doc/linqpad-samples/Normalize.linq create mode 100644 doc/linqpad-samples/RemoteDocumentLoader.linq create mode 100644 doc/linqpad-samples/ToRDF.linq create mode 100644 doc/linqpad-samples/Utils/ObjectDumper.linq create mode 100644 doc/linqpad-samples/Utils/Resources.linq create mode 100644 doc/linqpad-samples/context.json create mode 100644 doc/linqpad-samples/doc.json create mode 100644 doc/linqpad-samples/frame.json diff --git a/doc/linqpad-samples/Compact.linq b/doc/linqpad-samples/Compact.linq new file mode 100644 index 00000000..f90973e0 --- /dev/null +++ b/doc/linqpad-samples/Compact.linq @@ -0,0 +1,14 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var compacted = JsonLdProcessor.Compact(Resources.Doc, Resources.Context, opts); + +compacted.ToString().Dump("string"); +compacted.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/CustomRDFParser.linq b/doc/linqpad-samples/CustomRDFParser.linq new file mode 100644 index 00000000..bb485198 --- /dev/null +++ b/doc/linqpad-samples/CustomRDFParser.linq @@ -0,0 +1,31 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +void Main() +{ + var opts = new JsonLdOptions(); + + var rdf = (RDFDataset)JsonLdProcessor.ToRDF(Resources.Doc, opts); + var serialized = RDFDatasetUtils.ToNQuads(rdf); // serialize RDF to string + + var parser = new CustomRDFParser(); + var jsonld = JsonLdProcessor.FromRDF(serialized, parser); + jsonld.ToString().Dump("string"); + jsonld.Dump("JSON DOM"); +} + +public class CustomRDFParser : IRDFParser +{ + public RDFDataset Parse(JToken input) + { + // by public decree, references to example.org are normalized to https going forward... + var converted = ((string)input).Replace("http://example.org/", "https://example.org/"); + return RDFDatasetUtils.ParseNQuads(converted); + } +} diff --git a/doc/linqpad-samples/CustomRDFRender.linq b/doc/linqpad-samples/CustomRDFRender.linq new file mode 100644 index 00000000..8bdf6734 --- /dev/null +++ b/doc/linqpad-samples/CustomRDFRender.linq @@ -0,0 +1,23 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +void Main() +{ + var opts = new JsonLdOptions(); + + var callback = new JSONLDTripleCallback(); + var serialized = JsonLdProcessor.ToRDF(Resources.Doc, callback); + serialized.Dump("RDF"); +} + +public class JSONLDTripleCallback : IJSONLDTripleCallback +{ + public object Call(RDFDataset dataset) => + RDFDatasetUtils.ToNQuads(dataset); // serialize the RDF dataset as NQuads +} diff --git a/doc/linqpad-samples/Expand.linq b/doc/linqpad-samples/Expand.linq new file mode 100644 index 00000000..5569b4b2 --- /dev/null +++ b/doc/linqpad-samples/Expand.linq @@ -0,0 +1,16 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var compacted = JsonLdProcessor.Compact(Resources.Doc, Resources.Context, opts); + +var expanded = JsonLdProcessor.Expand(compacted); + +expanded.ToString().Dump("string"); +expanded.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/FileOrder.txt b/doc/linqpad-samples/FileOrder.txt new file mode 100644 index 00000000..7cbe0854 --- /dev/null +++ b/doc/linqpad-samples/FileOrder.txt @@ -0,0 +1,11 @@ +Installation.linq +Compact.linq +Expand.linq +Flatten.linq +Frame.linq +Normalize.linq +ToRDF.linq +FromRDF.linq +CustomRDFRender.linq +CustomRDFParser.linq +RemoteDocumentLoader.linq \ No newline at end of file diff --git a/doc/linqpad-samples/Flatten.linq b/doc/linqpad-samples/Flatten.linq new file mode 100644 index 00000000..2016de63 --- /dev/null +++ b/doc/linqpad-samples/Flatten.linq @@ -0,0 +1,14 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var flattened = JsonLdProcessor.Flatten(Resources.Doc, Resources.Context, opts); + +flattened.ToString().Dump("string"); +flattened.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/Frame.linq b/doc/linqpad-samples/Frame.linq new file mode 100644 index 00000000..750f1bf3 --- /dev/null +++ b/doc/linqpad-samples/Frame.linq @@ -0,0 +1,14 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var framed = JsonLdProcessor.Frame(Resources.Doc, Resources.Frame, opts); + +framed.ToString().Dump("string"); +framed.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/FromRDF.linq b/doc/linqpad-samples/FromRDF.linq new file mode 100644 index 00000000..193cd77e --- /dev/null +++ b/doc/linqpad-samples/FromRDF.linq @@ -0,0 +1,17 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var rdf = (RDFDataset)JsonLdProcessor.ToRDF(Resources.Doc, opts); +var serialized = RDFDatasetUtils.ToNQuads(rdf); // serialize RDF to string + +var jsonld = JsonLdProcessor.FromRDF(serialized, opts); + +jsonld.ToString().Dump("string"); +jsonld.Dump("JSON DOM"); diff --git a/doc/linqpad-samples/Installation.linq b/doc/linqpad-samples/Installation.linq new file mode 100644 index 00000000..b0edf4c3 --- /dev/null +++ b/doc/linqpad-samples/Installation.linq @@ -0,0 +1,13 @@ + + json-ld.net.dll + Newtonsoft.Json + Newtonsoft.Json.Linq + JsonLD.Core + + +var json = "{'@context':{'test':'http://www.example.org/'},'test:hello':'world'}"; +var document = JObject.Parse(json); +var expanded = JsonLdProcessor.Expand(document); + +expanded.ToString().Dump("string"); +expanded.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/Normalize.linq b/doc/linqpad-samples/Normalize.linq new file mode 100644 index 00000000..ab252e66 --- /dev/null +++ b/doc/linqpad-samples/Normalize.linq @@ -0,0 +1,15 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" +#load "Utils/ObjectDumper" + +var opts = new JsonLdOptions(); +var normalized = (RDFDataset)JsonLdProcessor.Normalize(Resources.Doc, opts); + +normalized.JsonLDDump().Dump("string"); +normalized.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/RemoteDocumentLoader.linq b/doc/linqpad-samples/RemoteDocumentLoader.linq new file mode 100644 index 00000000..4590bd50 --- /dev/null +++ b/doc/linqpad-samples/RemoteDocumentLoader.linq @@ -0,0 +1,37 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +void Main() +{ + var doc = Resources.Doc; + var remoteContext = JObject.Parse("{'@context':'http://example.org/context.jsonld'}"); + var opts = new JsonLdOptions { documentLoader = new CustomDocumentLoader() }; + var compacted = JsonLdProcessor.Compact(doc, remoteContext, opts); + + compacted.ToString().Dump("string"); + compacted.Dump("JSON DOM"); +} + +public class CustomDocumentLoader : DocumentLoader +{ + private static readonly string _cachedExampleOrgContext = Resources.Context.ToString(); + + public override RemoteDocument LoadDocument(string url) + { + if (url == "http://example.org/context.jsonld") // we have this cached locally + { + var doc = new JObject(new JProperty("@context", JObject.Parse(_cachedExampleOrgContext))); + return new RemoteDocument(url, doc); + } + else + { + return base.LoadDocument(url); + } + } +} diff --git a/doc/linqpad-samples/ToRDF.linq b/doc/linqpad-samples/ToRDF.linq new file mode 100644 index 00000000..9ee8ca38 --- /dev/null +++ b/doc/linqpad-samples/ToRDF.linq @@ -0,0 +1,16 @@ + + json-ld.net.dll + Newtonsoft.Json + JsonLD.Core + Newtonsoft.Json.Linq + + +#load "Utils/Resources" + +var opts = new JsonLdOptions(); +var rdf = (RDFDataset)JsonLdProcessor.ToRDF(Resources.Doc, opts); + +var serialized = RDFDatasetUtils.ToNQuads(rdf); // serialize RDF to string + +serialized.Dump("string"); +serialized.Dump("JSON DOM"); \ No newline at end of file diff --git a/doc/linqpad-samples/Utils/ObjectDumper.linq b/doc/linqpad-samples/Utils/ObjectDumper.linq new file mode 100644 index 00000000..a60473c6 --- /dev/null +++ b/doc/linqpad-samples/Utils/ObjectDumper.linq @@ -0,0 +1,80 @@ + + System.ComponentModel + + +void Main() +{ + +} + +public static class ObjectDumperExtensions +{ + public static string JsonLDDump(this object obj) => ObjectDumper.Dump(obj); +} + +// thanks: https://stackoverflow.com/a/42264037 +public class ObjectDumper +{ + public static string Dump(object obj) + { + return new ObjectDumper().DumpObject(obj); + } + + private readonly StringBuilder _dumpBuilder = new StringBuilder(); + + private string DumpObject(object obj) + { + DumpObject(obj, 0); + return _dumpBuilder.ToString(); + } + + private void DumpObject(object obj, int nestingLevel = 0) + { + var nestingSpaces = new String('\t', nestingLevel); //"".PadLeft(nestingLevel * 4); + + if (obj == null) + { + _dumpBuilder.AppendFormat("null", nestingSpaces); + } + else if (obj is string || obj.GetType().IsPrimitive) + { + _dumpBuilder.AppendFormat("{1}", nestingSpaces, obj.ToString().PadRight(8)); + } + else if (ImplementsDictionary(obj.GetType())) + { + using var e = ((dynamic)obj).GetEnumerator(); + var enumerator = (IEnumerator)e; + while (enumerator.MoveNext()) + { + dynamic p = enumerator.Current; + + var key = p.Key; + var value = p.Value; + _dumpBuilder.AppendFormat("\n{0}{1}", nestingSpaces, key.PadRight(10), value != null ? value.GetType().ToString() : ""); + DumpObject(value, nestingLevel + 1); + } + } + else if (obj is IEnumerable) + { + foreach (dynamic p in obj as IEnumerable) + { + DumpObject(p, nestingLevel); + DumpObject("\n", nestingLevel); + DumpObject("---", nestingLevel); + } + } + else + { + foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(obj)) + { + string name = descriptor.Name; + object value = descriptor.GetValue(obj); + + _dumpBuilder.AppendFormat("{0}{1}\n", nestingSpaces, name.PadRight(10), value != null ? value.GetType().ToString() : ""); + DumpObject(value, nestingLevel + 1); + } + } + } + + private bool ImplementsDictionary(Type t) => t.GetInterfaces().Any(i => i.Name.Contains("IDictionary")); +} diff --git a/doc/linqpad-samples/Utils/Resources.linq b/doc/linqpad-samples/Utils/Resources.linq new file mode 100644 index 00000000..9dddc067 --- /dev/null +++ b/doc/linqpad-samples/Utils/Resources.linq @@ -0,0 +1,19 @@ + + context.json + doc.json + frame.json + Newtonsoft.Json + Newtonsoft.Json.Linq + + +void Main() +{ + +} + +public static class Resources +{ + public static readonly JObject Doc = JObject.Parse(File.ReadAllText(Util.GetFullPath("doc.json"))); + public static readonly JObject Context = JObject.Parse(File.ReadAllText(Util.GetFullPath("context.json"))); + public static readonly JObject Frame = JObject.Parse(File.ReadAllText(Util.GetFullPath("frame.json"))); +} diff --git a/doc/linqpad-samples/context.json b/doc/linqpad-samples/context.json new file mode 100644 index 00000000..0b1d6477 --- /dev/null +++ b/doc/linqpad-samples/context.json @@ -0,0 +1,15 @@ +{ + "name": "http://schema.org/name", + "member": "http://schema.org/member", + "homepage": { + "@id": "http://schema.org/url", + "@type": "@id" + }, + "image": { + "@id": "http://schema.org/image", + "@type": "@id" + }, + "Person": "http://schema.org/Person", + "@vocab": "http://example.org/", + "@base": "http://example.org/" +} \ No newline at end of file diff --git a/doc/linqpad-samples/doc.json b/doc/linqpad-samples/doc.json new file mode 100644 index 00000000..5d6bd3d2 --- /dev/null +++ b/doc/linqpad-samples/doc.json @@ -0,0 +1,16 @@ +{ + "@id": "http://example.org/ld-experts", + "http://schema.org/name": "LD Experts", + "http://schema.org/member": [ + { + "@type": "http://schema.org/Person", + "http://schema.org/name": "Manu Sporny", + "http://schema.org/url": { + "@id": "http://manu.sporny.org/" + }, + "http://schema.org/image": { + "@id": "http://manu.sporny.org/images/manu.png" + } + } + ] +} \ No newline at end of file diff --git a/doc/linqpad-samples/frame.json b/doc/linqpad-samples/frame.json new file mode 100644 index 00000000..b274c875 --- /dev/null +++ b/doc/linqpad-samples/frame.json @@ -0,0 +1,19 @@ +{ + "@context": { + "name": "http://schema.org/name", + "member": { + "@id": "http://schema.org/member", + "@type": "@id" + }, + "homepage": { + "@id": "http://schema.org/url", + "@type": "@id" + }, + "image": { + "@id": "http://schema.org/image", + "@type": "@id" + }, + "Person": "http://schema.org/Person" + }, + "@type": "Person" +} \ No newline at end of file diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 728e89cb..8db572b2 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -8,7 +8,7 @@ Implements the W3C JSON-LD 1.0 standard. netstandard1.1;netstandard2.0;net40 json-ld.net json-ld.net - json-ld;jsonld;json;linked-data;rdf;semantic;web + json-ld;jsonld;json;linked-data;rdf;semantic;web;linqpad-samples http://json-ld.org/images/json-ld-logo-64.png https://github.com/linked-data-dotnet/json-ld.net/ https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/main/LICENSE @@ -26,6 +26,10 @@ Implements the W3C JSON-LD 1.0 standard. + + + + From fde0281cf8d87f04bcf75700cdf2a7dcc84dac58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 1 Mar 2022 23:38:04 +0100 Subject: [PATCH 164/255] Use the right token for NuGet --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0b098d76..17dac5b9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -111,7 +111,7 @@ jobs: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} - name: nuget push - run: dotnet nuget push "*.nupkg" --skip-duplicate --api-key ${{ secrets.GITHUB_TOKEN }} + run: dotnet nuget push "*.nupkg" --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }} release-artifacts: runs-on: ubuntu-latest From 766e43505443379f895f8baf48d26952ffaa1e6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 01:43:33 +0000 Subject: [PATCH 165/255] Bump actions/checkout from 2.4.0 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- .github/workflows/dotnet.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7be7e662..f8bdbe5a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: name: build & run tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: docker build diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ce632444..b048f7f8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -15,7 +15,7 @@ jobs: fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: fetch-depth: 0 From 5437dc83bcd550535f6084f085f1c9815e494e35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 01:27:36 +0000 Subject: [PATCH 166/255] Bump gittools/actions from 0.9.11 to 0.9.13 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.11 to 0.9.13. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.11...v0.9.13) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b048f7f8..2219566f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.11 + - uses: gittools/actions/gitversion/setup@v0.9.13 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.11 + uses: gittools/actions/gitversion/execute@v0.9.13 - uses: actions/setup-dotnet@v2 with: From e868ec4a0cf8bed79d0cfabf5c60a10d68ee084c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Mar 2022 01:31:52 +0000 Subject: [PATCH 167/255] Bump actions/cache from 2.1.7 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.7...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2219566f..0ccef87f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 6.0.x - - uses: actions/cache@v2.1.7 + - uses: actions/cache@v3 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 689063e804e0e03769eea4dfbcea6e000666e304 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 01:40:34 +0000 Subject: [PATCH 168/255] Bump actions/download-artifact from 2 to 3 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0ccef87f..2a0bfddb 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -78,7 +78,7 @@ jobs: steps: - name: download artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: nugets @@ -99,7 +99,7 @@ jobs: needs: build steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: nugets @@ -119,7 +119,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v3 with: name: nugets From 5d7942d9089c1e5698983648be2110998c84f4f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 20:58:23 +0000 Subject: [PATCH 169/255] Bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2a0bfddb..80ee4dbd 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -66,7 +66,7 @@ jobs: src/json-ld.net/json-ld.net.csproj \ --output ${{ github.workspace }}/nugets/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: nugets path: nugets From cb5f995d78d9b9adacc5596daf2523881a6f1271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 01:29:02 +0000 Subject: [PATCH 170/255] Bump xunit.runner.visualstudio from 2.4.3 to 2.4.4 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/commits) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index adde1862..62b5a660 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 9210509e6d2756335a059061691e064dbbd961f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 01:34:34 +0000 Subject: [PATCH 171/255] Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.1.0 to 17.2.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.1.0...v17.2.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 62b5a660..bc62ac2a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From c02607d38dc5f98227f618e700d472dcfd12618e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 21:41:48 +0000 Subject: [PATCH 172/255] Bump xunit.runner.visualstudio from 2.4.4 to 2.4.5 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.4 to 2.4.5. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/commits) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index bc62ac2a..51a1067a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From e778b9a6bd6e5e8520ba51e6e9d4d8cb25934452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 01:28:58 +0000 Subject: [PATCH 173/255] Bump xunit from 2.4.1 to 2.4.2 Bumps [xunit](https://github.com/xunit/xunit) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/xunit/xunit/releases) - [Commits](https://github.com/xunit/xunit/compare/2.4.1...2.4.2) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 51a1067a..c9b4ecab 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 93a02f97d436948b60102fbbeb5b9497354e4ae7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Aug 2022 01:24:41 +0000 Subject: [PATCH 174/255] Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.2.0 to 17.3.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.2.0...v17.3.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c9b4ecab..f74863f5 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From a4de3b9a0cc5f5c3430d5970ea5a81df2ba3c782 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 01:47:27 +0000 Subject: [PATCH 175/255] Bump Microsoft.NETFramework.ReferenceAssemblies from 1.0.2 to 1.0.3 Bumps [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) --- updated-dependencies: - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 8db572b2..7d010227 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -37,7 +37,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From bc55aa3f6afe16d1590134c815fa7658f4cc241d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 02:18:25 +0000 Subject: [PATCH 176/255] Bump Microsoft.NET.Test.Sdk from 17.3.0 to 17.3.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.3.0 to 17.3.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.3.0...v17.3.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index f74863f5..dc685828 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 2b6180074207006b3fc3d3af5ce07f17b2e0c35c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 01:27:16 +0000 Subject: [PATCH 177/255] Bump Microsoft.NET.Test.Sdk from 17.3.1 to 17.3.2 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.3.1 to 17.3.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.3.1...v17.3.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index dc685828..6da1471b 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From df96a94cb1e594166730378a7cc051c7ce1c4682 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 01:40:39 +0000 Subject: [PATCH 178/255] Bump actions/setup-dotnet from 2 to 3.0.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 2 to 3.0.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v2...v3.0.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 80ee4dbd..1dfb6bb1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.13 - - uses: actions/setup-dotnet@v2 + - uses: actions/setup-dotnet@v3.0.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3.0.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v2 + - uses: actions/setup-dotnet@v3.0.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 4e5c114e4847581d7d3cbb196e4896439df6acf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 01:37:42 +0000 Subject: [PATCH 179/255] Bump gittools/actions from 0.9.13 to 0.9.14 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.13 to 0.9.14. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.13...v0.9.14) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1dfb6bb1..1a972de6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.13 + - uses: gittools/actions/gitversion/setup@v0.9.14 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.13 + uses: gittools/actions/gitversion/execute@v0.9.14 - uses: actions/setup-dotnet@v3.0.0 with: From 80cdc65f877757c147b03d273655fa16bccb3d86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 11:27:48 +0000 Subject: [PATCH 180/255] Bump actions/setup-dotnet from 3.0.0 to 3.0.1 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1a972de6..2a1a8986 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.14 - - uses: actions/setup-dotnet@v3.0.0 + - uses: actions/setup-dotnet@v3.0.1 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v3.0.0 + uses: actions/setup-dotnet@v3.0.1 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v3.0.0 + - uses: actions/setup-dotnet@v3.0.1 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 3b4a9e8ebc953717efc478bed1a33db7bcb3ddfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 01:30:38 +0000 Subject: [PATCH 181/255] Bump gittools/actions from 0.9.14 to 0.9.15 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.14 to 0.9.15. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.14...v0.9.15) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2a1a8986..17463b4c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.14 + - uses: gittools/actions/gitversion/setup@v0.9.15 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.14 + uses: gittools/actions/gitversion/execute@v0.9.15 - uses: actions/setup-dotnet@v3.0.1 with: From 9041734f646304ec518472fc9c889f46ad5676f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:52:50 +0000 Subject: [PATCH 182/255] Bump actions/setup-dotnet from 3.0.1 to 3.0.3 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.0.1 to 3.0.3. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.0.1...v3.0.3) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 17463b4c..e7a373c2 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.9.15 - - uses: actions/setup-dotnet@v3.0.1 + - uses: actions/setup-dotnet@v3.0.3 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v3.0.1 + uses: actions/setup-dotnet@v3.0.3 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v3.0.1 + - uses: actions/setup-dotnet@v3.0.3 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From d59dd7d174fd7a30691c64cdfb801aae11140c56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 10:17:08 +0000 Subject: [PATCH 183/255] Bump coverlet.msbuild from 3.1.2 to 3.2.0 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits/v3.2.0) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 6da1471b..e7743461 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 548b8bbd924843c02ec9038d15a145d10fbfa64d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 01:04:50 +0000 Subject: [PATCH 184/255] Bump svenstaro/upload-release-action from 1.pre.release to 2.3.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 1.pre.release to 2.3.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/v1-release...2.3.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e7a373c2..9853ee96 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@v1-release + uses: svenstaro/upload-release-action@2.3.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From 6210623fe5f9bf414c05609bf014d6bb9c1b1e77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 01:04:39 +0000 Subject: [PATCH 185/255] Bump Newtonsoft.Json from 13.0.1 to 13.0.2 Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index 7d010227..bea4db90 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -31,7 +31,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From 043e542b3fc3a50fb0b91aa0120514ab1dca7b9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 09:39:16 +0000 Subject: [PATCH 186/255] Bump Microsoft.NET.Test.Sdk from 17.3.2 to 17.4.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.3.2 to 17.4.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.3.2...v17.4.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index e7743461..55d73c59 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 76374c45f598bfbb0dec127954ff9a87aa8a1d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 01:03:53 +0000 Subject: [PATCH 187/255] Bump svenstaro/upload-release-action from 2.3.0 to 2.4.1 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.3.0...2.4.1) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 9853ee96..938689c1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.3.0 + uses: svenstaro/upload-release-action@2.4.1 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From d0d5f16ac887829456372a3936102d1587da2e9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 01:59:59 +0000 Subject: [PATCH 188/255] Bump Newtonsoft.Json from 13.0.2 to 13.0.3 Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.2 to 13.0.3. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.2...13.0.3) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index bea4db90..df6a47c0 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -31,7 +31,7 @@ Implements the W3C JSON-LD 1.0 standard. - + From 215302d02dbdbf5536527f9134b6552f206f0b1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 22:19:11 +0000 Subject: [PATCH 189/255] Bump svenstaro/upload-release-action from 2.4.1 to 2.5.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.4.1...2.5.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 938689c1..3c65fa58 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.4.1 + uses: svenstaro/upload-release-action@2.5.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From a7e99bf5602c680e70d8d8b6ee835ee8821a5640 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 22:38:13 +0000 Subject: [PATCH 190/255] Bump Microsoft.NET.Test.Sdk from 17.4.1 to 17.5.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.4.1 to 17.5.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.4.1...v17.5.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 55d73c59..69fe6512 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From c924454027ce06c240f6e2a982759715ef3f9ce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 02:09:05 +0000 Subject: [PATCH 191/255] Bump gittools/actions from 0.9.15 to 0.10.2 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.9.15 to 0.10.2. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.9.15...v0.10.2) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 3c65fa58..c1bc5e14 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.9.15 + - uses: gittools/actions/gitversion/setup@v0.10.2 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v0.10.2 - uses: actions/setup-dotnet@v3.0.3 with: From acd59b3b333756f5038155280d95b9a9f51cc1e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 01:59:05 +0000 Subject: [PATCH 192/255] Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.5.0 to 17.6.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.5.0...v17.6.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 69fe6512..103809f0 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -22,7 +22,7 @@ - + From e4b6f741d0a3535f164ae573433afbbafe08a04e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 02:01:39 +0000 Subject: [PATCH 193/255] Bump coverlet.msbuild from 3.2.0 to 6.0.0 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 3.2.0 to 6.0.0. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v3.2.0...v6.0.0) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 103809f0..c8f55e8c 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From a289d257ce705ba8e97dd60df159e9bd77f503a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 01:58:48 +0000 Subject: [PATCH 194/255] Bump svenstaro/upload-release-action from 2.5.0 to 2.6.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.5.0...2.6.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index c1bc5e14..d6e7324a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.5.0 + uses: svenstaro/upload-release-action@2.6.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From 60403e0b8b11a3b094a49b3b3281253972e42b81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 May 2023 01:58:55 +0000 Subject: [PATCH 195/255] Bump actions/setup-dotnet from 3.0.3 to 3.1.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.0.3...v3.1.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d6e7324a..45614650 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.10.2 - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.1.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v3.0.3 + uses: actions/setup-dotnet@v3.1.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.1.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 46075377366e0d443a375d8efe4b5bce71cbffd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 May 2023 01:59:02 +0000 Subject: [PATCH 196/255] Bump actions/setup-dotnet from 3.1.0 to 3.2.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 45614650..df1f5e55 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.10.2 - - uses: actions/setup-dotnet@v3.1.0 + - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v3.1.0 + uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v3.1.0 + - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From ede5356d7b5d3bb4e87ef090cb5df401123d2fad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 01:59:41 +0000 Subject: [PATCH 197/255] Bump svenstaro/upload-release-action from 2.6.0 to 2.6.1 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.6.0...2.6.1) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index df1f5e55..c2b5ec87 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.6.0 + uses: svenstaro/upload-release-action@2.6.1 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From 875d5310592d651c0eb68a1a075c455b6e2af4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 2 Jun 2023 09:25:16 +0200 Subject: [PATCH 198/255] Instruct Dependabot to run monthly Instruct Dependabot to run monthly instead of daily. --- .github/dependabot.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2178c555..618d20bd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,13 +3,13 @@ updates: - package-ecosystem: nuget directory: "/" schedule: - interval: daily + interval: monthly target-branch: main - package-ecosystem: nuget directory: "/" schedule: - interval: daily + interval: monthly target-branch: support/1.x ignore: - dependency-name: Newtonsoft.Json @@ -17,11 +17,11 @@ updates: - package-ecosystem: github-actions directory: "/" schedule: - interval: daily + interval: monthly target-branch: main - package-ecosystem: github-actions directory: "/" schedule: - interval: daily + interval: monthly target-branch: support/1.x From a671ea323707ddcec1193472f3a6cb5294bcafb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 07:31:22 +0000 Subject: [PATCH 199/255] Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.6.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.6.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.0...v17.6.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c8f55e8c..c48f57ff 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From d635ea38e83de053e995cf7877e8c077ac244b68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 01:26:36 +0000 Subject: [PATCH 200/255] Bump Microsoft.NET.Test.Sdk from 17.6.1 to 17.6.3 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.1 to 17.6.3. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.1...v17.6.3) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c48f57ff..af893aee 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 552a0f342b54aaa3d94e692eb035390ef3b0b487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 01:39:12 +0000 Subject: [PATCH 201/255] Bump svenstaro/upload-release-action from 2.6.1 to 2.7.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.6.1...2.7.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index c2b5ec87..92475362 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.6.1 + uses: svenstaro/upload-release-action@2.7.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From f46a6de29f1672211b0da8526b0de644fec7ebbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 6 Aug 2023 23:51:30 +0000 Subject: [PATCH 202/255] Bump xunit from 2.4.2 to 2.5.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.4.2 to 2.5.0. - [Commits](https://github.com/xunit/xunit/compare/2.4.2...2.5.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index af893aee..a2898f5a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From c791dd9cf3dcd3f9f677ac796b3611be593961ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 6 Aug 2023 23:56:57 +0000 Subject: [PATCH 203/255] Bump xunit.runner.visualstudio from 2.4.5 to 2.5.0 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.5 to 2.5.0. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/v2.4.5...2.5.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index a2898f5a..85bcae67 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 21e1eac085d1badc8323ceac9589e6a0ca8d9dc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 01:51:49 +0000 Subject: [PATCH 204/255] Bump xunit from 2.5.0 to 2.6.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.5.0 to 2.6.0. - [Commits](https://github.com/xunit/xunit/compare/2.5.0...2.6.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 85bcae67..aa156b7f 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From c9f2cd607f2f38a1f3214e279669aa17cb1b833c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 08:32:41 +0000 Subject: [PATCH 205/255] Bump xunit.runner.visualstudio from 2.5.0 to 2.5.3 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.0 to 2.5.3. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.0...2.5.3) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index aa156b7f..a1d49cad 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 827e4ea19b8d498aada035bf453b413d5381ef7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 08:36:06 +0000 Subject: [PATCH 206/255] Bump Microsoft.NET.Test.Sdk from 17.6.3 to 17.7.2 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.3 to 17.7.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.3...v17.7.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index a1d49cad..1dc155c7 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 98dc26dcbab37dafdb5207fecffe49b159721ed7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 09:04:39 +0000 Subject: [PATCH 207/255] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- .github/workflows/dotnet.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f8bdbe5a..ced83a5e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: name: build & run tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: docker build diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 92475362..8cabced1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -15,7 +15,7 @@ jobs: fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From ac2554c0724b8d051bd1f7588039e411f170b792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 01:45:01 +0000 Subject: [PATCH 208/255] Bump Microsoft.NET.Test.Sdk from 17.7.2 to 17.8.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.2 to 17.8.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.7.2...v17.8.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 1dc155c7..f3b91474 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From b53003320896b2c0c233fb3bf874c6dd13f49fda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:06:10 +0000 Subject: [PATCH 209/255] Bump xunit.runner.visualstudio from 2.5.3 to 2.5.4 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.3 to 2.5.4. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.3...2.5.4) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index f3b91474..3a10776a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 4a699a7e772f7f9dc5ede0d1c5ca7359fabd205f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:08:56 +0000 Subject: [PATCH 210/255] Bump xunit from 2.6.0 to 2.6.2 Bumps [xunit](https://github.com/xunit/xunit) from 2.6.0 to 2.6.2. - [Commits](https://github.com/xunit/xunit/compare/2.6.0...2.6.2) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 3a10776a..5b1bbb02 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 31238c498d116e8b0bd48d539eb520bb35401cae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 01:43:17 +0000 Subject: [PATCH 211/255] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8cabced1..80fee587 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -66,7 +66,7 @@ jobs: src/json-ld.net/json-ld.net.csproj \ --output ${{ github.workspace }}/nugets/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: nugets path: nugets From fa779cd070e285018a26367bc9e69db058e42d8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:43:08 +0000 Subject: [PATCH 212/255] Bump xunit from 2.6.2 to 2.6.5 Bumps [xunit](https://github.com/xunit/xunit) from 2.6.2 to 2.6.5. - [Commits](https://github.com/xunit/xunit/compare/2.6.2...2.6.5) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 5b1bbb02..7ec7839f 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 0a1c6bb1b800af9613b9cafb76e14877bc7867e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:52:21 +0000 Subject: [PATCH 213/255] Bump xunit.runner.visualstudio from 2.5.4 to 2.5.6 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.4 to 2.5.6. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.4...2.5.6) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 7ec7839f..8858b5b3 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 6ce710eadb9e6b74d990ce3b9c9e7c66178dd0c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:10:02 +0000 Subject: [PATCH 214/255] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 80fee587..8bb44e65 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -78,7 +78,7 @@ jobs: steps: - name: download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nugets @@ -99,7 +99,7 @@ jobs: needs: build steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: nugets @@ -119,7 +119,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: nugets From 20e8ecb3fa2034ea4a53c72455a990681825840b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:11:51 +0000 Subject: [PATCH 215/255] Bump actions/setup-dotnet from 3.2.0 to 4.0.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.2.0 to 4.0.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.2.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8bb44e65..a2cf687f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v0.10.2 - - uses: actions/setup-dotnet@v3.2.0 + - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v3.2.0 + uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v3.2.0 + - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 0142bfb92c192f4a2fe9ef7f21789286f98acedc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 01:43:06 +0000 Subject: [PATCH 216/255] Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a2cf687f..2d72b558 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -30,7 +30,7 @@ jobs: with: dotnet-version: 6.0.x - - uses: actions/cache@v3 + - uses: actions/cache@v4 env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages with: From 4e83b5e9f10965374c54699fb27e3ea490bda83b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:17:00 +0000 Subject: [PATCH 217/255] Bump xunit from 2.6.5 to 2.6.6 Bumps [xunit](https://github.com/xunit/xunit) from 2.6.5 to 2.6.6. - [Commits](https://github.com/xunit/xunit/compare/2.6.5...2.6.6) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 8858b5b3..6f7d3aec 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 7079be17ddfc987605555543a16dd22c3d6d79e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:10:33 +0000 Subject: [PATCH 218/255] Bump svenstaro/upload-release-action from 2.7.0 to 2.9.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.7.0 to 2.9.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.7.0...2.9.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2d72b558..a5736562 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -124,7 +124,7 @@ jobs: name: nugets - name: Upload to stable release - uses: svenstaro/upload-release-action@2.7.0 + uses: svenstaro/upload-release-action@2.9.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: nugets From 5e6a9125868b17c0efac8e83ddcbd96203ad2dba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:49:20 +0000 Subject: [PATCH 219/255] Bump gittools/actions from 0.10.2 to 0.12.0 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.10.2 to 0.12.0. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.10.2...v0.12.0) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a5736562..4ca2b9c5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.10.2 + - uses: gittools/actions/gitversion/setup@v0.12.0 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.10.2 + uses: gittools/actions/gitversion/execute@v0.12.0 - uses: actions/setup-dotnet@v4.0.0 with: From aabe46c08e141a984cfbacd8832f02de0f120075 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:15:39 +0000 Subject: [PATCH 220/255] Bump Microsoft.NET.Test.Sdk from 17.8.0 to 17.9.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.8.0 to 17.9.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.8.0...v17.9.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 6f7d3aec..d7834433 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 40184cc2d5f25acece8705d369902bbbc52ba8ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:53:56 +0000 Subject: [PATCH 221/255] Bump coverlet.msbuild from 6.0.0 to 6.0.1 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.0...v6.0.1) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index d7834433..4f55f0a3 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 1952f9fc29d1179adab11748c5b287ffe1825fd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:20:15 +0000 Subject: [PATCH 222/255] Bump xunit.runner.visualstudio from 2.5.6 to 2.5.7 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.6 to 2.5.7. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.6...2.5.7) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4f55f0a3..4e856ab1 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 24271467357f4931740bbadcd6a47b1830431f2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:42:16 +0000 Subject: [PATCH 223/255] Bump xunit from 2.6.6 to 2.7.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.6.6 to 2.7.0. - [Commits](https://github.com/xunit/xunit/compare/2.6.6...2.7.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4e856ab1..7e37f774 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 6ad208776db97a09ce2d00315647eb75eb174db0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 01:41:04 +0000 Subject: [PATCH 224/255] Bump gittools/actions from 0.12.0 to 1.1.1 Bumps [gittools/actions](https://github.com/gittools/actions) from 0.12.0 to 1.1.1. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0.12.0...v1.1.1) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4ca2b9c5..6661218a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v0.12.0 + - uses: gittools/actions/gitversion/setup@v1.1.1 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v0.12.0 + uses: gittools/actions/gitversion/execute@v1.1.1 - uses: actions/setup-dotnet@v4.0.0 with: From 3d5be3f7af35b49c5287383b9d3e933fcea836f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:46:18 +0000 Subject: [PATCH 225/255] Bump coverlet.msbuild from 6.0.1 to 6.0.2 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 7e37f774..c5ce5477 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From f4530881c6d2dde172f3d93998492fbd1f569bc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 01:34:43 +0000 Subject: [PATCH 226/255] Bump xunit from 2.7.0 to 2.8.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.7.0 to 2.8.0. - [Commits](https://github.com/xunit/xunit/compare/2.7.0...2.8.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c5ce5477..e74aa4c8 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 0940ea163a7c3fc3a16cb501ae4a3ca15a4e6252 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 09:19:16 +0000 Subject: [PATCH 227/255] Bump xunit.runner.visualstudio from 2.5.7 to 2.8.0 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.7 to 2.8.0. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.7...2.8.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index e74aa4c8..c201f348 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 8ff9fb39ef59df2227bdc70fa6df40eff08f317c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 01:45:26 +0000 Subject: [PATCH 228/255] Bump xunit.runner.visualstudio from 2.8.0 to 2.8.1 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.8.0...2.8.1) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index c201f348..ca129ed3 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 7798e8afacf59e6cab3fc4e364435e56307517a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 09:32:47 +0000 Subject: [PATCH 229/255] Bump xunit from 2.8.0 to 2.8.1 Bumps [xunit](https://github.com/xunit/xunit) from 2.8.0 to 2.8.1. - [Commits](https://github.com/xunit/xunit/compare/2.8.0...2.8.1) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index ca129ed3..412fca25 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 945abb16ad3e887e7eea898ac2a4eb523d7e927a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 09:51:51 +0000 Subject: [PATCH 230/255] Bump Microsoft.NET.Test.Sdk from 17.9.0 to 17.10.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.9.0 to 17.10.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.9.0...v17.10.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 412fca25..8768036a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 55d98b79c028924cd10bdcce8ac2fb2bd5e89886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Sat, 3 Aug 2024 20:54:58 +0200 Subject: [PATCH 231/255] Add Dependabot groups --- .github/dependabot.yml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 618d20bd..c9c342f7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,13 +1,25 @@ version: 2 updates: - package-ecosystem: nuget - directory: "/" + labels: [dependency] + groups: + microsoft: + patterns: [Microsoft.*, System.*] + xunit: + patterns: [xunit.*] + directory: / schedule: interval: monthly target-branch: main - package-ecosystem: nuget - directory: "/" + labels: [dependency, support] + groups: + microsoft: + patterns: [Microsoft.*, System.*] + xunit: + patterns: [xunit.*] + directory: / schedule: interval: monthly target-branch: support/1.x @@ -15,13 +27,21 @@ updates: - dependency-name: Newtonsoft.Json - package-ecosystem: github-actions - directory: "/" + labels: [dependency] + groups: + actions: + patterns: [actions/*] + directory: / schedule: interval: monthly target-branch: main - package-ecosystem: github-actions - directory: "/" + labels: [dependency, support] + groups: + actions: + patterns: [actions/*] + directory: / schedule: interval: monthly target-branch: support/1.x From aaa6be2145a133cd6d548b950aec49f6d9e6bf89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 19:00:23 +0000 Subject: [PATCH 232/255] Bump gittools/actions from 1.1.1 to 3.0.0 Bumps [gittools/actions](https://github.com/gittools/actions) from 1.1.1 to 3.0.0. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v1.1.1...v3.0.0) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6661218a..008b4602 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v1.1.1 + - uses: gittools/actions/gitversion/setup@v3.0.0 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v1.1.1 + uses: gittools/actions/gitversion/execute@v3.0.0 - uses: actions/setup-dotnet@v4.0.0 with: From 2dbfb9cd7dd48fdc8a766fbca15d7d3d3f053357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 19:09:01 +0000 Subject: [PATCH 233/255] Bump actions/setup-dotnet from 4.0.0 to 4.0.1 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 008b4602..d7d8ef3d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v3.0.0 - - uses: actions/setup-dotnet@v4.0.0 + - uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v4.0.0 + - uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 13b1c438405677b9a03d1071bc833c632f7c2fa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 19:12:51 +0000 Subject: [PATCH 234/255] Bump xunit.runner.visualstudio from 2.8.1 to 2.8.2 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.8.1 to 2.8.2. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.8.1...2.8.2) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 8768036a..a7a1add9 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From b9c057d2405bc56a5aeabc5c5a2fe63a1c76f1be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 19:15:18 +0000 Subject: [PATCH 235/255] Bump xunit from 2.8.1 to 2.9.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.8.1 to 2.9.0. - [Commits](https://github.com/xunit/xunit/compare/2.8.1...2.9.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index a7a1add9..e3286608 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From e64af762095ae1e584c62c10be45a9fd62ee5da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 01:20:31 +0000 Subject: [PATCH 236/255] Bump Microsoft.NET.Test.Sdk in the microsoft group Bumps the microsoft group with 1 update: [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest). Updates `Microsoft.NET.Test.Sdk` from 17.10.0 to 17.11.0 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.10.0...v17.11.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index e3286608..6688f6d5 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 8a646c6634950433ad8e34da1f516949a4c85412 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 01:33:17 +0000 Subject: [PATCH 237/255] Bump xunit from 2.9.0 to 2.9.2 Bumps [xunit](https://github.com/xunit/xunit) from 2.9.0 to 2.9.2. - [Commits](https://github.com/xunit/xunit/compare/v2-2.9.0...v2-2.9.2) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 6688f6d5..4d95f742 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From 3c6d26b41dd1ffd9103955dd1cf28fa1eeb617e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:52:15 +0000 Subject: [PATCH 238/255] Bump Microsoft.NET.Test.Sdk in the microsoft group Bumps the microsoft group with 1 update: [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest). Updates `Microsoft.NET.Test.Sdk` from 17.11.0 to 17.11.1 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.0...v17.11.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 4d95f742..19bf8802 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 7a1b646912cf9b61bcc996e772c82412ae73287d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 01:28:07 +0000 Subject: [PATCH 239/255] Bump actions/setup-dotnet from 4.0.1 to 4.1.0 in the actions group Bumps the actions group with 1 update: [actions/setup-dotnet](https://github.com/actions/setup-dotnet). Updates `actions/setup-dotnet` from 4.0.1 to 4.1.0 - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.1...v4.1.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d7d8ef3d..bd735ed1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v3.0.0 - - uses: actions/setup-dotnet@v4.0.1 + - uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v4.0.1 + uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v4.0.1 + - uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 4e3139a357a6425560aad3184f0a17079efcf25b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:50:08 +0000 Subject: [PATCH 240/255] Bump gittools/actions from 3.0.0 to 3.0.3 Bumps [gittools/actions](https://github.com/gittools/actions) from 3.0.0 to 3.0.3. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v3.0.0...v3.0.3) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index bd735ed1..54f6b976 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v3.0.0 + - uses: gittools/actions/gitversion/setup@v3.0.3 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v3.0.0 + uses: gittools/actions/gitversion/execute@v3.0.3 - uses: actions/setup-dotnet@v4.1.0 with: From cee63a3254d300802e67fb0b6a82be1c786be84a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:13:24 +0000 Subject: [PATCH 241/255] Bump Microsoft.NET.Test.Sdk in the microsoft group Bumps the microsoft group with 1 update: [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest). Updates `Microsoft.NET.Test.Sdk` from 17.11.1 to 17.12.0 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.1...v17.12.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 19bf8802..f02df7b9 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From 3552ebc69849d39276ca097291665774908ef3ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 01:35:27 +0000 Subject: [PATCH 242/255] Bump gittools/actions from 3.0.3 to 3.1.1 Bumps [gittools/actions](https://github.com/gittools/actions) from 3.0.3 to 3.1.1. - [Release notes](https://github.com/gittools/actions/releases) - [Changelog](https://github.com/GitTools/actions/blob/main/GitReleaseManager.yml) - [Commits](https://github.com/gittools/actions/compare/v3.0.3...v3.1.1) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 54f6b976..21126cf3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v3.0.3 + - uses: gittools/actions/gitversion/setup@v3.1.1 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v3.0.3 + uses: gittools/actions/gitversion/execute@v3.1.1 - uses: actions/setup-dotnet@v4.1.0 with: From a22d3a114b15e62b6b0161dafc1e2d69766418b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:07:41 +0000 Subject: [PATCH 243/255] Bump actions/setup-dotnet from 4.1.0 to 4.2.0 in the actions group Bumps the actions group with 1 update: [actions/setup-dotnet](https://github.com/actions/setup-dotnet). Updates `actions/setup-dotnet` from 4.1.0 to 4.2.0 - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 21126cf3..f49de5de 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v3.1.1 - - uses: actions/setup-dotnet@v4.1.0 + - uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v4.1.0 + uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v4.1.0 + - uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 504646b4cc88ab0f9bb6ad34b81392f153a8a681 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:10:34 +0000 Subject: [PATCH 244/255] Bump coverlet.msbuild from 6.0.2 to 6.0.3 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index f02df7b9..1581df2a 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From 76c938db3e98d28b4393cbe5b4b5c8a36ed5ec23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:13:01 +0000 Subject: [PATCH 245/255] Bump xunit.runner.visualstudio from 2.8.2 to 3.0.0 in the xunit group Bumps the xunit group with 1 update: [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit). Updates `xunit.runner.visualstudio` from 2.8.2 to 3.0.0 - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.8.2...3.0.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-major dependency-group: xunit ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 1581df2a..322ad400 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From ac4b6a0a85dffeb7e123eeeff20b4732b7084196 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 01:49:54 +0000 Subject: [PATCH 246/255] Bump gittools/actions from 3.1.1 to 3.1.11 Bumps [gittools/actions](https://github.com/gittools/actions) from 3.1.1 to 3.1.11. - [Release notes](https://github.com/gittools/actions/releases) - [Changelog](https://github.com/GitTools/actions/blob/main/GitReleaseManager.yml) - [Commits](https://github.com/gittools/actions/compare/v3.1.1...v3.1.11) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f49de5de..84709012 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,12 +19,12 @@ jobs: with: fetch-depth: 0 - - uses: gittools/actions/gitversion/setup@v3.1.1 + - uses: gittools/actions/gitversion/setup@v3.1.11 with: versionSpec: 5.x - id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.1 + uses: gittools/actions/gitversion/execute@v3.1.11 - uses: actions/setup-dotnet@v4.2.0 with: From b2ca7f77119200113223d8eb0283f50617beb799 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:00:54 +0000 Subject: [PATCH 247/255] Bump actions/setup-dotnet from 4.2.0 to 4.3.0 in the actions group Bumps the actions group with 1 update: [actions/setup-dotnet](https://github.com/actions/setup-dotnet). Updates `actions/setup-dotnet` from 4.2.0 to 4.3.0 - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.2.0...v4.3.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 84709012..b897fd60 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v3.1.11 - - uses: actions/setup-dotnet@v4.2.0 + - uses: actions/setup-dotnet@v4.3.0 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v4.2.0 + uses: actions/setup-dotnet@v4.3.0 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v4.2.0 + - uses: actions/setup-dotnet@v4.3.0 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From 0cc1e28fa3d1c81d1623f7f85f8246fa426a136b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:02:23 +0000 Subject: [PATCH 248/255] Bump coverlet.msbuild from 6.0.3 to 6.0.4 Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.3...v6.0.4) --- updated-dependencies: - dependency-name: coverlet.msbuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 322ad400..504f1806 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -21,7 +21,7 @@ - + From dcb0554301510db2ac5b23181cad2e41d91cbd77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:04:50 +0000 Subject: [PATCH 249/255] Bump xunit from 2.9.2 to 2.9.3 Bumps [xunit](https://github.com/xunit/xunit) from 2.9.2 to 2.9.3. - [Commits](https://github.com/xunit/xunit/compare/v2-2.9.2...v2-2.9.3) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 504f1806..ec191695 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -23,7 +23,7 @@ - + From c68e1034015f019e1c50680082a74871252f38e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:06:41 +0000 Subject: [PATCH 250/255] Bump xunit.runner.visualstudio from 3.0.0 to 3.0.1 in the xunit group Bumps the xunit group with 1 update: [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit). Updates `xunit.runner.visualstudio` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch dependency-group: xunit ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index ec191695..5b22e4df 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From e42f2976ccf08a9eb93e9aece859387fd3658958 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 01:54:59 +0000 Subject: [PATCH 251/255] Bump xunit.runner.visualstudio from 3.0.1 to 3.0.2 in the xunit group Bumps the xunit group with 1 update: [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit). Updates `xunit.runner.visualstudio` from 3.0.1 to 3.0.2 - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/3.0.1...3.0.2) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch dependency-group: xunit ... Signed-off-by: dependabot[bot] --- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 5b22e4df..7ff8312f 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -24,7 +24,7 @@ - + From 7d6023769425a33672ceb0437807b838a32a5c3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:45:08 +0000 Subject: [PATCH 252/255] Bump the microsoft group with 3 updates Bumps the microsoft group with 3 updates: [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink), [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) and [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest). Updates `Microsoft.SourceLink.GitHub` from 1.1.1 to 8.0.0 - [Release notes](https://github.com/dotnet/sourcelink/releases) - [Commits](https://github.com/dotnet/sourcelink/compare/1.1.1...8.0.0) Updates `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.3 to 1.0.3 - [Commits](https://github.com/Microsoft/dotnet/commits) Updates `Microsoft.NET.Test.Sdk` from 17.12.0 to 17.13.0 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.12.0...v17.13.0) --- updated-dependencies: - dependency-name: Microsoft.SourceLink.GitHub dependency-type: direct:production update-type: version-update:semver-major dependency-group: microsoft - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-type: direct:production update-type: version-update:semver-patch dependency-group: microsoft - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: microsoft ... Signed-off-by: dependabot[bot] --- src/json-ld.net/json-ld.net.csproj | 4 ++-- test/json-ld.net.tests/json-ld.net.tests.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/json-ld.net/json-ld.net.csproj b/src/json-ld.net/json-ld.net.csproj index df6a47c0..bcf2e108 100644 --- a/src/json-ld.net/json-ld.net.csproj +++ b/src/json-ld.net/json-ld.net.csproj @@ -1,4 +1,4 @@ - + JSON-LD processor for .NET @@ -23,7 +23,7 @@ Implements the W3C JSON-LD 1.0 standard. - + diff --git a/test/json-ld.net.tests/json-ld.net.tests.csproj b/test/json-ld.net.tests/json-ld.net.tests.csproj index 7ff8312f..7e3c0d28 100644 --- a/test/json-ld.net.tests/json-ld.net.tests.csproj +++ b/test/json-ld.net.tests/json-ld.net.tests.csproj @@ -22,7 +22,7 @@ - + From efbc0a06bb6838b73f45dfb18b5e08a31ac5ffb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 01:33:11 +0000 Subject: [PATCH 253/255] Bump actions/setup-dotnet from 4.3.0 to 4.3.1 in the actions group Bumps the actions group with 1 update: [actions/setup-dotnet](https://github.com/actions/setup-dotnet). Updates `actions/setup-dotnet` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-version: 4.3.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b897fd60..2507c88a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,7 +26,7 @@ jobs: - id: gitversion uses: gittools/actions/gitversion/execute@v3.1.11 - - uses: actions/setup-dotnet@v4.3.0 + - uses: actions/setup-dotnet@v4.3.1 with: dotnet-version: 6.0.x @@ -83,7 +83,7 @@ jobs: name: nugets - name: setup dotnet - uses: actions/setup-dotnet@v4.3.0 + uses: actions/setup-dotnet@v4.3.1 with: dotnet-version: 6.0.x source-url: https://nuget.pkg.github.com/linked-data-dotnet/index.json @@ -103,7 +103,7 @@ jobs: with: name: nugets - - uses: actions/setup-dotnet@v4.3.0 + - uses: actions/setup-dotnet@v4.3.1 with: dotnet-version: 6.0.x source-url: https://api.nuget.org/v3/index.json From e2f773b600ee3d5613234cf9e49f77c9329e5b28 Mon Sep 17 00:00:00 2001 From: Olexandr88 Date: Thu, 18 Sep 2025 14:03:07 +0300 Subject: [PATCH 254/255] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 359b0779..9bbf4fac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # json-ld.net [![NuGet][nuget-badge]][nuget] -![Build Status][gha-badge] +[![Build Status][gha-badge][build] [![codecov][codecov-badge]][codecov] ## Introduction @@ -681,8 +681,9 @@ https://github.com/linked-data-dotnet/json-ld.net [dnc]: https://dot.net [dnc-tutorial]: https://www.microsoft.com/net/core - [gha-badge]: https://github.com/linked-data-dotnet/json-ld.net/workflows/dotnet/badge.svg - + [gha-badge]: https://github.com/linked-data-dotnet/json-ld.net/actions/workflows/dotnet.yml/badge.svg + [build]: https://github.com/linked-data-dotnet/json-ld.net/actions/workflows/dotnet.yml + [jsonld]: https://json-ld.org/ [jsonld-java]: https://github.com/jsonld-java/jsonld-java From 03752c7381a273a3efbe56ec5d750ca1ea41c7b8 Mon Sep 17 00:00:00 2001 From: Olexandr88 Date: Thu, 18 Sep 2025 14:04:29 +0300 Subject: [PATCH 255/255] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bbf4fac..05a63fb2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # json-ld.net [![NuGet][nuget-badge]][nuget] -[![Build Status][gha-badge][build] +[![Build Status][gha-badge]][build] [![codecov][codecov-badge]][codecov] ## Introduction