Skip to content

Commit 8d374b6

Browse files
committed
Remove Newtonsoft.Json binding redirects
- where possible, entirely remove app.config files - w/ consistent Newtonsoft.Json versions, these special cases are mostly not needed - auto-generation of .config file handles the special case just fine in System.Net.Http.Formatting.NetStandard.Test.csproj and System.Web.Http.SignalR.Test.csproj
1 parent 388abe1 commit 8d374b6

File tree

29 files changed

+0
-173
lines changed

29 files changed

+0
-173
lines changed

test/Microsoft.AspNet.Facebook.Test/App.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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-7.0.0.0" newVersion="7.0.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
113
<appSettings>
124
<add key="Facebook:AppId" value="123456" />
135
<add key="Facebook:AppSecret" value="abcdefg" />

test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
</ProjectReference>
154154
</ItemGroup>
155155
<ItemGroup>
156-
<None Include="app.config" />
157156
<None Include="packages.config" />
158157
</ItemGroup>
159158
<ItemGroup>

test/Microsoft.Web.Mvc.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Net.Http.Formatting.NetCore.Test/app.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<configuration>
33
<runtime>
44
<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-7.0.0.0" newVersion="7.0.0.0" />
8-
</dependentAssembly>
95
<dependentAssembly>
106
<assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
117
<bindingRedirect oldVersion="0.0.0.0-4.2.13.0" newVersion="4.2.13.0" />

test/System.Net.Http.Formatting.NetStandard.Test/System.Net.Http.Formatting.NetStandard.Test.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<ProjectReference Include="..\..\src\System.Net.Http.Formatting.NetStandard\System.Net.Http.Formatting.NetStandard.csproj" />
2424
<ProjectReference Include="..\Microsoft.TestCommon\Microsoft.TestCommon.csproj" />
2525
</ItemGroup>
26-
<ItemGroup>
27-
<None Include="app.config" />
28-
</ItemGroup>
2926
<ItemGroup>
3027
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
3128
</ItemGroup>

test/System.Net.Http.Formatting.NetStandard.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Net.Http.Formatting.Test/System.Net.Http.Formatting.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
</ProjectReference>
178178
</ItemGroup>
179179
<ItemGroup>
180-
<None Include="app.config" />
181180
<None Include="packages.config">
182181
<SubType>Designer</SubType>
183182
</None>

test/System.Net.Http.Formatting.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.Cors.Test/System.Web.Http.Cors.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
</Reference>
4949
</ItemGroup>
5050
<ItemGroup>
51-
<None Include="app.config" />
5251
<None Include="packages.config" />
5352
</ItemGroup>
5453
<ItemGroup>

test/System.Web.Http.Cors.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.Integration.Test/System.Web.Http.Integration.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
</ProjectReference>
145145
</ItemGroup>
146146
<ItemGroup>
147-
<None Include="app.config" />
148147
<None Include="packages.config" />
149148
</ItemGroup>
150149
<ItemGroup>

test/System.Web.Http.Integration.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
</ProjectReference>
101101
</ItemGroup>
102102
<ItemGroup>
103-
<None Include="app.config" />
104103
<None Include="packages.config" />
105104
</ItemGroup>
106105
<ItemGroup>

test/System.Web.Http.Owin.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.SelfHost.Test/System.Web.Http.SelfHost.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<Compile Include="ServiceModel\HostNameComparisonModeHelperTest.cs" />
7474
</ItemGroup>
7575
<ItemGroup>
76-
<None Include="app.config" />
7776
<None Include="packages.config" />
7877
</ItemGroup>
7978
<ItemGroup>

test/System.Web.Http.SelfHost.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.SignalR.Test/System.Web.Http.SignalR.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
</ProjectReference>
7171
</ItemGroup>
7272
<ItemGroup>
73-
<None Include="app.config" />
7473
<None Include="packages.config" />
7574
</ItemGroup>
7675
<ItemGroup>

test/System.Web.Http.SignalR.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.Test/System.Web.Http.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375
<Compile Include="ValueProviders\ValueProviderResultTest.cs" />
376376
</ItemGroup>
377377
<ItemGroup>
378-
<None Include="app.config" />
379378
<None Include="packages.config" />
380379
</ItemGroup>
381380
<ItemGroup>

test/System.Web.Http.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<Compile Include="SystemDiagnosticsTraceWriterTest.cs" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<None Include="app.config" />
4948
<None Include="packages.config" />
5049
</ItemGroup>
5150
<ItemGroup>

test/System.Web.Http.Tracing.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Http.WebHost.Test/System.Web.Http.WebHost.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<Compile Include="SuppressFormsAuthRedirectHelperTest.cs" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<None Include="app.config" />
7675
<None Include="packages.config" />
7776
</ItemGroup>
7877
<ItemGroup>

test/System.Web.Http.WebHost.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@
402402
</ProjectReference>
403403
</ItemGroup>
404404
<ItemGroup>
405-
<None Include="app.config" />
406405
<None Include="packages.config" />
407406
</ItemGroup>
408407
<ItemGroup>

test/System.Web.Mvc.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/WebApiHelpPage.Test/WebApiHelpPage.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<Compile Include="HelpPageConfigurationExtensionsTest.cs" />
7878
</ItemGroup>
7979
<ItemGroup>
80-
<None Include="app.config" />
8180
<None Include="packages.config">
8281
<SubType>Designer</SubType>
8382
</None>

test/WebApiHelpPage.Test/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/WebApiHelpPage.VB.Test/WebApiHelpPage.VB.Test.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@
108108
</Compile>
109109
</ItemGroup>
110110
<ItemGroup>
111-
<None Include="..\WebApiHelpPage.Test\app.config">
112-
<Link>app.config</Link>
113-
</None>
114111
<None Include="..\WebApiHelpPage.Test\packages.config">
115112
<Link>packages.config</Link>
116113
<SubType>Designer</SubType>

0 commit comments

Comments
 (0)