Using LessIO as a nuget package to fix #61

activescott · May 22, 2016 · 0086890 · 0086890
1 parent 0f6b3bc
commit 0086890
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 39 deletions.
diff --git a/src/LessMsi.Cli/LessMsi.Cli.csproj b/src/LessMsi.Cli/LessMsi.Cli.csproj
@@ -36,6 +36,10 @@
     <StartupObject>LessMsi.Cli.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LessIO, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.0.2.0\lib\net40\LessIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="wix">
@@ -58,12 +62,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LessIO\src\LessIO\LessIO.csproj">
-      <Project>{51482e40-c227-4c5a-9b55-42440c041d55}</Project>
-      <Name>LessIO</Name>
-    </ProjectReference>
     <ProjectReference Include="..\LessMsi.Core\LessMsi.Core.csproj">
       <Project>{1fd916f2-1df6-42f6-9ad4-83565fbf8e5c}</Project>
       <Name>LessMsi.Core</Name>

diff --git a/src/LessMsi.Cli/packages.config b/src/LessMsi.Cli/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LessIO" version="0.2.0" targetFramework="net40" />
+</packages>
diff --git a/src/LessMsi.Core/LessMsi.Core.csproj b/src/LessMsi.Core/LessMsi.Core.csproj
@@ -35,6 +35,10 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LessIO, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.0.2.0\lib\net40\LessIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="libmspackn">
       <HintPath>..\..\lib\libmspackn.dll</HintPath>
     </Reference>
@@ -59,12 +63,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\LessIO\src\LessIO\LessIO.csproj">
-      <Project>{51482e40-c227-4c5a-9b55-42440c041d55}</Project>
-      <Name>LessIO</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild">
     <!-- Copy over the dlls that lessmsi.exe is depdent upon -->

diff --git a/src/LessMsi.Core/packages.config b/src/LessMsi.Core/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="LessIO" version="0.2.0" targetFramework="net40" />
   <package id="MSBuildTasks" version="1.4.0.128" targetFramework="net40" />
 </packages>
diff --git a/src/LessMsi.Gui/LessMsi.Gui.csproj b/src/LessMsi.Gui/LessMsi.Gui.csproj
@@ -38,6 +38,10 @@
     <StartupObject>LessMsi.Gui.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LessIO, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.0.2.0\lib\net40\LessIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -108,6 +112,7 @@
       <DependentUpon>SearchPanel.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -119,10 +124,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LessIO\src\LessIO\LessIO.csproj">
-      <Project>{51482e40-c227-4c5a-9b55-42440c041d55}</Project>
-      <Name>LessIO</Name>
-    </ProjectReference>
     <ProjectReference Include="..\LessMsi.Core\LessMsi.Core.csproj">
       <Project>{1fd916f2-1df6-42f6-9ad4-83565fbf8e5c}</Project>
       <Name>LessMsi.Core</Name>

diff --git a/src/LessMsi.Gui/packages.config b/src/LessMsi.Gui/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LessIO" version="0.2.0" targetFramework="net40" />
+</packages>
diff --git a/src/LessMsi.sln b/src/LessMsi.sln
@@ -50,10 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3398DA
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LessIO", "..\..\LessIO\src\LessIO\LessIO.csproj", "{51482E40-C227-4C5A-9B55-42440C041D55}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LessIO.Tests", "..\..\LessIO\src\LessIO.Tests\LessIO.Tests.csproj", "{53C73525-6911-4B86-9918-E5AB175547F8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,22 +105,6 @@ Global
 		{7ED32F80-2B7B-4F90-ADE9-22B8F3935C63}.Release|Any CPU.Build.0 = Release|x86
 		{7ED32F80-2B7B-4F90-ADE9-22B8F3935C63}.Release|x86.ActiveCfg = Release|x86
 		{7ED32F80-2B7B-4F90-ADE9-22B8F3935C63}.Release|x86.Build.0 = Release|x86
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Debug|x86.Build.0 = Debug|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Release|x86.ActiveCfg = Release|Any CPU
-		{51482E40-C227-4C5A-9B55-42440C041D55}.Release|x86.Build.0 = Release|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{53C73525-6911-4B86-9918-E5AB175547F8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Lessmsi.Tests/FileEntryGraph.cs b/src/Lessmsi.Tests/FileEntryGraph.cs
@@ -49,7 +49,7 @@ public void Save(LessIO.Path file)
         {
             //save it as csv:
             if (file.Exists)
-                file.Delete();
+                LessIO.FileSystem.RemoveFile(file);
             using (var f = file.CreateText())
             {
                 f.WriteLine("Path,Size,CreationTime,LastWriteTime,Attributes");

diff --git a/src/Lessmsi.Tests/LessMsi.Tests.csproj b/src/Lessmsi.Tests/LessMsi.Tests.csproj
@@ -37,6 +37,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LessIO, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.0.2.0\lib\net40\LessIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
@@ -58,10 +62,6 @@
     <Compile Include="TestBase.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LessIO\src\LessIO\LessIO.csproj">
-      <Project>{51482e40-c227-4c5a-9b55-42440c041d55}</Project>
-      <Name>LessIO</Name>
-    </ProjectReference>
     <ProjectReference Include="..\LessMsi.Cli\LessMsi.Cli.csproj">
       <Project>{7ed32f80-2b7b-4f90-ade9-22b8f3935c63}</Project>
       <Name>LessMsi.Cli</Name>
@@ -78,6 +78,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy /Y "$(SolutionDir)..\bin\$(ConfigurationName)\*.exe" "$(TargetDir)"

diff --git a/src/Lessmsi.Tests/packages.config b/src/Lessmsi.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LessIO" version="0.2.0" targetFramework="net40" />
+</packages>