From 5d261e46ce5bcf0489386f215885909c67bb82c6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 4 Oct 2018 09:26:44 -0700 Subject: [PATCH] Support checked-in global.json files --- .gitignore | 1 - build/RepositoryBuild.targets | 4 ++++ global.json | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 global.json diff --git a/.gitignore b/.gitignore index 9f2e95e1d8..ba949609e0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ node_modules/ .r .w .deps -global.json msbuild.ProjectImports.zip .env scripts/tmp/ diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 9ad38cd5c2..26cf818354 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -86,6 +86,8 @@ $(RepositoryRoot)korebuild-lock.txt $(BuildRepositoryRoot)korebuild-lock.txt $(IntermediateDir)$(RepositoryToBuild)-korebuild-lock.txt + $(BuildRepositoryRoot)global.json + $(IntermediateDir)$(RepositoryToBuild)-global.json @@ -93,6 +95,7 @@ + @@ -100,6 +103,7 @@ + diff --git a/global.json b/global.json new file mode 100644 index 0000000000..b5a5299b58 --- /dev/null +++ b/global.json @@ -0,0 +1,8 @@ +{ + "sdk": { + "version": "2.2.100-preview2-009404" + }, + "msbuild-sdks": { + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2" + } +}