Skip to content

Commit 1f10228

Browse files
gregsdennisgregsdennis
authored
Merge pull request #712 from gregsdennis/nuget-updates
Nuget updates
2 parents 5a9c156 + 218469d commit 1f10228

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1270
-742
lines changed

‎.editorconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ indent_style = tab
44
indent_size = tab
55
tab_width = 4
66

7-
[*.{css,json}]
7+
[*.{css,json,md}]
88
indent_style = space
99
indent_size = 2
1010
tab_width = 2
@@ -1913,8 +1913,3 @@ resharper_xaml_xaml_xamarin_forms_data_type_and_binding_context_type_mismatched_
19131913
resharper_xaml_x_key_attribute_disallowed_highlighting = error
19141914
resharper_xml_doc_comment_syntax_problem_highlighting = warning
19151915
resharper_xunit_xunit_test_with_console_output_highlighting = warning
1916-
1917-
[*.{appxmanifest,asax,ascx,aspx,axaml,axml,build,config,cs,cshtml,csproj,css,dbml,discomap,dtd,htm,html,js,json,jsproj,jsx,lsproj,master,njsproj,nuspec,paml,proj,props,proto,razor,resjson,resw,resx,skin,StyleCop,targets,tasks,ts,tsx,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
1918-
indent_style = tab
1919-
indent_size = tab
1920-
tab_width = 4

‎Json.More/Json.More.csproj

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,33 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<NoWarn>CS1570,IDE0290</NoWarn>
8+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
9+
<DocumentationFile>Json.More.xml</DocumentationFile>
10+
<SignAssembly>true</SignAssembly>
11+
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
12+
13+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
516
<PackageId>Json.More.Net</PackageId>
6-
<Authors>Greg Dennis</Authors>
7-
<Version>2.0.1</Version>
17+
<Version>2.0.1.1</Version>
18+
<FileVersion>2.0.1.1</FileVersion>
819
<AssemblyVersion>2.0.0.0</AssemblyVersion>
9-
<FileVersion>2.0.1</FileVersion>
10-
<Description>
11-
Provides extended functionality for the System.Text.Json namespace.
12-
13-
Read the full documentation at https://docs.json-everything.net/more/json-more/.
14-
</Description>
15-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
20+
<Authors>Greg Dennis</Authors>
21+
<Description>Provides extended functionality for the System.Text.Json namespace.</Description>
22+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
23+
<PackageIcon>json-logo-256.png</PackageIcon>
1624
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
1725
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
1826
<PackageTags>json system.text.json json.more</PackageTags>
19-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
20-
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-more/</PackageReleaseNotes>
21-
<LangVersion>latest</LangVersion>
22-
<DocumentationFile>Json.More.xml</DocumentationFile>
23-
<PackageIcon>json-logo-256.png</PackageIcon>
24-
<IncludeSymbols>true</IncludeSymbols>
25-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27+
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-more/</PackageReleaseNotes>
2628
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2729
<EmbedUntrackedSources>true</EmbedUntrackedSources>
28-
<SignAssembly>true</SignAssembly>
29-
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
30-
<NoWarn>CS1570,IDE0290</NoWarn>
31-
<Nullable>enable</Nullable>
32-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
33-
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
30+
31+
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
3432
</PropertyGroup>
3533

3634
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
@@ -39,23 +37,18 @@
3937

4038
<ItemGroup>
4139
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
42-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
40+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
4341
</ItemGroup>
4442

4543
<ItemGroup>
4644
<None Include="..\tools\ApiDocsGenerator\release-notes\rn-json-more.md" Link="release-notes.md" />
47-
<None Include="..\LICENSE">
48-
<Pack>True</Pack>
49-
<PackagePath></PackagePath>
50-
</None>
51-
<None Include="..\Resources\json-logo-256.png">
52-
<Pack>True</Pack>
53-
<PackagePath></PackagePath>
54-
</None>
45+
<None Include="README.md" Pack="true" PackagePath="\" />
46+
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
47+
<None Include="..\Resources\json-logo-256.png" Pack="true" PackagePath="\" />
5548
</ItemGroup>
5649

5750
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
58-
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
51+
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
5952
</Target>
6053

6154
</Project>

‎Json.More/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Summary
2+
3+
_Json.More.Net_ provides extended functionality for the _System.Text.Json_ namespace, such as
4+
5+
- Deep equality comparisons
6+
- Enum serialization (including `[Flags]` support)
7+
- Native AOT support
8+
- and more...
9+
10+
## Links
11+
12+
- [Documentation](https://docs.json-everything.net/more/json-more/)
13+
- [API Reference](https://docs.json-everything.net/api/Json.More/JsonNodeExtensions/)
14+
- [Release Notes](https://docs.json-everything.net/rn-json-more/)

‎JsonE/JsonE.csproj

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,56 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
5-
<LangVersion>latest</LangVersion>
6-
<RootNamespace>Json.JsonE</RootNamespace>
7-
<AssemblyName>JsonE.Net</AssemblyName>
8-
<Authors>Greg Dennis</Authors>
9-
<Company>Greg Dennis</Company>
10-
<Description>
11-
[JSON-e](https://json-e.js.org) built on the System.Text.Json namespace.
12-
13-
Read the full documentation at https://docs.json-everything.net/json-e/basics/.
14-
</Description>
15-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16-
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
17-
<PackageIcon>json-logo-256.png</PackageIcon>
18-
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
19-
<PackageTags>json json-e jsone template transform</PackageTags>
20-
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-e/</PackageReleaseNotes>
21-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
22-
<Version>2.1.0</Version>
23-
<AssemblyVersion>2.0.0.0</AssemblyVersion>
24-
<FileVersion>2.1.0</FileVersion>
25-
<DocumentationFile>JsonE.Net.xml</DocumentationFile>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
29-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
30-
<SignAssembly>true</SignAssembly>
31-
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
32-
<Nullable>enable</Nullable>
33-
<NoWarn>CS1570,IDE0290</NoWarn>
34-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
35-
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
36-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<NoWarn>CS1570,IDE0290</NoWarn>
8+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
9+
<RootNamespace>Json.JsonE</RootNamespace>
10+
<AssemblyName>JsonE.Net</AssemblyName>
11+
<DocumentationFile>JsonE.Net.xml</DocumentationFile>
12+
<SignAssembly>true</SignAssembly>
13+
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
3714

38-
<ItemGroup>
39-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
40-
<PackageReference Include="IndexRange" Version="1.0.3" PrivateAssests="All" />
41-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
42-
</ItemGroup>
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<IncludeSymbols>true</IncludeSymbols>
17+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
18+
<Version>2.1.0.1</Version>
19+
<FileVersion>2.1.0.1</FileVersion>
20+
<AssemblyVersion>2.0.0.0</AssemblyVersion>
21+
<Authors>Greg Dennis</Authors>
22+
<Description>JSON-e built on the System.Text.Json namespace</Description>
23+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
24+
<PackageIcon>json-logo-256.png</PackageIcon>
25+
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
26+
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
27+
<PackageTags>json json-e jsone template transform</PackageTags>
28+
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-e/</PackageReleaseNotes>
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
31+
32+
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
33+
</PropertyGroup>
4334

44-
<ItemGroup>
45-
<None Include="..\tools\ApiDocsGenerator\release-notes\rn-json-e.md" Link="release-notes.md" />
46-
<None Include="..\LICENSE">
47-
<Pack>True</Pack>
48-
<PackagePath></PackagePath>
49-
</None>
50-
<None Include="..\Resources\json-logo-256.png">
51-
<Pack>True</Pack>
52-
<PackagePath></PackagePath>
53-
</None>
54-
</ItemGroup>
35+
<ItemGroup>
36+
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
37+
<PackageReference Include="IndexRange" Version="1.0.3" PrivateAssests="All" />
38+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
39+
</ItemGroup>
5540

56-
<ItemGroup>
57-
<ProjectReference Include="..\Json.More\Json.More.csproj" />
58-
</ItemGroup>
41+
<ItemGroup>
42+
<None Include="..\tools\ApiDocsGenerator\release-notes\rn-json-e.md" Link="release-notes.md" />
43+
<None Include="README.md" Pack="true" PackagePath="\" />
44+
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
45+
<None Include="..\Resources\json-logo-256.png" Pack="true" PackagePath="\" />
46+
</ItemGroup>
5947

60-
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
61-
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
62-
</Target>
48+
<ItemGroup>
49+
<ProjectReference Include="..\Json.More\Json.More.csproj" />
50+
</ItemGroup>
51+
52+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
53+
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
54+
</Target>
6355

6456
</Project>

‎JsonE/README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## Summary
2+
3+
_JsonE.Net_ implements the [JSON-e](https://json-e.js.org/) format, a data-structure parameterization system for embedding context in JSON objects.
4+
5+
## Links
6+
7+
- [Documentation](https://docs.json-everything.net/json-e/basics/)
8+
- [API Reference](https://docs.json-everything.net/api/JsonE.Net/JsonE/)
9+
- [Release Notes](https://docs.json-everything.net/rn-json-e/)
10+
11+
## Usage
12+
13+
```c#
14+
var template = JsonNode.Parse(
15+
"{\"$eval\": \"(z / x) ** 2\"}"
16+
);
17+
var context = JsonNode.Parse(
18+
"{\"x\": 10, \"z\": 20, \"s\": \"face\", \"t\": \"plant\"}"
19+
)!.AsObject();
20+
21+
var result = JsonE.Evaluate(template, context);
22+
23+
// result: 4
24+
```

‎JsonLogic/JsonLogic.csproj

Lines changed: 47 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,55 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
5-
<LangVersion>latest</LangVersion>
6-
<RootNamespace>Json.Logic</RootNamespace>
7-
<AssemblyName>JsonLogic</AssemblyName>
8-
<Authors>Greg Dennis</Authors>
9-
<Company>Greg Dennis</Company>
10-
<Description>
11-
[JsonLogic](https://jsonlogic.com) built on the System.Text.Json namespace.
12-
13-
Read the full documentation at https://docs.json-everything.net/logic/basics/.
14-
</Description>
15-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16-
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
17-
<PackageIcon>json-logo-256.png</PackageIcon>
18-
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
19-
<PackageTags>json logic json-logic jsonlogic</PackageTags>
20-
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-logic/</PackageReleaseNotes>
21-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
22-
<Version>5.2.0</Version>
23-
<FileVersion>5.2.0.0</FileVersion>
24-
<AssemblyVersion>5.0.0.0</AssemblyVersion>
25-
<DocumentationFile>JsonLogic.xml</DocumentationFile>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
29-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
30-
<SignAssembly>true</SignAssembly>
31-
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
32-
<Nullable>enable</Nullable>
33-
<NoWarn>CS1570;CS8618</NoWarn>
34-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
35-
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
36-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<NoWarn>CS1570;CS8618</NoWarn>
8+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
9+
<RootNamespace>Json.Logic</RootNamespace>
10+
<AssemblyName>JsonLogic</AssemblyName>
11+
<DocumentationFile>JsonLogic.xml</DocumentationFile>
12+
<SignAssembly>true</SignAssembly>
13+
<AssemblyOriginatorKeyFile>../json-everything.snk</AssemblyOriginatorKeyFile>
14+
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<IncludeSymbols>true</IncludeSymbols>
17+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
18+
<Version>5.2.0.1</Version>
19+
<FileVersion>5.2.0.1</FileVersion>
20+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
21+
<Authors>Greg Dennis</Authors>
22+
<Description>JsonLogic built on the System.Text.Json namespace</Description>
23+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
24+
<PackageIcon>json-logo-256.png</PackageIcon>
25+
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
26+
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
27+
<PackageTags>json logic json-logic jsonlogic</PackageTags>
28+
<PackageReleaseNotes>Release notes can be found at https://docs.json-everything.net/rn-json-logic/</PackageReleaseNotes>
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3731

38-
<ItemGroup>
39-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
40-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
41-
</ItemGroup>
32+
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
33+
</PropertyGroup>
4234

43-
<ItemGroup>
44-
<None Include="..\tools\ApiDocsGenerator\release-notes\rn-json-logic.md" Link="release-notes.md" />
45-
<None Include="..\LICENSE">
46-
<Pack>True</Pack>
47-
<PackagePath></PackagePath>
48-
</None>
49-
<None Include="..\Resources\json-logo-256.png">
50-
<Pack>True</Pack>
51-
<PackagePath></PackagePath>
52-
</None>
53-
</ItemGroup>
35+
<ItemGroup>
36+
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
38+
</ItemGroup>
5439

55-
<ItemGroup>
56-
<ProjectReference Include="..\JsonPointer\JsonPointer.csproj" />
57-
</ItemGroup>
40+
<ItemGroup>
41+
<None Include="..\tools\ApiDocsGenerator\release-notes\rn-json-logic.md" Link="release-notes.md" />
42+
<None Include="README.md" Pack="true" PackagePath="\" />
43+
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
44+
<None Include="..\Resources\json-logo-256.png" Pack="true" PackagePath="\" />
45+
</ItemGroup>
5846

59-
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
60-
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
61-
</Target>
47+
<ItemGroup>
48+
<ProjectReference Include="..\JsonPointer\JsonPointer.csproj" />
49+
</ItemGroup>
50+
51+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
52+
<Copy SourceFiles="$(TargetDir)$(DocumentationFile)" DestinationFolder="..\doc-tool\xml\" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" />
53+
</Target>
6254

6355
</Project>

0 commit comments

Comments
 (0)