Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/hotfix/v6.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ElektroKill committed Sep 8, 2023
2 parents ea566e3 + 6686866 commit d312c20
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions DnSpyCommon.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

<!-- Update app.config whenever this value changes -->
<DnSpyAssemblyVersion>6.4.0.0</DnSpyAssemblyVersion>
<DnSpyAssemblyVersion>6.4.1.0</DnSpyAssemblyVersion>
<!-- This is shown in the title bar -->
<DnSpyAssemblyInformationalVersion>v6.4.0</DnSpyAssemblyInformationalVersion>
<DnSpyAssemblyInformationalVersion>v6.4.1</DnSpyAssemblyInformationalVersion>
<DnSpyAssemblyCopyright>Copyright (C) 2014-2020 [email protected]</DnSpyAssemblyCopyright>

<!-- AD0001: buggy Roslyn analyzer(s) crash, disable that warning -->
Expand Down
20 changes: 10 additions & 10 deletions dnSpy/dnSpy/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,43 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.DnSpy" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.Logic" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Decompiler" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Roslyn" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.Debugger" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.Debugger.DotNet" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.Debugger.DotNet.CorDebug" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Contracts.Debugger.DotNet.Mono" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Debugger.DotNet.Metadata" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="dnSpy.Debugger.DotNet.Interpreter" publicKeyToken="9813e10cffb0cdd6" culture="neutral"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.0.0" newVersion="6.4.0.0"/>
<bindingRedirect oldVersion="5.0.0.0-6.4.1.0" newVersion="6.4.1.0"/>
</dependentAssembly>

<dependentAssembly>
Expand Down

0 comments on commit d312c20

Please sign in to comment.