Skip to content

Commit 7667b5c

Browse files
QilongTangQilongTang
authored
Update NewtonSoft.Json to be v13 (#47)
1 parent 5fda0ad commit 7667b5c

File tree

15 files changed

+69
-21
lines changed

15 files changed

+69
-21
lines changed

‎src/SampleExtension/SampleExtension.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@
8787
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8888
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
8989
</Reference>
90-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
92-
<Private>False</Private>
90+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9392
</Reference>
9493
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
9594
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
@@ -141,6 +140,7 @@
141140
<Compile Include="Properties\AssemblyInfo.cs" />
142141
</ItemGroup>
143142
<ItemGroup>
143+
<None Include="app.config" />
144144
<None Include="packages.config" />
145145
</ItemGroup>
146146
<ItemGroup>

‎src/SampleExtension/app.config‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
12+
</dependentAssembly>
13+
</assemblyBinding>
14+
</runtime>
15+
</configuration>

‎src/SampleExtension/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="DynamoVisualProgramming.DynamoServices" version="2.12.0-beta4933" targetFramework="net48" />
66
<package id="DynamoVisualProgramming.WpfUILibrary" version="2.12.0-beta4933" targetFramework="net48" />
77
<package id="DynamoVisualProgramming.ZeroTouchLibrary" version="2.12.0-beta4933" targetFramework="net48" />
8-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
99
<package id="NUnit" version="2.6.3" targetFramework="net45" />
1010
<package id="Prism" version="4.1.0.0" targetFramework="net45" />
1111
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />

‎src/SampleLibraryTests/SampleLibraryTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@
8585
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8686
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
8787
</Reference>
88-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
89-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
90-
<Private>False</Private>
88+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
89+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9190
</Reference>
9291
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
9392
<SpecificVersion>False</SpecificVersion>
@@ -145,6 +144,7 @@
145144
<Compile Include="Properties\AssemblyInfo.cs" />
146145
</ItemGroup>
147146
<ItemGroup>
147+
<None Include="app.config" />
148148
<None Include="HelloDynamoSystemTest.dyn">
149149
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150150
</None>

‎src/SampleLibraryTests/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
1515
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
1616
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
20+
</dependentAssembly>
1721
</assemblyBinding>
1822
</runtime>
1923
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

‎src/SampleLibraryTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="DynamoVisualProgramming.DynamoServices" version="2.12.0-beta4933" targetFramework="net48" />
66
<package id="DynamoVisualProgramming.Tests" version="2.12.0-beta4933" targetFramework="net48" />
77
<package id="DynamoVisualProgramming.ZeroTouchLibrary" version="2.12.0-beta4933" targetFramework="net48" />
8-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
99
<package id="NUnit" version="2.6.3" targetFramework="net4" />
1010
<package id="Prism" version="4.1.0.0" targetFramework="net4" />
1111
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />

‎src/SampleLibraryUI/SampleLibraryUI.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@
9595
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9696
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
9797
</Reference>
98-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
99-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
100-
<Private>False</Private>
98+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
99+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
101100
</Reference>
102101
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
103102
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>

‎src/SampleLibraryUI/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

‎src/SampleLibraryUI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="DynamoVisualProgramming.DynamoServices" version="2.12.0-beta4933" targetFramework="net48" />
66
<package id="DynamoVisualProgramming.WpfUILibrary" version="2.12.0-beta4933" targetFramework="net48" />
77
<package id="DynamoVisualProgramming.ZeroTouchLibrary" version="2.12.0-beta4933" targetFramework="net48" />
8-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
99
<package id="NUnit" version="2.6.3" targetFramework="net45" />
1010
<package id="Prism" version="4.1.0.0" targetFramework="net45" />
1111
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />

‎src/SampleLibraryZeroTouch/SampleLibraryZeroTouch.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@
8484
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8585
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
8686
</Reference>
87-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
89-
<Private>False</Private>
87+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9089
</Reference>
9190
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
9291
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
@@ -144,6 +143,7 @@
144143
<Compile Include="Examples\TraceExample.cs" />
145144
</ItemGroup>
146145
<ItemGroup>
146+
<None Include="app.config" />
147147
<None Include="packages.config" />
148148
</ItemGroup>
149149
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)