Fixes an issue where an InvalidCastException was caused when initiali…

…zing the ResourceManagementClient when two different versions of the assembly had been loaded into the same AppDomain lithnet/miis-autosync#141
lithnet · Feb 17, 2018 · b6f569e · b6f569e
1 parent 925fa56
commit b6f569e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj b/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj
@@ -35,11 +35,11 @@
  <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
- <Reference Include="Lithnet.ResourceManagement.Client, Version=1.0.6435.24336, Culture=neutral, PublicKeyToken=bd0636700c1e2538, processorArchitecture=MSIL">
- <HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6435.24336\lib\net40\Lithnet.ResourceManagement.Client.dll</HintPath>
+ <Reference Include="Lithnet.ResourceManagement.Client, Version=1.0.6623.18312, Culture=neutral, PublicKeyToken=bd0636700c1e2538, processorArchitecture=MSIL">
+ <HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6623.18312\lib\net40\Lithnet.ResourceManagement.Client.dll</HintPath>
  </Reference>
  <Reference Include="Microsoft.ResourceManagement, Version=4.1.3451.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6435.24336\lib\net40\Microsoft.ResourceManagement.dll</HintPath>
+ <HintPath>..\packages\Lithnet.ResourceManagement.Client.1.0.6623.18312\lib\net40\Microsoft.ResourceManagement.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="System" />
@@ -115,7 +115,9 @@
  <None Include="LithnetRMA.Help.pshproj">
  <SubType>Designer</SubType>
  </None>
- <None Include="packages.config" />
+ <None Include="packages.config">
+ <SubType>Designer</SubType>
+ </None>
  </ItemGroup>
  <UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
  <ParameterGroup>
@@ -129,14 +131,12 @@
  <Using Namespace="System" />
  <Using Namespace="System.IO" />
  <Using Namespace="System.Text.RegularExpressions" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
+ <Code Type="Fragment" Language="cs"><![CDATA[
  File.WriteAllText(
  OutputFilename,
  Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
  );
- ]]>
- </Code>
+ ]]></Code>
  </Task>
  </UsingTask>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj b/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <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">
  <Name>LithnetRMA</Name>
- <Version>1.0.6597.17047</Version>
+ <Version>1.0.6623.18398</Version>
  <Description>Lithnet Resource Management Client for PowerShell</Description>
  <HasManifest>true</HasManifest>
  <OverridePostCount>false</OverridePostCount>

diff --git a/src/Lithnet.ResourceManagement.Automation/packages.config b/src/Lithnet.ResourceManagement.Automation/packages.config
@@ -2,5 +2,5 @@
 <packages>
  <package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
  <package id="Fody" version="1.29.2" targetFramework="net45" developmentDependency="true" />
- <package id="Lithnet.ResourceManagement.Client" version="1.0.6435.24336" targetFramework="net45" />
+ <package id="Lithnet.ResourceManagement.Client" version="1.0.6623.18312" targetFramework="net45" />
 </packages>