Clean up from the move to RC3 packages. Removed the dotnet-core dependency on NuGet.Config now that we have RC3 packages in the cli-deps feed. Re-enabled crossgen for windows now that we added JITPath to the crossgen call.
This commit is contained in:
parent
0e60890be2
commit
5d0aefe59f
3 changed files with 6 additions and 5 deletions
|
@ -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>
|
||||
|
|
|
@ -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($_)) {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue