From: Egor Bogatov <egorbo@gmail.com>
Date: Fri, 13 Mar 2020 16:18:10 +0000 (+0300)
Subject: [mono] Track .dotnet runtime version (#33180)
X-Git-Tag: submit/tizen/20210909.063632~9180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=498720e0c1d12e0788a02304c720fb3b1689045d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[mono] Track .dotnet runtime version (#33180)

* Track .dotnet runtime version correctly

* Use BundledNETCoreAppPackageVersion

* Rollback to an error

* Update src/mono/mono.proj

Co-Authored-By: Alexander Köplinger <alex.koeplinger@outlook.com>

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
---

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 04e6b0a..3b187a1 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="Directory.Build.props" />
   <Import Project="Directory.Build.targets" />
-
   <PropertyGroup>
     <MonoObjDir>$(ArtifactsObjDir)mono/$(PlatformConfigPathPart)/</MonoObjDir>
     <MonoEnableLLVM Condition="'$(MonoEnableLLVM)' == ''">false</MonoEnableLLVM>
@@ -577,6 +576,8 @@
   </Target>
 
   <Target Name="ValidateLocalDotnet">
+    <Error Condition="$([System.IO.Directory]::GetDirectories('$(LocalDotnetDir)\shared\Microsoft.NETCore.App').Length) > 1" Text="$(LocalDotnetDir) contains more than one SDK, please delete unused ones." />
+    <Error Condition="$([System.IO.Directory]::GetDirectories('$(LocalMonoDotnetDir)\shared\Microsoft.NETCore.App').Length) > 1" Text="$(LocalMonoDotnetDir) contains more than one SDK, please delete unused ones." />
     <Error Condition="!Exists('$(LocalDotnet)')" Text="'$(LocalDotnet)' doesn't exist." />
   </Target>
 
diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile
index 77ec080..eb04765 100644
--- a/src/mono/netcore/Makefile
+++ b/src/mono/netcore/Makefile
@@ -1,3 +1,7 @@
+ifeq ($(wildcard ../../../.dotnet),)
+  $(info Downloading local dotnet...)
+endif
+
 DOTNET := $(shell bash init-tools.sh | tail -1)
 # DOTNET_MONO is a copy of DOTNET (local .dotnet) with Mono Runtime bits (see patch-mono-dotnet rule)
 DOTNET_MONO = ../../../.dotnet-mono/dotnet