Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix version dependencies #14

Merged
merged 3 commits into from
Jan 2, 2016
Merged

fix version dependencies #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29917cc
fix version dependencies
tynor88 Jan 2, 2016
cf15f23
Merge branch 'master' into dev
tynor88 Jan 2, 2016
dd5eaa8
Configuration fix..
tynor88 Jan 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -95,5 +94,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
2 changes: 1 addition & 1 deletion Source/Topshelf.SimpleInjector.Quartz/Topshelf.SimpleInjector.Quartz.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
23 changes: 0 additions & 23 deletions Source/Topshelf.SimpleInjector.Quartz/app.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Source/Topshelf.SimpleInjector.Quartz/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 4 additions & 6 deletions Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -78,5 +77,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
2 changes: 1 addition & 1 deletion Source/Topshelf.SimpleInjector.QuickStart/Topshelf.SimpleInjector.QuickStart.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 0 additions & 18 deletions Source/Topshelf.SimpleInjector.QuickStart/app.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Source/Topshelf.SimpleInjector.QuickStart/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion appveyor-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%