Skip to content

Commit edecfe3

Browse files
jamesmontemagnojamesmontemagno
committed
Update json.net in finish app
1 parent a2edc9b commit edecfe3

File tree

11 files changed

+49
-35
lines changed

11 files changed

+49
-35
lines changed

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.Droid/DevDaysSpeakers.Droid.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
</Reference>
7171
<Reference Include="Mono.Android" />
7272
<Reference Include="mscorlib" />
73-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
73+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Plugin.TextToSpeech, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.Droid/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<assemblyIdentity name="Microsoft.WindowsAzure.Mobile.SQLiteStore" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1919
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
2020
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
24+
</dependentAssembly>
2125
</assemblyBinding>
2226
</runtime>
2327
</configuration>

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.Droid/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
77
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
88
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid60" />
9-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="monoandroid60" />
9+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
1010
<package id="SQLitePCL" version="3.8.7.2" targetFramework="monoandroid60" />
1111
<package id="Xam.Plugins.TextToSpeech" version="2.0.0" targetFramework="monoandroid60" />
1212
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.UWP/project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"Microsoft.Bcl.Build": "1.0.21",
77
"Microsoft.Net.Http": "2.2.29",
88
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
9+
"Newtonsoft.Json": "9.0.1",
910
"SQLitePCL": "3.8.7.2",
1011
"Xam.Plugins.TextToSpeech": "2.0.0",
1112
"Xamarin.Forms": "2.3.0.107"

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.UWP/project.lock.json‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@
313313
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
314314
}
315315
},
316-
"Newtonsoft.Json/6.0.4": {
316+
"Newtonsoft.Json/9.0.1": {
317317
"compile": {
318-
"lib/netcore45/Newtonsoft.Json.dll": {}
318+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
319319
},
320320
"runtime": {
321-
"lib/netcore45/Newtonsoft.Json.dll": {}
321+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
322322
}
323323
},
324324
"SQLitePCL/3.8.7.2": {
@@ -2191,12 +2191,12 @@
21912191
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
21922192
}
21932193
},
2194-
"Newtonsoft.Json/6.0.4": {
2194+
"Newtonsoft.Json/9.0.1": {
21952195
"compile": {
2196-
"lib/netcore45/Newtonsoft.Json.dll": {}
2196+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
21972197
},
21982198
"runtime": {
2199-
"lib/netcore45/Newtonsoft.Json.dll": {}
2199+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
22002200
}
22012201
},
22022202
"SQLitePCL/3.8.7.2": {
@@ -3915,12 +3915,12 @@
39153915
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
39163916
}
39173917
},
3918-
"Newtonsoft.Json/6.0.4": {
3918+
"Newtonsoft.Json/9.0.1": {
39193919
"compile": {
3920-
"lib/netcore45/Newtonsoft.Json.dll": {}
3920+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
39213921
},
39223922
"runtime": {
3923-
"lib/netcore45/Newtonsoft.Json.dll": {}
3923+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
39243924
}
39253925
},
39263926
"SQLitePCL/3.8.7.2": {
@@ -5637,12 +5637,12 @@
56375637
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
56385638
}
56395639
},
5640-
"Newtonsoft.Json/6.0.4": {
5640+
"Newtonsoft.Json/9.0.1": {
56415641
"compile": {
5642-
"lib/netcore45/Newtonsoft.Json.dll": {}
5642+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
56435643
},
56445644
"runtime": {
5645-
"lib/netcore45/Newtonsoft.Json.dll": {}
5645+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
56465646
}
56475647
},
56485648
"SQLitePCL/3.8.7.2": {
@@ -7361,12 +7361,12 @@
73617361
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
73627362
}
73637363
},
7364-
"Newtonsoft.Json/6.0.4": {
7364+
"Newtonsoft.Json/9.0.1": {
73657365
"compile": {
7366-
"lib/netcore45/Newtonsoft.Json.dll": {}
7366+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
73677367
},
73687368
"runtime": {
7369-
"lib/netcore45/Newtonsoft.Json.dll": {}
7369+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
73707370
}
73717371
},
73727372
"SQLitePCL/3.8.7.2": {
@@ -9083,12 +9083,12 @@
90839083
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
90849084
}
90859085
},
9086-
"Newtonsoft.Json/6.0.4": {
9086+
"Newtonsoft.Json/9.0.1": {
90879087
"compile": {
9088-
"lib/netcore45/Newtonsoft.Json.dll": {}
9088+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
90899089
},
90909090
"runtime": {
9091-
"lib/netcore45/Newtonsoft.Json.dll": {}
9091+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
90929092
}
90939093
},
90949094
"SQLitePCL/3.8.7.2": {
@@ -10807,12 +10807,12 @@
1080710807
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
1080810808
}
1080910809
},
10810-
"Newtonsoft.Json/6.0.4": {
10810+
"Newtonsoft.Json/9.0.1": {
1081110811
"compile": {
10812-
"lib/netcore45/Newtonsoft.Json.dll": {}
10812+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
1081310813
},
1081410814
"runtime": {
10815-
"lib/netcore45/Newtonsoft.Json.dll": {}
10815+
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll": {}
1081610816
}
1081710817
},
1081810818
"SQLitePCL/3.8.7.2": {
@@ -13058,11 +13058,11 @@
1305813058
"ref/xamarinmac20/_._"
1305913059
]
1306013060
},
13061-
"Newtonsoft.Json/6.0.4": {
13062-
"sha512": "FyQLmEpjsCrEP+znauLDGAi+h6i9YnaMkITlfIoiM4RYyX3nki306bTHsr/0okiIvIc7BJhQTbOAIZVocccFUw==",
13061+
"Newtonsoft.Json/9.0.1": {
13062+
"sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==",
1306313063
"type": "package",
1306413064
"files": [
13065-
"Newtonsoft.Json.6.0.4.nupkg.sha512",
13065+
"Newtonsoft.Json.9.0.1.nupkg.sha512",
1306613066
"Newtonsoft.Json.nuspec",
1306713067
"lib/net20/Newtonsoft.Json.dll",
1306813068
"lib/net20/Newtonsoft.Json.xml",
@@ -13072,8 +13072,8 @@
1307213072
"lib/net40/Newtonsoft.Json.xml",
1307313073
"lib/net45/Newtonsoft.Json.dll",
1307413074
"lib/net45/Newtonsoft.Json.xml",
13075-
"lib/netcore45/Newtonsoft.Json.dll",
13076-
"lib/netcore45/Newtonsoft.Json.xml",
13075+
"lib/netstandard1.0/Newtonsoft.Json.dll",
13076+
"lib/netstandard1.0/Newtonsoft.Json.xml",
1307713077
"lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll",
1307813078
"lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml",
1307913079
"lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll",
@@ -15928,6 +15928,7 @@
1592815928
"Microsoft.Bcl.Build >= 1.0.21",
1592915929
"Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0",
1593015930
"Microsoft.Net.Http >= 2.2.29",
15931+
"Newtonsoft.Json >= 9.0.1",
1593115932
"SQLitePCL >= 3.8.7.2",
1593215933
"Xam.Plugins.TextToSpeech >= 2.0.0",
1593315934
"Xamarin.Forms >= 2.3.0.107"

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.iOS/DevDaysSpeakers.iOS.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
<HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.SQLiteStore.2.1.0\lib\portable-win+net45+wp8+wpa81+monotouch+monoandroid\Microsoft.WindowsAzure.Mobile.SQLiteStore.dll</HintPath>
134134
<Private>True</Private>
135135
</Reference>
136-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
137-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
136+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
137+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
138138
<Private>True</Private>
139139
</Reference>
140140
<Reference Include="Plugin.TextToSpeech, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.iOS/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<assemblyIdentity name="Microsoft.WindowsAzure.Mobile.SQLiteStore" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1919
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
2020
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
24+
</dependentAssembly>
2125
</assemblyBinding>
2226
</runtime>
2327
</configuration>

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers.iOS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="xamarinios10" />
77
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="xamarinios10" />
88
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="xamarinios10" />
9-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="xamarinios10" />
9+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
1010
<package id="SQLitePCL" version="3.8.7.2" targetFramework="xamarinios10" />
1111
<package id="Xam.Plugins.TextToSpeech" version="2.0.0" targetFramework="xamarinios10" />
1212
<package id="Xamarin.Forms" version="2.3.0.107" targetFramework="xamarinios10" />

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers/DevDaysSpeakers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.SQLiteStore.2.1.0\lib\portable-win+net45+wp8+wpa81+monotouch+monoandroid\Microsoft.WindowsAzure.Mobile.SQLiteStore.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
62+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="Plugin.TextToSpeech, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

‎HandsOnLab/Finish/DevDaysSpeakers/DevDaysSpeakers/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<assemblyIdentity name="Microsoft.WindowsAzure.Mobile.SQLiteStore" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
1212
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
16+
</dependentAssembly>
1317
</assemblyBinding>
1418
</runtime>
1519
</configuration>

0 commit comments

Comments
 (0)