Upgrade DNU with nightly build version
rc1-final did not work with OSX. Switched to a nightly build version instead.
This commit is contained in:
Родитель
7325cf205e
Коммит
10c0c787dd
|
@ -14,6 +14,7 @@
|
||||||
<add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
|
<add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
|
||||||
<add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/" />
|
<add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/" />
|
||||||
<add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
|
<add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
|
||||||
|
<add key="myget.org aspnet vnext" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
|
||||||
<add key="nuget.org v2" value="https://nuget.org/api/v2/" />
|
<add key="nuget.org v2" value="https://nuget.org/api/v2/" />
|
||||||
</packageSources>
|
</packageSources>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
12
dir.props
12
dir.props
|
@ -36,7 +36,7 @@
|
||||||
<DnxDir Condition="'$(OsEnvironment)'=='Unix'">dnx-coreclr-linux-x64</DnxDir>
|
<DnxDir Condition="'$(OsEnvironment)'=='Unix'">dnx-coreclr-linux-x64</DnxDir>
|
||||||
<DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta8</DnxVersion>
|
<DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta8</DnxVersion>
|
||||||
<DnxDir Condition="'$(OsEnvironment)'=='OSX'">dnx-coreclr-darwin-x64</DnxDir>
|
<DnxDir Condition="'$(OsEnvironment)'=='OSX'">dnx-coreclr-darwin-x64</DnxDir>
|
||||||
<DnxVersion Condition="'$(OsEnvironment)'=='OSX'">1.0.0-rc1-final</DnxVersion>
|
<DnxVersion Condition="'$(OsEnvironment)'=='OSX'">1.0.0-rc2-16177</DnxVersion>
|
||||||
|
|
||||||
<!-- Output directories -->
|
<!-- Output directories -->
|
||||||
<BinDir>$(RepoRoot)bin$([System.IO.Path]::DirectorySeparatorChar)</BinDir>
|
<BinDir>$(RepoRoot)bin$([System.IO.Path]::DirectorySeparatorChar)</BinDir>
|
||||||
|
@ -51,16 +51,6 @@
|
||||||
<DnuToolDir Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(PackagesDir), "$(DnxDir).$(DnxVersion)"))</DnuToolDir>
|
<DnuToolDir Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(PackagesDir), "$(DnxDir).$(DnxVersion)"))</DnuToolDir>
|
||||||
<DnuToolPath Condition="'$(OsEnvironment)'=='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu.cmd"))</DnuToolPath>
|
<DnuToolPath Condition="'$(OsEnvironment)'=='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu.cmd"))</DnuToolPath>
|
||||||
<DnuToolPath Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu"))</DnuToolPath>
|
<DnuToolPath Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu"))</DnuToolPath>
|
||||||
<!-- The DNU package from Nuget does not work on OSX. Using system installed one-->
|
|
||||||
<!-- dnu `dash``dash`version returns:
|
|
||||||
Microsoft .NET Development Utility
|
|
||||||
Version: 1.0.0-rc2-16128
|
|
||||||
Type: Mono
|
|
||||||
Architecture: x64
|
|
||||||
OS Name: Darwin
|
|
||||||
OS Version: 10.11
|
|
||||||
Runtime Id: osx.10.11-x64 -->
|
|
||||||
<DnuToolPath Condition="'$(OsEnvironment)'=='OSX'">dnu</DnuToolPath>
|
|
||||||
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="dnx-coreclr-darwin-x64" version="1.0.0-rc1-final" />
|
<package id="dnx-coreclr-darwin-x64" version="1.0.0-rc2-16177" />
|
||||||
</packages>
|
</packages>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче