[tests] We don't need to point to our custom packages in global.json anymore, since we'll be using the installed workload.

This commit is contained in:
Rolf Bjarne Kvinge 2020-10-15 11:36:06 +02:00
Родитель 486bb80b52
Коммит 9da5db37b5
1 изменённых файлов: 3 добавлений и 11 удалений

Просмотреть файл

@ -11,17 +11,9 @@ NuGet.config: $(TOP)/NuGet.config Makefile
$(Q) nuget config -Set repositorypath=$(abspath $(CURDIR)/packages) -Config $@.tmp
$(Q) mv $@.tmp $@
# This tells NuGet to use the version we're building locally.
global.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
$(Q_GEN) \
printf "{\n" > $@; \
printf "\t\"sdk\": { \"version\": \"$(DOTNET5_VERSION)\" },\n" >> $@; \
printf "\t\"msbuild-sdks\": {\n" >> $@; \
printf "\t\t\"Microsoft.iOS.Sdk\": \"$(IOS_NUGET_VERSION_NO_METADATA)\",\n" >> $@; \
printf "\t\t\"Microsoft.tvOS.Sdk\": \"$(TVOS_NUGET_VERSION_NO_METADATA)\",\n" >> $@; \
printf "\t\t\"Microsoft.watchOS.Sdk\": \"$(WATCHOS_NUGET_VERSION_NO_METADATA)\",\n" >> $@; \
printf "\t\t\"Microsoft.macOS.Sdk\": \"$(MACOS_NUGET_VERSION_NO_METADATA)\"\n" >> $@; \
printf "\t}\n}\n" >> $@
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
global.json: $(TOP)/global5.json
$(CP) $< $@
../bgen/global.json: global.json
$(Q) $(CP) $< $@