Merge pull request #3223 from livarcocc/clean_up_after_rc3

Clean up from the move to RC3 packages.
This commit is contained in:
Eric Erhardt 2016-05-27 07:50:31 -05:00
commit e9d3a0903d
3 changed files with 6 additions and 5 deletions

View file

@ -3,7 +3,6 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>

View file

@ -35,9 +35,6 @@ else
$env:DOTNET_BUILD_SKIP_PACKAGING=0
}
Write-Host "Disabling crossgen for the CLI build. See issue - https://github.com/dotnet/cli/issues/3059"
$env:DISABLE_CROSSGEN=1
# Load Branch Info
cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {

View file

@ -154,10 +154,15 @@ namespace Microsoft.DotNet.Cli.Build
IList<string> crossgenArgs = new List<string> {
"-readytorun", "-in", file, "-out", tempPathName,
"-JITPath", GetLibCLRJitPathForVersion(),
"-platform_assemblies_paths", platformAssembliesPaths
};
if (CurrentPlatform.IsUnix)
{
crossgenArgs.Add("-JITPath");
crossgenArgs.Add(GetLibCLRJitPathForVersion());
}
ExecSilent(_crossGenPath, crossgenArgs, env);
File.Copy(tempPathName, file, overwrite: true);