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

Fixed the build

Browse source 
- 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omnisharp.json
View file

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

2
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -356,7 +356,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var assemblyToCrossgen in AssembliesToCrossGen)
{
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");

24
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -1,27 +1,21 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk",
"warningsAsErrors": true
"keyFile": "../../tools/Key.snk",
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Reflection.Metadata": "1.2.0-rc2-23811",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
},
"frameworks": {
"net451": { },
"net451": {},
"dnxcore50": {
"imports": "portable-net45+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"imports": "portable-net45+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
}
}
}
},
"scripts": {
}
}
"scripts": {}
}

1
src/Microsoft.DotNet.Compiler.Common/project.json
View file

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

1
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

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

2
src/Microsoft.DotNet.ProjectModel/project.json
View file

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

2
src/dotnet/project.json
View file

@ -54,7 +54,7 @@
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811",
"Microsoft.NETCore.TestHost": "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.TraceSource": "4.0.0-rc2-23811",
"System.Linq.Expressions": "4.0.11-rc2-23811",