diff --git a/omnisharp.json b/omnisharp.json index 80a3a6ec5..afe56c529 100644 --- a/omnisharp.json +++ b/omnisharp.json @@ -1,5 +1,5 @@ { "dnx": { - "projects": "src/*/project.json" + "projects": "src/*/project.json;test/src/*/project.json;scripts/*/project.json" } } \ No newline at end of file diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 2c40bca7f..000244524 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -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"); diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 279e70226..65f76a078 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -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": {} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 25dd9fc6d..597117d84 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -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-*", diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 36e401df5..af109b793 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -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" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index f9c7dddf4..a83b39c74 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -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", diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 5d09d249f..dea5d0a72 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -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",