mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

More fixes that were missing from the merge.

Browse source
This commit is contained in:
Livar Cunha 2017-12-07 13:23:27 -08:00
parent 5a0e95897e
commit 90e254b9ed
13 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -18,12 +18,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="4.18.0" />
<<<<<<< HEAD
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
=======
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
>>>>>>> dotnet/release/15.5
</ItemGroup>
</Project>