Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JamesNK/Newtonsoft.Json
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.0.5
Choose a base ref
...
head repository: JamesNK/Newtonsoft.Json
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13.0.1
Choose a head ref
Loading
Showing 1,141 changed files with 416,526 additions and 108,790 deletions.
20 changes: 20 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '{build}'
branches:
only:
- master
- /^v\d+(?:\.\d+)?$/
- /[\b_]validate\b/
skip_tags: true
nuget:
disable_publish_on_pr: true
image: Visual Studio 2017
configuration: Release
environment:
VisualStudioVersion: 15.0
init:
git config --global core.autocrlf true
build_script:
- ps: Build\runbuild.ps1
artifacts:
- path: Working\NuGet\*.nupkg
name: NuGet Package
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
*.jpg binary
*.png binary
*.gif binary
*.bson binary

*.cs text diff=csharp
*.vb text
33 changes: 21 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
[Bb]in/
[Oo]bj/
[Ww]orking/
Build/runbuild.txt
Doc/doc.shfbproj_*
TestResults/
AppPackages/
*.suo
*.user
_ReSharper.*
*.ReSharper.user
*.resharper.user
[Bb]in/
[Oo]bj/
[Ww]orking*/
Build/Temp/
Doc/doc.shfbproj_*
TestResults/
AppPackages/
BenchmarkDotNet.Artifacts/
*.suo
*.user
*.userprefs
_ReSharper.*
*.ReSharper.user
*.resharper.user
.vs/
.vscode/
*.lock.json
*.nuget.props
*.nuget.targets
*.orig
.DS_Store
14 changes: 0 additions & 14 deletions Build/Newtonsoft.Json.nuspec

This file was deleted.

26 changes: 26 additions & 0 deletions Build/Sign-Package.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

$currentDirectory = split-path $MyInvocation.MyCommand.Definition

# See if we have the ClientSecret available
if([string]::IsNullOrEmpty($Env:SignClientSecret)){
Write-Host "Client Secret not found, not signing packages"
return;
}

dotnet tool install --tool-path . SignClient

# Setup Variables we need to pass into the sign client tool

$appSettings = "$currentDirectory\appsettings.json"

$files = gci $Env:ArtifactDirectory\*.nupkg,*.zip -recurse | Select -ExpandProperty FullName

foreach ($file in $files){
Write-Host "Submitting $file for signing"

.\SignClient 'sign' -c $appSettings -i $file -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Json.NET' -d 'Json.NET' -u 'https://www.newtonsoft.com/json'

Write-Host "Finished signing $file"
}

Write-Host "Sign-package complete"
13 changes: 13 additions & 0 deletions Build/appsettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"SignClient": {
"AzureAd": {
"AADInstance": "https://login.microsoftonline.com/",
"ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
"TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
},
"Service": {
"Url": "https://codesign.dotnetfoundation.org/",
"ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
}
}
}
Loading