Skip to content

Commit 5b45cef

Browse files
norbertedernorberteder
committed
Update dependencies
1 parent e58c297 commit 5b45cef

19 files changed

Lines changed: 759 additions & 16813 deletions

File tree

‎source/IdentityServer3.Contrib.Localization.UI.Tests/bin/Release/assets/_consent.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>
3131
<strong>{{scope.displayName}}</strong>
3232
<span ng-show="scope.emphasize" class="glyphicon glyphicon-exclamation-sign"></span>
3333
</label>
34-
<span ng-show="scope.required"><em>(required)</em></span>
34+
<span ng-show="scope.required"><em>[[consent.required]]</em></span>
3535
<div class="consent-description" ng-show="scope.description">
3636
<label for="scopes_{{scope.name}}">{{scope.description}}</label>
3737
</div>

‎source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,6 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
100100
)</PostBuildEvent>
101101
</PropertyGroup>
102102
<Choose>
103-
<When Condition="$(TargetFrameworkIdentifier) == '.NETCore'">
104-
<ItemGroup>
105-
<Reference Include="Newtonsoft.Json">
106-
<HintPath>..\packages\Newtonsoft.Json\lib\netcore45\Newtonsoft.Json.dll</HintPath>
107-
<Private>True</Private>
108-
<Paket>True</Paket>
109-
</Reference>
110-
</ItemGroup>
111-
</When>
112103
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
113104
<ItemGroup>
114105
<Reference Include="Newtonsoft.Json">
@@ -145,7 +136,7 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
145136
</Reference>
146137
</ItemGroup>
147138
</When>
148-
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
139+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
149140
<ItemGroup>
150141
<Reference Include="Newtonsoft.Json">
151142
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
@@ -154,10 +145,10 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
154145
</Reference>
155146
</ItemGroup>
156147
</When>
157-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
148+
<When Condition="($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile259')">
158149
<ItemGroup>
159150
<Reference Include="Newtonsoft.Json">
160-
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll</HintPath>
151+
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll</HintPath>
161152
<Private>True</Private>
162153
<Paket>True</Paket>
163154
</Reference>

‎source/packages/Newtonsoft.Json/Newtonsoft.Json.6.0.8.nupkg‎

-1.49 MB
Binary file not shown.

‎source/packages/Newtonsoft.Json/Newtonsoft.Json.nuspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Newtonsoft.Json</id>
5-
<version>6.0.8</version>
5+
<version>7.0.1</version>
66
<title>Json.NET</title>
77
<authors>James Newton-King</authors>
88
<owners>James Newton-King</owners>
99
<licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
10-
<projectUrl>http://james.newtonking.com/json</projectUrl>
10+
<projectUrl>http://www.newtonsoft.com/json</projectUrl>
11+
<iconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</iconUrl>
1112
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1213
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
1314
<language>en-US</language>

‎source/packages/Newtonsoft.Json/_rels/.rels‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?xml version="1.0" encoding="utf-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Type="http://schemas.microsoft.com/packaging/2010/07/manifest" Target="/Newtonsoft.Json.nuspec" Id="R4451b7b7f56445bc" /><Relationship Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="/package/services/metadata/core-properties/d6cceb7474b245aab29598e10c6e65d6.psmdcp" Id="Re56b6c7c05f244d9" /></Relationships>
1+
<?xml version="1.0" encoding="utf-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Type="http://schemas.microsoft.com/packaging/2010/07/manifest" Target="/Newtonsoft.Json.nuspec" Id="R8dca86d23f7e4090" /><Relationship Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="/package/services/metadata/core-properties/49e907fc018c4c7ab632e6d4ad4766f8.psmdcp" Id="Ra94cb890213f42d5" /></Relationships>

0 commit comments

Comments
 (0)