Skip to content

Commit 7a85479

Browse files
tianyiliuMSFTtianyiliuMSFT
committed
fix Microsoft.WindowsAzure.Storage version conflict
change Microsoft.WindowsAzure.Storage version: bindingRedirect in App.config, 0.0.0.0-8.7.0.0 will be redirected to 8.4.0.0
1 parent e75142b commit 7a85479

File tree

19 files changed

+22
-18
lines changed

19 files changed

+22
-18
lines changed

‎Scheduler/DynamicNodeGroups/DynamicNodeGroups/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

‎Scheduler/ExpandedPriorities/ExpandedPriorities/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

‎Scheduler/Filters/dll/Activation FlexLM/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎Scheduler/Filters/dll/Activation HoldUntil/ActivationHoldUntil/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎Scheduler/Filters/dll/ComboDiagLogging/ComboDiagLogging/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎Scheduler/Filters/dll/Submission JobSize/SubmissionJobSize/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎Scheduler/Filters/exe/Activation FlexLM/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
88
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
99
</dependentAssembly>
10+
<dependentAssembly>
11+
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
12+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
13+
</dependentAssembly>
1014
</assemblyBinding>
1115
</runtime>
1216
</configuration>

‎Scheduler/Filters/exe/Activation HoldUntil/ActivationHoldUntil/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

‎Scheduler/Filters/exe/Submission JobSize/SubmissionJobSize/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

‎Scheduler/HPCSchedulerBasics/HPCSchedulerBasics/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-8.4.0.0" newVersion="8.4.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.4.0.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

0 commit comments

Comments
 (0)