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

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.

Browse source
This commit is contained in:
Livar Cunha 2016-05-24 11:34:40 -07:00 • committed by Eric Erhardt
parent 0e60890be2
commit 5d0aefe59f
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NuGet.Config
View file

@ -3,7 +3,6 @@
<packageSources> <packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below --> <!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear /> <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="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" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>

3
build_projects/dotnet-cli-build/build.ps1
View file

@ -35,9 +35,6 @@ else
$env:DOTNET_BUILD_SKIP_PACKAGING=0 $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 # Load Branch Info
cat "$RepoRoot\branchinfo.txt" | ForEach-Object { cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) { if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {

7
build_projects/shared-build-targets-utils/Utils/Crossgen.cs
View file

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