Skip to content

Commit 0874680

Browse files
brettsambrettsam
authored
updating Web.config redirects; adding regression test (#2500)
1 parent a0bcc39 commit 0874680

File tree

9 files changed

+144
-213
lines changed

9 files changed

+144
-213
lines changed

‎src/WebJobs.Script.Host/App.config‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,7 @@
2929
<dependentAssembly>
3030
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
3131
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
32-
</dependentAssembly>
33-
<dependentAssembly>
34-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
36-
</dependentAssembly>
37-
<dependentAssembly>
38-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
39-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
40-
</dependentAssembly>
41-
<dependentAssembly>
42-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
44-
</dependentAssembly>
45-
<dependentAssembly>
46-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
48-
</dependentAssembly>
49-
<dependentAssembly>
50-
<assemblyIdentity name="Microsoft.Azure.WebJobs.ServiceBus" publicKeyToken="31bf3856ad364e35" culture="neutral" />
51-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
52-
</dependentAssembly>
53-
<dependentAssembly>
54-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.DocumentDB" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
56-
</dependentAssembly>
57-
<dependentAssembly>
58-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.MobileApps" culture="neutral" />
59-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
60-
</dependentAssembly>
61-
<dependentAssembly>
62-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" culture="neutral" />
63-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
64-
</dependentAssembly>
65-
<dependentAssembly>
66-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.SendGrid" culture="neutral" />
67-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
68-
</dependentAssembly>
69-
<dependentAssembly>
70-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Twilio" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
72-
</dependentAssembly>
32+
</dependentAssembly>
7333
<dependentAssembly>
7434
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7535
<bindingRedirect oldVersion="0.0.0.0-7.2.1.0" newVersion="7.2.1.0" />

‎src/WebJobs.Script.WebHost/Web.config‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</location>
4646
<system.webServer>
4747
<modules runAllManagedModulesForAllRequests="true">
48-
<remove name="ServiceModel-4.0" />
48+
<remove name="ServiceModel-4.0" />
4949
</modules>
5050

5151
<validation validateIntegratedModeConfiguration="false" />
@@ -100,35 +100,55 @@
100100
</dependentAssembly>
101101
<dependentAssembly>
102102
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
103-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
103+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
104+
</dependentAssembly>
105+
<dependentAssembly>
106+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
107+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
104108
</dependentAssembly>
105109
<dependentAssembly>
106110
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions" culture="neutral" />
107-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
111+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
108112
</dependentAssembly>
109113
<dependentAssembly>
110114
<assemblyIdentity name="Microsoft.Azure.WebJobs.ServiceBus" publicKeyToken="31bf3856ad364e35" culture="neutral" />
111-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
115+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
116+
</dependentAssembly>
117+
<dependentAssembly>
118+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.ApiHub" culture="neutral" />
119+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
120+
</dependentAssembly>
121+
<dependentAssembly>
122+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.BotFramework" culture="neutral" />
123+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
112124
</dependentAssembly>
113125
<dependentAssembly>
114126
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.DocumentDB" culture="neutral" />
127+
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
128+
</dependentAssembly>
129+
<dependentAssembly>
130+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.EventGrid" culture="neutral" />
131+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
132+
</dependentAssembly>
133+
<dependentAssembly>
134+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Http" culture="neutral" />
115135
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
116136
</dependentAssembly>
117137
<dependentAssembly>
118138
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.MobileApps" culture="neutral" />
119-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
139+
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
120140
</dependentAssembly>
121141
<dependentAssembly>
122142
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" culture="neutral" />
123-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
143+
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
124144
</dependentAssembly>
125145
<dependentAssembly>
126146
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.SendGrid" culture="neutral" />
127-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
147+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
128148
</dependentAssembly>
129149
<dependentAssembly>
130150
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Twilio" culture="neutral" />
131-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
151+
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
132152
</dependentAssembly>
133153
<dependentAssembly>
134154
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎src/WebJobs.Script/app.config‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,7 @@
4141
<dependentAssembly>
4242
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
4343
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0"/>
44-
</dependentAssembly>
45-
<dependentAssembly>
46-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
47-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
48-
</dependentAssembly>
49-
<dependentAssembly>
50-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
51-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
52-
</dependentAssembly>
53-
<dependentAssembly>
54-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
55-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
56-
</dependentAssembly>
57-
<dependentAssembly>
58-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions" culture="neutral"/>
59-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
60-
</dependentAssembly>
61-
<dependentAssembly>
62-
<assemblyIdentity name="Microsoft.Azure.WebJobs.ServiceBus" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
63-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
64-
</dependentAssembly>
65-
<dependentAssembly>
66-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.DocumentDB" culture="neutral"/>
67-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
68-
</dependentAssembly>
69-
<dependentAssembly>
70-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.MobileApps" culture="neutral"/>
71-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
72-
</dependentAssembly>
73-
<dependentAssembly>
74-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" culture="neutral"/>
75-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
76-
</dependentAssembly>
77-
<dependentAssembly>
78-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.SendGrid" culture="neutral"/>
79-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
80-
</dependentAssembly>
81-
<dependentAssembly>
82-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Twilio" culture="neutral"/>
83-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
84-
</dependentAssembly>
44+
</dependentAssembly>
8545
<dependentAssembly>
8646
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
8747
<bindingRedirect oldVersion="0.0.0.0-7.2.1.0" newVersion="7.2.1.0"/>

‎test/WebJobs.Script.Scaling.Tests/App.config‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,46 +41,6 @@
4141
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
4242
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
4343
</dependentAssembly>
44-
<dependentAssembly>
45-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
46-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
47-
</dependentAssembly>
48-
<dependentAssembly>
49-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
50-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
51-
</dependentAssembly>
52-
<dependentAssembly>
53-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
54-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
55-
</dependentAssembly>
56-
<dependentAssembly>
57-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions" culture="neutral" />
58-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
59-
</dependentAssembly>
60-
<dependentAssembly>
61-
<assemblyIdentity name="Microsoft.Azure.WebJobs.ServiceBus" publicKeyToken="31bf3856ad364e35" culture="neutral" />
62-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
63-
</dependentAssembly>
64-
<dependentAssembly>
65-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.DocumentDB" culture="neutral" />
66-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
67-
</dependentAssembly>
68-
<dependentAssembly>
69-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.MobileApps" culture="neutral" />
70-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
71-
</dependentAssembly>
72-
<dependentAssembly>
73-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" culture="neutral" />
74-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
75-
</dependentAssembly>
76-
<dependentAssembly>
77-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.SendGrid" culture="neutral" />
78-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
79-
</dependentAssembly>
80-
<dependentAssembly>
81-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Twilio" culture="neutral" />
82-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
83-
</dependentAssembly>
8444
<dependentAssembly>
8545
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
8646
<bindingRedirect oldVersion="0.0.0.0-7.2.1.0" newVersion="7.2.1.0" />

‎test/WebJobs.Script.Tests.Integration/App.config‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,47 +36,7 @@
3636
<dependentAssembly>
3737
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
3838
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
39-
</dependentAssembly>
40-
<dependentAssembly>
41-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
42-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
43-
</dependentAssembly>
44-
<dependentAssembly>
45-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
46-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
47-
</dependentAssembly>
48-
<dependentAssembly>
49-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
50-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
51-
</dependentAssembly>
52-
<dependentAssembly>
53-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions" culture="neutral" />
54-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
55-
</dependentAssembly>
56-
<dependentAssembly>
57-
<assemblyIdentity name="Microsoft.Azure.WebJobs.ServiceBus" publicKeyToken="31bf3856ad364e35" culture="neutral" />
58-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
59-
</dependentAssembly>
60-
<dependentAssembly>
61-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.DocumentDB" culture="neutral" />
62-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
63-
</dependentAssembly>
64-
<dependentAssembly>
65-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.MobileApps" culture="neutral" />
66-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
67-
</dependentAssembly>
68-
<dependentAssembly>
69-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" culture="neutral" />
70-
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
71-
</dependentAssembly>
72-
<dependentAssembly>
73-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.SendGrid" culture="neutral" />
74-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
75-
</dependentAssembly>
76-
<dependentAssembly>
77-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Extensions.Twilio" culture="neutral" />
78-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
79-
</dependentAssembly>
39+
</dependentAssembly>
8040
<dependentAssembly>
8141
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
8242
<bindingRedirect oldVersion="0.0.0.0-7.2.1.0" newVersion="7.2.1.0" />

0 commit comments

Comments
 (0)