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

Fixing failing test.

Browse source
This commit is contained in:
Livar Cunha 2017-03-02 23:43:06 -08:00
parent 103833fd34
commit d20a1d4e2e
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
View file

@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet-portable</AssemblyName> <AssemblyName>dotnet-portable</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<VersionSuffix></VersionSuffix> <VersionSuffix></VersionSuffix>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -13,10 +12,4 @@
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath> <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
</BuiltProjectOutputGroupOutput> </BuiltProjectOutputGroupOutput>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App">
<Version>1.0.4</Version>
</PackageReference>
</ItemGroup>
</Project> </Project>

2
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -326,7 +326,7 @@ namespace Microsoft.DotNet.Tests
.WithRestoreFiles(); .WithRestoreFiles();
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages) var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.0") .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
.GetFile("project.assets.json"); .GetFile("project.assets.json");
var stopWatch = Stopwatch.StartNew(); var stopWatch = Stopwatch.StartNew();