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

Changing multiple dotnet commands to be aware of $configuration/$tfm folder structure under the --output path option.

Browse source 
Changing the build scripts to copy files over from debug\dnxcore and to check for the folders existence before trying that.
Making the build command aware of the subfolders and making E2E tests aware of subfolders.
Fixing compiler tests to look for the xml in the right plae taking into consideration the configuration and tfm.
Modifying publish tests to not take into consideration the runtime. This is a temporary change. will bring it back once the commands all understand rid.
Making the packaging step work by placing binaries where dotnet pack expects.
This commit is contained in:
Livar Cunha 2016-01-20 15:41:46 -08:00
parent b276fd2857
commit ac2d0e36a9
18 changed files with 165 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
View file

@ -61,7 +61,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string framework = string.IsNullOrEmpty(_framework) ?
_project.GetTargetFrameworks().First().FrameworkName.GetShortFolderName() : _framework;
string runtime = string.IsNullOrEmpty(_runtime) ? PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier() : _runtime;
string output = Path.Combine("bin", config, framework, runtime);
//TODO: add runtime back as soon as it gets propagated through the various commands.
string output = Path.Combine(config, framework);
return output;
}
@ -70,10 +71,10 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
if (!string.IsNullOrEmpty(_output))
{
return new DirectoryInfo(_output);
return new DirectoryInfo(Path.Combine(_output, BuildRelativeOutputPath()));
}
string output = Path.Combine(_project.ProjectDirectory, BuildRelativeOutputPath());
string output = Path.Combine(_project.ProjectDirectory, "bin", BuildRelativeOutputPath());
return new DirectoryInfo(output);
}