Merge pull request #14 from tynor88/dev

fix version dependencies
tynor88 · Jan 2, 2016 · abd5efa · abd5efa
2 parents 7ebb70e + dd5eaa8
commit abd5efa
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 59 deletions.
diff --git a/Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.csproj b/Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.csproj
@@ -64,9 +64,9 @@
       <HintPath>..\..\packages\Topshelf.3.3.1\lib\net40-full\Topshelf.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Topshelf.SimpleInjector, Version=0.1.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Topshelf.SimpleInjector.0.1.4.0\lib\net40\Topshelf.SimpleInjector.dll</HintPath>
+    <Reference Include="Topshelf.SimpleInjector, Version=1.0.0.16, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Topshelf.SimpleInjector.1.0.0.16\lib\net40\Topshelf.SimpleInjector.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -81,7 +81,6 @@
     <Compile Include="SimpleInjectorScheduleJobHostConfiguratorExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Topshelf.SimpleInjector.Quartz.nuspec">
       <SubType>Designer</SubType>
@@ -95,5 +94,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-
+</Project>
diff --git a/Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.nuspec b/Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.nuspec
@@ -14,7 +14,7 @@
     <copyright>Copyright $author$ 2014</copyright>
     <tags>Topshelf SimpleInjector IoC Inversion-of-control Service WindowsService Dependency Injection DI Host Quartz Quartz.NET Scheduling Schedule Cron</tags>
     <dependencies>
-      <dependency id="Topshelf.SimpleInjector" version="0.1.4.0" />
+      <dependency id="Topshelf.SimpleInjector" version="$version$" />
       <dependency id="Quartz" version="2.3.3" />
     </dependencies>
   </metadata>

diff --git a/Source/Topshelf.SimpleInjector.Quartz/app.config b/Source/Topshelf.SimpleInjector.Quartz/app.config
diff --git a/Source/Topshelf.SimpleInjector.Quartz/packages.config b/Source/Topshelf.SimpleInjector.Quartz/packages.config
@@ -5,5 +5,5 @@
   <package id="Quartz" version="2.3.3" targetFramework="net4" />
   <package id="SimpleInjector" version="3.1.2" targetFramework="net4" />
   <package id="Topshelf" version="3.3.1" targetFramework="net4" />
-  <package id="Topshelf.SimpleInjector" version="0.1.4.0" targetFramework="net40" />
+  <package id="Topshelf.SimpleInjector" version="1.0.0.16" targetFramework="net40" />
 </packages>
diff --git a/Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.csproj b/Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.csproj
@@ -50,9 +50,9 @@
       <HintPath>..\..\packages\Topshelf.3.3.1\lib\net40-full\Topshelf.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Topshelf.SimpleInjector, Version=0.1.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Topshelf.SimpleInjector.0.1.4.0\lib\net40\Topshelf.SimpleInjector.dll</HintPath>
+    <Reference Include="Topshelf.SimpleInjector, Version=1.0.0.16, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Topshelf.SimpleInjector.1.0.0.16\lib\net40\Topshelf.SimpleInjector.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -63,7 +63,6 @@
     <Compile Include="Content\Service.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Topshelf.SimpleInjector.QuickStart.nuspec" />
   </ItemGroup>
@@ -78,5 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-
+</Project>
diff --git a/Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.nuspec b/Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.nuspec
@@ -20,7 +20,7 @@
     <copyright>Copyright $author$ 2014</copyright>
     <tags>Topshelf SimpleInjector IoC Inversion-of-control Service WindowsService Dependency Injection DI Host</tags>
     <dependencies>
-      <dependency id="Topshelf.SimpleInjector" version="0.1.4.0" />
+      <dependency id="Topshelf.SimpleInjector" version="$version$" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/Topshelf.SimpleInjector.QuickStart/app.config b/Source/Topshelf.SimpleInjector.QuickStart/app.config
diff --git a/Source/Topshelf.SimpleInjector.QuickStart/packages.config b/Source/Topshelf.SimpleInjector.QuickStart/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="SimpleInjector" version="3.1.2" targetFramework="net4" />
   <package id="Topshelf" version="3.3.1" targetFramework="net4" />
-  <package id="Topshelf.SimpleInjector" version="0.1.4.0" targetFramework="net40" />
+  <package id="Topshelf.SimpleInjector" version="1.0.0.16" targetFramework="net40" />
 </packages>
diff --git a/appveyor-release.yml b/appveyor-release.yml
@@ -30,7 +30,7 @@ after_test:
 - cmd: >-
     mkdir reports
 
-    IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -mergeoutput -register:user -excludebyattribute:*.ExcludeFromCodeCoverage*^ -target:"packages\NUnit.Console.3.0.1\tools\nunit3-console.exe" "-targetargs:\"Tests\Topshelf.FileSystemWatcher.Test\bin\Release\Topshelf.FileSystemWatcher.Test.dll\" \"Tests\Topshelf.SimpleInjector.Quartz.Test\bin\Release\Topshelf.SimpleInjector.Quartz.Test.dll\" \"Tests\Topshelf.SimpleInjector.Test\bin\Release\Topshelf.SimpleInjector.Test.dll\"" -filter:"+[*]Topshelf.SimpleInjector.* +[*]Topshelf.FileSystemWatcher.* -[*.Test]*" -output:"reports\OpenCoverCoverage.xml"
+    IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -mergeoutput -register:user -excludebyattribute:*.ExcludeFromCodeCoverage*^ -target:"packages\NUnit.Console.3.0.1\tools\nunit3-console.exe" "-targetargs:\"Tests\Topshelf.FileSystemWatcher.Test\bin\%CONFIGURATION%\Topshelf.FileSystemWatcher.Test.dll\" \"Tests\Topshelf.SimpleInjector.Quartz.Test\bin\%CONFIGURATION%\Topshelf.SimpleInjector.Quartz.Test.dll\" \"Tests\Topshelf.SimpleInjector.Test\bin\%CONFIGURATION%\Topshelf.SimpleInjector.Test.dll\"" -filter:"+[*]Topshelf.SimpleInjector.* +[*]Topshelf.FileSystemWatcher.* -[*.Test]*" -output:"reports\OpenCoverCoverage.xml"
 
     IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER packages\coveralls.net.0.6.0\tools\csmacnz.Coveralls.exe --opencover -i reports\OpenCoverCoverage.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%
 artifacts:

diff --git a/appveyor.yml b/appveyor.yml
@@ -26,6 +26,6 @@ after_test:
 - cmd: >-
     mkdir reports
 
-    packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -mergeoutput -register:user -excludebyattribute:*.ExcludeFromCodeCoverage*^ -target:"packages\NUnit.Console.3.0.1\tools\nunit3-console.exe" "-targetargs:\"Tests\Topshelf.FileSystemWatcher.Test\bin\Release\Topshelf.FileSystemWatcher.Test.dll\" \"Tests\Topshelf.SimpleInjector.Quartz.Test\bin\Release\Topshelf.SimpleInjector.Quartz.Test.dll\" \"Tests\Topshelf.SimpleInjector.Test\bin\Release\Topshelf.SimpleInjector.Test.dll\"" -filter:"+[*]Topshelf.SimpleInjector.* +[*]Topshelf.FileSystemWatcher.* -[*.Test]*" -output:"reports\OpenCoverCoverage.xml"
+    packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -mergeoutput -register:user -excludebyattribute:*.ExcludeFromCodeCoverage*^ -target:"packages\NUnit.Console.3.0.1\tools\nunit3-console.exe" "-targetargs:\"Tests\Topshelf.FileSystemWatcher.Test\bin\%CONFIGURATION%\Topshelf.FileSystemWatcher.Test.dll\" \"Tests\Topshelf.SimpleInjector.Quartz.Test\bin\%CONFIGURATION%\Topshelf.SimpleInjector.Quartz.Test.dll\" \"Tests\Topshelf.SimpleInjector.Test\bin\%CONFIGURATION%\Topshelf.SimpleInjector.Test.dll\"" -filter:"+[*]Topshelf.SimpleInjector.* +[*]Topshelf.FileSystemWatcher.* -[*.Test]*" -output:"reports\OpenCoverCoverage.xml"
 
     packages\coveralls.net.0.6.0\tools\csmacnz.Coveralls.exe --opencover -i reports\OpenCoverCoverage.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%