summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorwtgodbe <wigodbe@microsoft.com>2017-05-02 16:33:41 -0700
committerwtgodbe <wigodbe@microsoft.com>2017-05-16 16:37:21 -0700
commit798387ee90d7536d5a620af8482100ba76f6061a (patch)
treec11eea885b05e7424f103cd671d227ff173a3083 /dir.props
parent36e988ee6593351f1e962118a99154df5eae0254 (diff)
downloadcoreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.gz
coreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.bz2
coreclr-798387ee90d7536d5a620af8482100ba76f6061a.zip
Update Coreclr to 2.0.0 buildtools
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props11
1 files changed, 7 insertions, 4 deletions
diff --git a/dir.props b/dir.props
index de2c0f8b92..7c45b51e55 100644
--- a/dir.props
+++ b/dir.props
@@ -103,7 +103,8 @@
<NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
<!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on
the path. -->
- <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
+ <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Windows_NT'">$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
+ <NugetRestoreCommand Condition="'$(OsEnvironment)'!='Windows_NT'">$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\'))"</NugetRestoreCommand>
<NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
<NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
<NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
@@ -113,9 +114,10 @@
<DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand>
<DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand>
- <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand>
+ <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand>
<DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
- <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
+ <DnuRestoreCommand Condition="'$(OsEnvironment)'=='Windows_NT'">$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
+ <DnuRestoreCommand Condition="'$(OsEnvironment)'!='Windows_NT'">$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\'))"</DnuRestoreCommand>
</PropertyGroup>
<!-- Setup common target properties that we use to conditionally include sources -->
@@ -146,7 +148,8 @@
<SyncInfoDirectory>$(BaseIntermediateOutputPath)</SyncInfoDirectory>
<!-- This should be kept in sync with package details in src/.nuget/init/project.json -->
- <RuntimeIdGraphDefinitionFile>$(PackagesDir)/Microsoft.NETCore.Platforms/1.0.2-beta-24224-02/runtime.json</RuntimeIdGraphDefinitionFile>
+ <RuntimeIdGraphDefinitionVersion>1.0.2-beta-24224-02</RuntimeIdGraphDefinitionVersion>
+ <RuntimeIdGraphDefinitionFile>$(PackagesDir)/microsoft.netcore.platforms/$(RuntimeIdGraphDefinitionVersion)/runtime.json</RuntimeIdGraphDefinitionFile>
<!-- This link should be updated for each release milestone, currently this points to 1.1.0-beta -->
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>