Skip to content
This repository has been archived by the owner on May 16, 2022. It is now read-only.

Commit

Permalink
Ready to 1.3.5
Browse files Browse the repository at this point in the history
neuecc committed Jan 19, 2018
1 parent 0ed0ff5 commit bb837a3
Showing 10 changed files with 33 additions and 29 deletions.
6 changes: 3 additions & 3 deletions docs/Utf8Json.AspNetCoreMvcFormatter.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Utf8Json.AspNetCoreMvcFormatter</id>
<version>1.3.4</version>
<version>1.3.5</version>
<title>Utf8Json AspNetCoreMvcFormatter</title>
<authors>neuecc</authors>
<owners>neuecc</owners>
@@ -13,11 +13,11 @@
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin, ASPNET</tags>
<dependencies>
<group targetFramework=".NETFramework4.7">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
8 changes: 4 additions & 4 deletions docs/Utf8Json.ImmutableCollection.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Utf8Json.ImmutableCollection</id>
<version>1.3.4</version>
<version>1.3.5</version>
<title>Utf8Json Extension Resolver for ImmutableCollection</title>
<authors>neuecc</authors>
<owners>neuecc</owners>
@@ -12,15 +12,15 @@
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
<dependencies>
<group targetFramework=".NETFramework4.7">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
</group>
</dependencies>
8 changes: 4 additions & 4 deletions docs/Utf8Json.UnityShims.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Utf8Json.UnityShims</id>
<version>1.3.4</version>
<version>1.3.5</version>
<title>Utf8Json UnityShims</title>
<authors>neuecc</authors>
<owners>neuecc</owners>
@@ -12,15 +12,15 @@
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
<dependencies>
<group targetFramework=".NETFramework4.7">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Utf8Json" version="1.3.4" exclude="Build,Analyzers" />
<dependency id="Utf8Json" version="1.3.5" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
</group>
</dependencies>
2 changes: 1 addition & 1 deletion docs/Utf8Json.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Utf8Json</id>
<version>1.3.4</version>
<version>1.3.5</version>
<title>Utf8Json</title>
<authors>neuecc</authors>
<owners>neuecc</owners>
8 changes: 4 additions & 4 deletions docs/push.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nuget push Utf8Json.1.3.4.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.ImmutableCollection.1.3.4.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.UnityShims.1.3.4.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.4.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.1.3.5.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.ImmutableCollection.1.3.5.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.UnityShims.1.3.5.nupkg -Source https://www.nuget.org/api/v2/package
nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.5.nupkg -Source https://www.nuget.org/api/v2/package
14 changes: 9 additions & 5 deletions sandbox/ConsoleAppNetCore/Program.cs
Original file line number Diff line number Diff line change
@@ -9,6 +9,12 @@
using System.Linq;
using System.Text;


public class FooException : Exception
{
public int Bar { get; set; }
}

namespace ConsoleAppNetCore
{
public class CustomPoint
@@ -329,11 +335,9 @@ public void SetId(Guid id)
static unsafe void Main(string[] args)
{

var origstr = new string('a', 99999);
var str = "\"" + origstr + "\"";

var serialized = JsonSerializer.Serialize(str);
var deserialized = JsonSerializer.Deserialize<string>(serialized);
var ex = new Exception("ABC", new FooException { Bar = 100 });
var json = JsonSerializer.ToJsonString(ex);
Console.WriteLine(JsonSerializer.PrettyPrint(json));

}

4 changes: 2 additions & 2 deletions src/Utf8Json.AspNetCoreMvcFormatter/_AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]

[assembly: Guid("899f8b6c-c4c7-4e8b-9875-f61fdfb630bd")]
[assembly: AssemblyVersion("1.3.4")]
[assembly: AssemblyFileVersion("1.3.4")]
[assembly: AssemblyVersion("1.3.5")]
[assembly: AssemblyFileVersion("1.3.5")]
4 changes: 2 additions & 2 deletions src/Utf8Json.ImmutableCollection/_AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]

[assembly: Guid("2e7ac239-3db1-4772-9f47-5f62abb56ed0")]
[assembly: AssemblyVersion("1.3.4")]
[assembly: AssemblyFileVersion("1.3.4")]
[assembly: AssemblyVersion("1.3.5")]
[assembly: AssemblyFileVersion("1.3.5")]
4 changes: 2 additions & 2 deletions src/Utf8Json.UnityShims/_AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]

[assembly: Guid("bf5d0a42-70b7-417d-af8c-2f7e073057e2")]
[assembly: AssemblyVersion("1.3.4")]
[assembly: AssemblyFileVersion("1.3.4")]
[assembly: AssemblyVersion("1.3.5")]
[assembly: AssemblyFileVersion("1.3.5")]
4 changes: 2 additions & 2 deletions src/Utf8Json/_AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]

[assembly: Guid("929e3779-4c3a-42a3-bc72-3d77511e988f")]
[assembly: AssemblyVersion("1.3.4")]
[assembly: AssemblyFileVersion("1.3.4")]
[assembly: AssemblyVersion("1.3.5")]
[assembly: AssemblyFileVersion("1.3.5")]

0 comments on commit bb837a3

Please sign in to comment.