Skip to content
This repository has been archived by the owner on Jun 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request #77 from grant-d/grant-dev
Browse files Browse the repository at this point in the history 
Nuget conflicts
  • Loading branch information
@grant-d
grant-d committed Oct 5, 2017
2 parents 69d7b3c + 321a520 commit c163c14
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Buffers.Tests/SourceCode.Clay.Buffers.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Collections.Tests/SourceCode.Clay.Collections.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Data.Tests/SourceCode.Clay.Data.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Json.Tests/SourceCode.Clay.Json.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/SourceCode.Clay.OpenApi.Tests/SourceCode.Clay.OpenApi.Tests.csproj
View file
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Tests/SourceCode.Clay.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Text.Tests/SourceCode.Clay.Text.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceCode.Clay.Threading.Tests/SourceCode.Clay.Threading.Tests.csproj
View file
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
<PackageReference Include="xunit" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc1-build3809" />
<PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit c163c14

Please sign in to comment.