8000 Merge pull request #1138 from libgit2/ntk/nuget_deps · thatfrankdev/libgit2sharp@126351e · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 126351e

Browse files
nulltokennulltoken
committed
Merge pull request libgit2#1138 from libgit2/ntk/nuget_deps
Upgrade development dependencies
2 parents 00478e2 + 66061fa commit 126351e

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

‎.nuget/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit.runners" version="1.9.2" />
3+
<package id="xunit.runner.console" version="2.0.0" />
4+
<package id="xunit.runner.msbuild" version="2.0.0" />
45
</packages>

‎CI/build.msbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<DeployFolder>$(RootDir)\Build</DeployFolder>
77
</PropertyGroup>
88

9-
<UsingTask AssemblyFile="$(RootDir)\packages\xunit.runners.1.9.2\tools\xunit.runner.msbuild.dll"
9+
<UsingTask AssemblyFile="$(RootDir)\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.dll"
1010
TaskName="Xunit.Runner.MSBuild.xunit" />
1111
<Target Name="Clean">
1212
<Message Text="Commit SHA = $(CommitSha)" />
@@ -37,7 +37,7 @@
3737
</Target>
3838

3939
<Target Name="Test" DependsOnTargets="Build">
40-
<xunit Assembly="$(TestBuildDir)/LibGit2Sharp.Tests.dll" ShadowCopy="false" Xml="$(DeployFolder)/Test-result.xml" />
40+
<xunit Assemblies="$(TestBuildDir)/LibGit2Sharp.Tests.dll" ShadowCopy="false" Xml="$(DeployFolder)/Test-result.xml" />
4141
</Target>
4242

4343
<Target Name="Deploy" DependsOnTargets="Test">

‎Lib/NuGet/NuGet.exe

59 KB
Binary file not shown.

‎LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props')" />
3+
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -35,9 +35,8 @@
3535
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
39-
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
38+
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
4140
</Reference>
4241
<Reference Include="System" />
4342
<Reference Include="System.Core" />
@@ -158,7 +157,7 @@
158157
<PropertyGroup>
159158
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
160159
</PropertyGroup>
161-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props'))" />
160+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
162161
</Target>
163162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164163
Other s 8000 imilar extension points exist, see Microsoft.Common.targets.
@@ -167,4 +166,4 @@
167166
<Target Name="AfterBuild">
168167
</Target>
169168
-->
170-
</Project>
169+
</Project>

‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ private static void SetUpTestEnvironment()
5656
{
5757
IsFileSystemCaseSensitive = IsFileSystemCaseSensitiveInternal();
5858

59+
string initialAssemblyParentFolder = Directory.GetParent(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath).FullName;
60+
5961
const string sourceRelativePath = @"../../Resources";
60-
ResourcesDirectory = new DirectoryInfo(sourceRelativePath);
62+
ResourcesDirectory = new DirectoryInfo(Path.Combine(initialAssemblyParentFolder, sourceRelativePath));
6163

6264
// Setup standard paths to our test repositories
6365
BareTestRepoPath = Path.Combine(sourceRelativePath, "testrepo.git");

‎LibGit2Sharp.Tests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
3+
<package id="Moq" version="4.2.1507.0118" targetFramework="net40" />
44
<package id="xunit" version="1.9.2" targetFramework="net40" />
55
<package id="xunit.extensions" version="1.9.2" targetFramework="net40" />
6-
<package id="xunit.runner.visualstudio" version="2.0.0-rc1-build1030" targetFramework="net40" />
6+
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net40" />
77
</packages>

‎appveyor.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ environment:
1818
secure: eGVilNg1Yuq+Xj+SW8r3WCtjnzhoDV0sNJkma4NRq7A=
1919
version : 0.22.0
2020
matrix:
21-
- xunit_runner: xunit.console.clr4.x86.exe
21+
- xunit_runner: xunit.console.x86.exe
2222
Arch: 32
2323
publish_on_success: False
24-
- xunit_runner: xunit.console.clr4.exe
24+
- xunit_runner: xunit.console.exe
2525
Arch: 64
2626
publish_on_success: True
2727

@@ -112,15 +112,16 @@ test_script:
112112
{
113113
.\packages\OpenCover\OpenCover.Console.exe `
114114
-register:user `
115-
-target:$Env:xunit_runner `
116-
"-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll"" /noshadow /appveyor" `
115+
"-target:""$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.0.0\tools\$Env:xunit_runner""" `
116+
"-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll"" -noshadow" `
117117
"-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
118118
-hideskipped:All `
119119
-output:opencoverCoverage.xml
120120
}
121121
ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
122122
{
123-
& "$Env:xunit_runner" "$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll" /appveyor
123+
& "$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.0.0\tools\$Env:xunit_runner" `
124+
"$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll" -noshadow
124125
}
125126
126127
after_test:

0 commit comments

Comments
 (0)
0