From 5d0aefe59f055bfb38b660e8e173d58a90beb084 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 24 May 2016 11:34:40 -0700
Subject: [PATCH] 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.

---
 NuGet.Config                                               | 1 -
 build_projects/dotnet-cli-build/build.ps1                  | 3 ---
 .../shared-build-targets-utils/Utils/Crossgen.cs           | 7 ++++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 1cbcecba8..55f84e99d 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -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>
diff --git a/build_projects/dotnet-cli-build/build.ps1 b/build_projects/dotnet-cli-build/build.ps1
index 21030843b..0f27922a7 100644
--- a/build_projects/dotnet-cli-build/build.ps1
+++ b/build_projects/dotnet-cli-build/build.ps1
@@ -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($_)) {
diff --git a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs
index 8b9d3290b..0c501794f 100644
--- a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs
+++ b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs
@@ -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);