Skip to content

Commit 722e4f9

Browse files
committed
Deploy and redirect to System.Windows.Interactivity 4.5 (#72 and related)
1 parent 6d38d06 commit 722e4f9

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

ResXManager.VSIX/ResXManager.VSIX.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@
265265
<Reference Include="System.Runtime.Serialization" />
266266
<Reference Include="System.Transactions" />
267267
<Reference Include="System.Windows.Forms" />
268-
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
269-
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
268+
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
269+
<HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
270270
</Reference>
271271
<Reference Include="System.Xml" />
272272
<Reference Include="System.Xml.Linq" />

ResXManager.VSIX/VSPackage.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public sealed class VSPackage : Package
7777
public VSPackage()
7878
{
7979
_instance = this;
80+
AppDomain.CurrentDomain.AssemblyResolve += AppDomain_AssemblyResolve;
8081
}
8182

8283
[NotNull]
@@ -534,6 +535,17 @@ private void ReloadSolution()
534535
CompositionHost.GetExportedValue<ResourceViewModel>().Reload();
535536
}
536537

538+
private static Assembly AppDomain_AssemblyResolve(object sender, ResolveEventArgs args)
539+
{
540+
var assemblyName = new AssemblyName(args.Name);
541+
542+
if (assemblyName.Name != "System.Windows.Interactivity")
543+
return null;
544+
545+
assemblyName.Version = new Version(4, 5, 0, 0);
546+
return Assembly.Load(assemblyName);
547+
}
548+
537549
[ContractInvariantMethod]
538550
[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Required for code contracts.")]
539551
[Conditional("CONTRACTS_FULL")]

ResXManager.VSIX/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<assemblyIdentity name="EnvDTE" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2828
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
2929
</dependentAssembly>
30+
<dependentAssembly>
31+
<assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
32+
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
33+
</dependentAssembly>
3034
</assemblyBinding>
3135
</runtime>
3236
</configuration>

ResXManager.VSIX/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="AutoProperties.Fody" version="1.6.0.0" targetFramework="net452" developmentDependency="true" />
44
<package id="DataGridExtensions" version="1.0.37" targetFramework="net452" />
5+
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net452" />
56
<package id="Fody" version="2.1.3" targetFramework="net452" developmentDependency="true" />
67
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net452" />
78
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />

0 commit comments

Comments
 (0)