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

Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it.

Browse source
This commit is contained in:
Livar Cunha 2017-01-10 10:43:05 -08:00 • committed by Eric Erhardt
parent 4fe36fd1e5
commit d3157de6ee
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/Microsoft.DotNet.Cli.Test.targets
View file

@ -70,6 +70,8 @@
<TestDirectory>$(RepoRoot)/test/</TestDirectory>
<DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
</PropertyGroup>
<MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
</Target>
<Target Name="BuildTests"
@ -213,9 +215,10 @@
<DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
</PropertyGroup>
<DotNetRestore ToolPath="$(Stage2Directory)"
<DotNetRestore ToolPath="$(Stage0Directory)"
Source="$(TestPackagesDir)"
WorkingDirectory="%(TestPackageProject.FullPath)" />
ConfigFile="$(RepoRoot)\NuGet.Config"
ProjectPath="%(TestPackageProject.ProjectPath)" />
<DotNetBuild Framework="%(TestPackageProject.Framework)"
Runtime="%(TestPackageProject.Runtime)"

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

@ -12,9 +12,11 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args
{
get { return $"{GetProjectPath()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
}
public string ConfigFile { get; set; }
public string AdditionalParameters { get; set; }
public string ProjectPath { get; set; }
@ -27,6 +29,16 @@ namespace Microsoft.DotNet.Cli.Build
public string Runtime { get; set; }
private string GetConfigFile()
{
if (!string.IsNullOrEmpty(ConfigFile))
{
return $"--configfile {ConfigFile}";
}
return null;
}
private string GetSource()
{
if (!string.IsNullOrEmpty(Source))

2
src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
View file

@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli.Utils
public DepsJsonBuilder()
{
// This resolver is only used for building file names, so that base path is not required.
_versionFolderPathResolver = new VersionFolderPathResolver(path: null);
_versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
}
public DependencyContext Build(

2
src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
View file

@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resolution
_packagePathResolver = new FallbackPackagePathResolver(nugetPathContext);
// This resolver is only used for building file names, so that base path is not required.
_versionFolderPathResolver = new VersionFolderPathResolver(path: null);
_versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
}
_frameworkReferenceResolver = frameworkReferenceResolver;