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

Cleanup

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-01-24 02:36:04 -08:00
parent 131c63ae27
commit f4f325f1d5
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
View file

@ -91,7 +91,6 @@
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
<DotNetRestore ToolPath="$(Stage2Directory)" <DotNetRestore ToolPath="$(Stage2Directory)"
IgnoreMissingSources="True"
Packages="$(NuGetPackagesArchiveFolder)" Packages="$(NuGetPackagesArchiveFolder)"
SkipInvalidConfigurations="True" SkipInvalidConfigurations="True"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
@ -101,7 +100,6 @@
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" />
<DotNetRestore ToolPath="$(Stage2Directory)" <DotNetRestore ToolPath="$(Stage2Directory)"
IgnoreMissingSources="True"
Packages="$(NuGetPackagesArchiveFolder)" Packages="$(NuGetPackagesArchiveFolder)"
SkipInvalidConfigurations="True" SkipInvalidConfigurations="True"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" />

14
build_projects/dotnet-cli-build/DotNetRestore.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args protected override string Args
{ {
get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetIgnoreMissingSources()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
} }
public string ConfigFile { get; set; } public string ConfigFile { get; set; }
@ -27,8 +27,6 @@ namespace Microsoft.DotNet.Cli.Build
public bool SkipInvalidConfigurations { get; set; } public bool SkipInvalidConfigurations { get; set; }
public bool IgnoreMissingSources { get; set; }
public string Runtime { get; set; } public string Runtime { get; set; }
private string GetConfigFile() private string GetConfigFile()
@ -81,16 +79,6 @@ namespace Microsoft.DotNet.Cli.Build
return null; return null;
} }
private string GetIgnoreMissingSources()
{
if (IgnoreMissingSources)
{
return "--ignore-failed-sources";
}
return null;
}
private string GetRuntime() private string GetRuntime()
{ {
if (!string.IsNullOrEmpty(Runtime)) if (!string.IsNullOrEmpty(Runtime))