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

Enabling multifile support for cache

Browse source
This commit is contained in:
Rama Krishnan Raghupathy 2017-02-01 16:11:12 -08:00
parent 0e0b59f910
commit ed1ca04f51
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/dotnet/commands/dotnet-cache/Program.cs
View file

@ -9,6 +9,7 @@ using Microsoft.DotNet.Cli;
using System.Diagnostics; using System.Diagnostics;
using System; using System;
using System.IO; using System.IO;
using System.Linq;
namespace Microsoft.DotNet.Tools.Cache namespace Microsoft.DotNet.Tools.Cache
{ {
@ -31,9 +32,9 @@ namespace Microsoft.DotNet.Tools.Cache
app.ArgumentSeparatorHelpText = HelpMessageStrings.MSBuildAdditionalArgsHelpText; app.ArgumentSeparatorHelpText = HelpMessageStrings.MSBuildAdditionalArgsHelpText;
app.HelpOption("-h|--help"); app.HelpOption("-h|--help");
CommandOption projectArgument = app.Option( CommandOption projectArguments = app.Option(
$"-e|--entries <{LocalizableStrings.ProjectEntries}>", LocalizableStrings.ProjectEntryDescription, $"-e|--entries <{LocalizableStrings.ProjectEntries}>", LocalizableStrings.ProjectEntryDescription,
CommandOptionType.SingleValue); CommandOptionType.MultipleValue);
CommandOption frameworkOption = app.Option( CommandOption frameworkOption = app.Option(
$"-f|--framework <{LocalizableStrings.FrameworkOption}>", LocalizableStrings.FrameworkOptionDescription, $"-f|--framework <{LocalizableStrings.FrameworkOption}>", LocalizableStrings.FrameworkOptionDescription,
@ -70,13 +71,19 @@ namespace Microsoft.DotNet.Tools.Cache
{ {
msbuildArgs = new List<string>(); msbuildArgs = new List<string>();
if (string.IsNullOrEmpty(projectArgument.Value())) if (!projectArguments.HasValue())
{ {
throw new InvalidOperationException(LocalizableStrings.SpecifyEntries); throw new InvalidOperationException(LocalizableStrings.SpecifyEntries);
} }
msbuildArgs.Add("/t:ComposeCache"); msbuildArgs.Add("/t:ComposeCache");
msbuildArgs.Add(projectArgument.Value()); msbuildArgs.Add(projectArguments.Values[0]);
var _additionalProjectsargs = projectArguments.Values.Skip(1);
if (_additionalProjectsargs.Count() > 0)
{
msbuildArgs.Add($"/p:AdditionalProjects={string.Join("%3B", _additionalProjectsargs)}");
}
if (!string.IsNullOrEmpty(frameworkOption.Value())) if (!string.IsNullOrEmpty(frameworkOption.Value()))
{ {
@ -106,12 +113,12 @@ namespace Microsoft.DotNet.Tools.Cache
if (skipOptimizationOption.HasValue()) if (skipOptimizationOption.HasValue())
{ {
msbuildArgs.Add($"/p:SkipOptimization={skipOptimizationOption.HasValue()}"); msbuildArgs.Add($"/p:SkipOptimization=true");
} }
if (preserveWorkingDir.HasValue()) if (preserveWorkingDir.HasValue())
{ {
msbuildArgs.Add($"/p:PreserveComposeWorkingDir={preserveWorkingDir.HasValue()}"); msbuildArgs.Add($"/p:PreserveComposeWorkingDir=true");
} }
if (!string.IsNullOrEmpty(verbosityOption.Value())) if (!string.IsNullOrEmpty(verbosityOption.Value()))

6
src/dotnet/commands/dotnet-publish/Program.cs
View file

@ -54,7 +54,7 @@ namespace Microsoft.DotNet.Tools.Publish
CommandOption filterProjOption = app.Option( CommandOption filterProjOption = app.Option(
$"--filter <{LocalizableStrings.FilterProjOption}>", LocalizableStrings.FilterProjOptionDescription, $"--filter <{LocalizableStrings.FilterProjOption}>", LocalizableStrings.FilterProjOptionDescription,
CommandOptionType.SingleValue); CommandOptionType.MultipleValue);
CommandOption verbosityOption = AddVerbosityOption(app); CommandOption verbosityOption = AddVerbosityOption(app);
@ -95,9 +95,9 @@ namespace Microsoft.DotNet.Tools.Publish
msbuildArgs.Add($"/p:VersionSuffix={versionSuffixOption.Value()}"); msbuildArgs.Add($"/p:VersionSuffix={versionSuffixOption.Value()}");
} }
if (!string.IsNullOrEmpty(filterProjOption.Value())) if (filterProjOption.HasValue())
{ {
msbuildArgs.Add($"/p:FilterProjectFiles={filterProjOption.Value()}"); msbuildArgs.Add($"/p:FilterProjectFiles={string.Join("%3B", filterProjOption.Values)}");
} }
if (!string.IsNullOrEmpty(verbosityOption.Value())) if (!string.IsNullOrEmpty(verbosityOption.Value()))