Skip to content

Commit

Permalink
Merge pull request activescott#115 from activescott/113-update-libmsp…
Browse files Browse the repository at this point in the history
…ack4n-package

fixes activescott#113
  • Loading branch information
activescott authored Nov 26, 2018
2 parents 4e403d6 + eb062ee commit 2622a33
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/.build/lessmsi.msbuild
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<DeployFiles Include="$(RootDir)\LessMsi.Cli\bin\Release\lessmsi.exe.config"></DeployFiles>
<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\lessmsi-gui.exe"></DeployFiles>
<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\lessmsi-gui.exe.config"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.8.0\build\x86\mspack.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\build\x86\mspack.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\LessIO.0.6.16\lib\net40\LessIO.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\..\lib\wix.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\..\lib\wixcab.dll"></DeployFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/LessMsi.Cli/LessMsi.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<PropertyGroup>
<PostBuildEvent>xcopy /y "$(SolutionDir)packages\libmspack4n.0.8.0\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>xcopy /y "$(SolutionDir)packages\libmspack4n.0.9.10\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 2 additions & 2 deletions src/LessMsi.Core/LessMsi.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
<Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
Expand Down
2 changes: 1 addition & 1 deletion src/LessMsi.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LessIO" version="0.6.16" targetFramework="net4" />
<package id="libmspack4n" version="0.8.0" targetFramework="net40" />
<package id="libmspack4n" version="0.9.10" targetFramework="net4" />
<package id="MSBuildTasks" version="1.4.0.128" targetFramework="net40" />
</packages>
8 changes: 4 additions & 4 deletions src/LessMsi.Gui/LessMsi.Gui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
<Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -139,7 +139,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<PropertyGroup>
<PostBuildEvent>xcopy /y "$(SolutionDir)packages\libmspack4n.0.8.0\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>xcopy /y "$(SolutionDir)packages\libmspack4n.0.9.10\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
1 change: 1 addition & 0 deletions src/LessMsi.Gui/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LessIO" version="0.6.16" targetFramework="net4" />
<package id="libmspack4n" version="0.9.10" targetFramework="net4" />
</packages>
6 changes: 3 additions & 3 deletions src/Lessmsi.Tests/LessMsi.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
<Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -110,7 +110,7 @@
<PropertyGroup>
<PostBuildEvent>mkdir "$(TargetDir)TestFiles"
xcopy /Y /S "$(ProjectDir)TestFiles" "$(TargetDir)TestFiles"
xcopy /Y "$(SolutionDir)packages\libmspack4n.0.8.0\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
xcopy /Y "$(SolutionDir)packages\libmspack4n.0.9.10\build\x86\mspack.dll" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(OS)' == 'Windows_NT'" />
<Import Project="$(SolutionDir)\.nuget\NuGet.mono.targets" Condition="'$(OS)' == 'mono'" />
Expand Down
2 changes: 1 addition & 1 deletion src/Lessmsi.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LessIO" version="0.6.16" targetFramework="net45" />
<package id="libmspack4n" version="0.8.0" targetFramework="net45" />
<package id="libmspack4n" version="0.9.10" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down

0 comments on commit 2622a33

Please sign in to comment.