From 9c83101acd3b5a992937208b5f249b89bd765b46 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 5 Jul 2022 16:17:48 +0200 Subject: [PATCH] [build] Commit global.json to get maestro updates. Maestro requires a global.json file in the root directory, so we'll have to provide one. Unfortunately this means we'll have to update this file manually every time we bump the .NET version (maestro can't do it). Hopefully it won't be too painful :/ --- Makefile | 4 ++-- global.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 global.json diff --git a/Makefile b/Makefile index d3b2d065e321..a16ff30dfaa7 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,8 @@ all-local:: global.json global.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index $(Q_GEN) \ printf "{\n" > $@; \ - printf "\t\"sdk\": { \"version\": \"$(DOTNET_VERSION)\" }\n" >> $@; \ - printf "\n}\n" >> $@ + printf " \"sdk\": {\n \"version\": \"$(DOTNET_VERSION)\"\n }\n" >> $@; \ + printf "}\n" >> $@ install-hook:: @$(MAKE) check-permissions diff --git a/global.json b/global.json new file mode 100644 index 000000000000..f907467970a9 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "6.0.301-rtm.22280.1" + } +}