Merge pull request #3223 from livarcocc/clean_up_after_rc3

Clean up from the move to RC3 packages.
dotnet · May 27, 2016 · e9d3a09 · e9d3a09
2 parents 0e60890 + 5d0aefe
commit e9d3a09
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -154,10 +154,15 @@ public void CrossgenDirectory(string sharedFxPath, string pathToAssemblies)
 
                 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);