Skip to content

Commit b5ffdc8

Browse files
1eyewonder1eyewonder
committed
Removed Newtonsoft redirects. Ran dotnet paket update Newtonsoft.Json --clean-redirects 
1 parent e80dfdd commit b5ffdc8

File tree

7 files changed

+66
-196
lines changed

7 files changed

+66
-196
lines changed

‎integrationtests/Paket.IntegrationTests/App.config‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,7 @@
33
<runtime>
44
<AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
55

6-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7-
<dependentAssembly>
8-
<Paket>True</Paket>
9-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<Paket>True</Paket>
14-
<assemblyIdentity name="System.Collections.NonGeneric" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<Paket>True</Paket>
19-
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
21-
</dependentAssembly>
22-
<dependentAssembly>
23-
<Paket>True</Paket>
24-
<assemblyIdentity name="System.Xml.XmlDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
25-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
26-
</dependentAssembly>
27-
</assemblyBinding></runtime>
6+
</runtime>
287
<startup>
298
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
309
</startup>

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ storage: none
44
content: none
55
framework >= net461, >= net80
66

7-
nuget Newtonsoft.Json >= 10.0.3 redirects: force
7+
nuget Newtonsoft.Json >= 10.0.3
88
nuget Argu >= 5.1.0
99
nuget FSharp.Core >= 6.0.3
1010
nuget Chessie >= 0.6

‎paket.lock‎

Lines changed: 60 additions & 115 deletions
Large diffs are not rendered by default.

‎src/Paket.Core/app.config‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4-
<dependentAssembly>
5-
<Paket>True</Paket>
6-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding></runtime></configuration>
3+
</configuration>

‎src/Paket/App.config‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,4 @@
44
<startup>
55
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
66
</startup>
7-
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<Paket>True</Paket>
10-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
12-
</dependentAssembly>
13-
</assemblyBinding></runtime></configuration>
7+
</configuration>

‎tests/Paket.Bootstrapper.Tests/app.config‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4-
<dependentAssembly>
5-
<Paket>True</Paket>
6-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
8-
</dependentAssembly>
9-
<dependentAssembly>
10-
<Paket>True</Paket>
11-
<assemblyIdentity name="System.Collections.NonGeneric" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
12-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
13-
</dependentAssembly>
14-
<dependentAssembly>
15-
<Paket>True</Paket>
16-
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
17-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
18-
</dependentAssembly>
19-
<dependentAssembly>
20-
<Paket>True</Paket>
21-
<assemblyIdentity name="System.Xml.XmlDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
23-
</dependentAssembly>
24-
</assemblyBinding></runtime></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

‎tests/Paket.Tests/App.config‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,7 @@
33
<runtime>
44
<AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
55

6-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7-
<dependentAssembly>
8-
<Paket>True</Paket>
9-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<Paket>True</Paket>
14-
<assemblyIdentity name="System.Collections.NonGeneric" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<Paket>True</Paket>
19-
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
21-
</dependentAssembly>
22-
<dependentAssembly>
23-
<Paket>True</Paket>
24-
<assemblyIdentity name="System.Xml.XmlDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
25-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
26-
</dependentAssembly>
27-
</assemblyBinding></runtime>
6+
</runtime>
287
<startup>
298
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
309
</startup>

0 commit comments

Comments
 (0)