From 51cc45821f9da6d3ed02be5048bfdf3ddeaecee3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 21 Apr 2016 11:09:41 -0700 Subject: [PATCH 1/2] Use wild-card version of ProjectModel --- src/TypeCatalogParser/project.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TypeCatalogParser/project.json b/src/TypeCatalogParser/project.json index ed52514f47..62ac3aa7fa 100644 --- a/src/TypeCatalogParser/project.json +++ b/src/TypeCatalogParser/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-beta-*" + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, "frameworks": { From b8ffd420515af724c6f3ac6140477c18e56933cb Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 21 Apr 2016 11:17:59 -0700 Subject: [PATCH 2/2] Make TypeCatalogGen build script quieter --- src/TypeCatalogGen/build.sh | 4 ++-- src/TypeCatalogGen/project.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TypeCatalogGen/build.sh b/src/TypeCatalogGen/build.sh index 4a086a2dbf..ad82b9133d 100755 --- a/src/TypeCatalogGen/build.sh +++ b/src/TypeCatalogGen/build.sh @@ -2,9 +2,9 @@ export DOTNET_REFERENCE_ASSEMBLIES_PATH=$MONO_PREFIX/lib/mono/xbuild-frameworks/ pushd ../TypeCatalogParser -dotnet restore +dotnet restore -v Warning dotnet run popd -dotnet restore +dotnet restore -v Warning dotnet run ../Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs powershell.inc diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json index 7392347bf4..c9e79d795f 100644 --- a/src/TypeCatalogGen/project.json +++ b/src/TypeCatalogGen/project.json @@ -12,7 +12,7 @@ "System.Reflection.Metadata": "1.1.0", "System.Collections.Immutable": "1.1.37" }, - + "frameworks": { "net45": { "frameworkAssemblies": {