Skip to content

Commit b6f569e

Browse files
committed
Fixes an issue where an InvalidCastException was caused when initializing the ResourceManagementClient when two different versions of the assembly had been loaded into the same AppDomain lithnet/miis-autosync#141
1 parent 925fa56 commit b6f569e

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<Prefer32Bit>false</Prefer32Bit>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Lithnet.ResourceManagement.Client, Version=1.0.6435.24336, Culture=neutral, PublicKeyToken=bd0636700c1e2538, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6435.24336\lib\net40\Lithnet.ResourceManagement.Client.dll</HintPath>
38+
<Reference Include="Lithnet.ResourceManagement.Client, Version=1.0.6623.18312, Culture=neutral, PublicKeyToken=bd0636700c1e2538, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6623.18312\lib\net40\Lithnet.ResourceManagement.Client.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Microsoft.ResourceManagement, Version=4.1.3451.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6435.24336\lib\net40\Microsoft.ResourceManagement.dll</HintPath>
42+
<HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6623.18312\lib\net40\Microsoft.ResourceManagement.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="System" />
@@ -115,7 +115,9 @@
115115
<None Include="LithnetRMA.Help.pshproj">
116116
<SubType>Designer</SubType>
117117
</None>
118-
<None Include="packages.config" />
118+
<None Include="packages.config">
119+
<SubType>Designer</SubType>
120+
</None>
119121
</ItemGroup>
120122
<UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
121123
<ParameterGroup>
@@ -129,14 +131,12 @@
129131
<Using Namespace="System" />
130132
<Using Namespace="System.IO" />
131133
<Using Namespace="System.Text.RegularExpressions" />
132-
<Code Type="Fragment" Language="cs">
133-
<![CDATA[
134+
<Code Type="Fragment" Language="cs"><![CDATA[
134135
File.WriteAllText(
135136
OutputFilename,
136137
Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
137138
);
138-
]]>
139-
</Code>
139+
]]></Code>
140140
</Task>
141141
</UsingTask>
142142
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<ModuleObject xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" fVersion="1.1" type="Manifest" mclass="Module" useSupports="false">
33
<Name>LithnetRMA</Name>
4-
<Version>1.0.6597.17047</Version>
4+
<Version>1.0.6623.18398</Version>
55
<Description>Lithnet Resource Management Client for PowerShell</Description>
66
<HasManifest>true</HasManifest>
77
<OverridePostCount>false</OverridePostCount>

src/Lithnet.ResourceManagement.Automation/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
44
<package id="Fody" version="1.29.2" targetFramework="net45" developmentDependency="true" />
5-
<package id="Lithnet.ResourceManagement.Client" version="1.0.6435.24336" targetFramework="net45" />
5+
<package id="Lithnet.ResourceManagement.Client" version="1.0.6623.18312" targetFramework="net45" />
66
</packages>

0 commit comments

Comments
 (0)