Sitelet https://github.com/microsoft/vstest/commit/955a9e7b9812e235e5e1adfdb670455d9ebad8e2
Skip to content

Commit 955a9e7

Browse files
nohwndCopilot
nohwnd
and
Copilot
committed
Add binding redirect for System.Diagnostics.DiagnosticSource
Add binding redirect for System.Diagnostics.DiagnosticSource (8.0.0.1) to vstest.console, testhost.x86, and datacollector app.config files. This is needed after replacing the VSSDK-sourced DLL with the 8.0.1 NuGet package. Also fix vstest.console/app.config which had a duplicate System.Runtime.CompilerServices.Unsafe entry, and widen the Unsafe oldVersion range from 1.0.0.0 to 0.0.0.0 in all three config files to cover all possible version requests. Verified System.Runtime.CompilerServices.Unsafe assembly version (6.0.0.0) matches the existing newVersion in binding redirects. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ca121e5 commit 955a9e7

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

‎src/datacollector/app.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</dependentAssembly>
2323
<dependentAssembly>
2424
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
25-
<bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
25+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
2626
</dependentAssembly>
2727
<dependentAssembly>
2828
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -32,6 +32,10 @@
3232
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
3333
<bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
3434
</dependentAssembly>
35+
<dependentAssembly>
36+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
37+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
38+
</dependentAssembly>
3539
</assemblyBinding>
3640
</runtime>
3741
</configuration>

‎src/testhost.x86/app.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dependentAssembly>
3636
<dependentAssembly>
3737
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
38-
<bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
38+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
3939
</dependentAssembly>
4040
<dependentAssembly>
4141
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -45,6 +45,10 @@
4545
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
4646
<bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
4747
</dependentAssembly>
48+
<dependentAssembly>
49+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
50+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
51+
</dependentAssembly>
4852
</assemblyBinding>
4953
</runtime>
5054
<system.diagnostics>

‎src/vstest.console/app.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependentAssembly>
2828
<dependentAssembly>
2929
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
30-
<bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
30+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
3131
</dependentAssembly>
3232
<dependentAssembly>
3333
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -44,8 +44,8 @@
4444
</dependentAssembly>
4545

4646
<dependentAssembly>
47-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
48-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
47+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
4949
</dependentAssembly>
5050

5151
<dependentAssembly>

0 commit comments

Comments
 (0)