Fixed the build

- csc kept crashing on stage 2 and it turned out to be a version mismatch with System.Reflection.Metadata.
- Silenced crossgen
- Made omnisharp see all of the projects
This commit is contained in:
David Fowler 2016-02-15 09:03:40 -08:00
parent ade2fa8b9b
commit 77dfbd8e43
7 changed files with 13 additions and 21 deletions

View file

@ -1,5 +1,5 @@
{ {
"dnx": { "dnx": {
"projects": "src/*/project.json" "projects": "src/*/project.json;test/src/*/project.json;scripts/*/project.json"
} }
} }

View file

@ -356,7 +356,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var assemblyToCrossgen in AssembliesToCrossGen) foreach (var assemblyToCrossgen in AssembliesToCrossGen)
{ {
c.Info($"Crossgenning {assemblyToCrossgen}"); c.Info($"Crossgenning {assemblyToCrossgen}");
ExecIn(outputDir, crossgen, "-nologo", "-platform_assemblies_paths", outputDir, assemblyToCrossgen); ExecInSilent(outputDir, crossgen, "-nologo", "-platform_assemblies_paths", outputDir, assemblyToCrossgen);
} }
c.Info("Crossgen complete"); c.Info("Crossgen complete");

View file

@ -1,17 +1,13 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Reflection.Metadata": "1.2.0-rc2-23811",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "dnxcore50": {
@ -21,7 +17,5 @@
} }
} }
}, },
"scripts": {}
"scripts": {
}
} }

View file

@ -7,7 +7,6 @@
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811", "NETStandard.Library": "1.0.0-rc2-23811",
"System.Reflection.Metadata": "1.2.0-rc3-23811",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",

View file

@ -5,7 +5,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811", "NETStandard.Library": "1.0.0-rc2-23811",
"System.Reflection.Metadata": "1.2.0-rc3-23811",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02"

View file

@ -5,7 +5,7 @@
}, },
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"System.Reflection.Metadata": "1.2.0-rc2-23811", "System.Reflection.Metadata": "1.2.0-rc3-23811",
"NuGet.Packaging": "3.4.0-beta-583", "NuGet.Packaging": "3.4.0-beta-583",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",

View file

@ -54,7 +54,7 @@
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23811", "NETStandard.Library": "1.0.0-rc2-23811",
"System.Reflection.Metadata": "1.2.0-rc3-23811", "System.Reflection.Metadata": "1.3.0-beta-23811",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23811", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23811",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23811", "System.Diagnostics.TraceSource": "4.0.0-rc2-23811",
"System.Linq.Expressions": "4.0.11-rc2-23811", "System.Linq.Expressions": "4.0.11-rc2-23811",