Clean up from the move to RC3 packages. Removed the dotnet-core depen…

…dency 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.
dotnet · May 24, 2016 · 2858e79 · 2858e79
1 parent fe7b519
commit 2858e79
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 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/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" />
   </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
@@ -153,10 +153,15 @@ public void CrossgenDirectory(BuildTargetContext c, 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);

diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json
@@ -5,7 +5,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0-rc3-*",
+    "Microsoft.NETCore.App": "1.0.0-rc2-*",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },