diff --git a/Build/build.ps1 b/Build/build.ps1 index 1beda345..718de33c 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,7 @@ properties { $zipFileName = "Json130r3.zip" $majorVersion = "13.0" - $majorWithReleaseVersion = "13.0.1" + $majorWithReleaseVersion = "13.0.2" $nugetPrerelease = $null $version = GetVersion $majorWithReleaseVersion $packageId = "Newtonsoft.Json" @@ -14,7 +14,7 @@ $workingName = if ($workingName) {$workingName} else {"Working"} $assemblyVersion = if ($assemblyVersion) {$assemblyVersion} else {$majorVersion + '.0.0'} $netCliChannel = "Current" - $netCliVersion = "5.0.300" + $netCliVersion = "6.0.100" $nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $ensureNetCliSdk = $true diff --git a/Build/version.json b/Build/version.json index 4589a2d6..7e0f6ad3 100644 --- a/Build/version.json +++ b/Build/version.json @@ -1,6 +1,6 @@ { "Major": 13, - "Release": 1, + "Release": 2, "Prerelease": null, "Assembly": null } \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index 4dd7b55a..6f4bea65 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -18,8 +18,9 @@ Json.NET Newtonsoft.Json json + README.md packageIcon.png - $(MSBuildThisFileDirectory)packageIcon.png + https://www.newtonsoft.com/content/images/nugeticon.png https://www.newtonsoft.com/json MIT true @@ -36,7 +37,8 @@ - + + diff --git a/Src/Newtonsoft.Json/README.md b/Src/Newtonsoft.Json/README.md new file mode 100644 index 00000000..9982a45c --- /dev/null +++ b/Src/Newtonsoft.Json/README.md @@ -0,0 +1,71 @@ +# ![Logo](https://raw.githubusercontent.com/JamesNK/Newtonsoft.Json/master/Doc/icons/logo.jpg) Json.NET + +[![NuGet version (Newtonsoft.Json)](https://img.shields.io/nuget/v/Newtonsoft.Json.svg?style=flat-square)](https://www.nuget.org/packages/Newtonsoft.Json/) +[![Build status](https://dev.azure.com/jamesnk/Public/_apis/build/status/JamesNK.Newtonsoft.Json?branchName=master)](https://dev.azure.com/jamesnk/Public/_build/latest?definitionId=8) + +Json.NET is a popular high-performance JSON framework for .NET + +## Serialize JSON + +```csharp +Product product = new Product(); +product.Name = "Apple"; +product.Expiry = new DateTime(2008, 12, 28); +product.Sizes = new string[] { "Small" }; + +string json = JsonConvert.SerializeObject(product); +// { +// "Name": "Apple", +// "Expiry": "2008-12-28T00:00:00", +// "Sizes": [ +// "Small" +// ] +// } +``` + +## Deserialize JSON + +```csharp +string json = @"{ + 'Name': 'Bad Boys', + 'ReleaseDate': '1995-4-7T00:00:00', + 'Genres': [ + 'Action', + 'Comedy' + ] +}"; + +Movie m = JsonConvert.DeserializeObject(json); + +string name = m.Name; +// Bad Boys +``` + +## LINQ to JSON + +```csharp +JArray array = new JArray(); +array.Add("Manual text"); +array.Add(new DateTime(2000, 5, 23)); + +JObject o = new JObject(); +o["MyArray"] = array; + +string json = o.ToString(); +// { +// "MyArray": [ +// "Manual text", +// "2000-05-23T00:00:00" +// ] +// } +``` + +## Links + +- [Homepage](https://www.newtonsoft.com/json) +- [Documentation](https://www.newtonsoft.com/json/help) +- [NuGet Package](https://www.nuget.org/packages/Newtonsoft.Json) +- [Release Notes](https://github.com/JamesNK/Newtonsoft.Json/releases) +- [Contributing Guidelines](https://github.com/JamesNK/Newtonsoft.Json/blob/master/CONTRIBUTING.md) +- [License](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md) +- [Stack Overflow](https://stackoverflow.com/questions/tagged/json.net) diff --git a/Src/global.json b/Src/global.json index a601da31..04702084 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.300" + "version": "6.0.100" } } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e946ce43..85e6cfa7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,25 @@ pool: vmImage: 'windows-2019' steps: +- task: UseDotNet@2 + inputs: + version: '6.0.x' + +- task: UseDotNet@2 + inputs: + version: '2.1.x' + packageType: runtime + +- task: UseDotNet@2 + inputs: + version: '3.1.x' + packageType: runtime + +- task: UseDotNet@2 + inputs: + version: '5.0.x' + packageType: runtime + - powershell: | dotnet --info displayName: 'Dotnet installs'