From 75d5cc3df4dde3b37d75f289b5a90e358da838aa Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 28 Dec 2020 17:33:57 +0100
Subject: Avoid deferred Arcade importing (#46397)

* General cleanup and mono import Arcade in root

* More cleanup and coreclr import Arcade root

* Import Arcade root from libraries

* Set informationversion for corelib

* BuildArchitecture cleanup

* Fix property name

* Fix default target invocation of runtime.proj

* specify tfm correctly

* Remove unnecessary TestStrongNameKeyId

* Revert TestStrongNameKeyId removal

* Fix entrypoint target by using M.B.NoTargets

* Fix reference assembly paths

* PR feedback

* Set Platform correctly

* PR feedback and more cleanup

* Move BaselineMicrosoftNetCoreAppPackageVersion

* Fix reference to CoreLib

* Fix OS calculation

* Fix targets importing

* Remove *TargetOS

* Add RuntimeConfiguration doc

* Change conditions in root msbuild files

* installer test fixes

* Cleanup

* More cleanup because of well defined entrypoint

* Don't import D.B.* from installer tests at all

* Rename fix

* Include explicit reference to mscorlib in ilproj

* Update eng/restore/docs.targets

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

* Revert some installer test changes

* Installer test fix again

* Disable EOL tfm check for installer tests

* Set platform later for installer

Co-authored-by: Jan Kotas <jkotas@microsoft.com>
---
 Directory.Build.targets | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Directory.Build.targets')

diff --git a/Directory.Build.targets b/Directory.Build.targets
index e8bb87918af..764d12bb822 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,13 +5,11 @@
     tell Microsoft.Common.targets not to import Directory.Build.targets again
     -->
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-
-    <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers>
   </PropertyGroup>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
   <Import Project="$(RepositoryEngineeringDir)python.targets" />
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />
 
   <PropertyGroup>
     <!--
@@ -19,6 +17,12 @@
       unconditionally in Microsoft.NETCoreSdk.BundledVersions.props.
     -->
     <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
+    <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers>
+    <!-- SDK sets product to assembly but we want it to be our product name -->
+    <Product>Microsoft%AE .NET</Product>
+    <!-- Use the .NET product branding version for informational version description -->
+    <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' == ''">$(ProductVersion)</InformationalVersion>
+    <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' != ''">$(ProductVersion)-$(VersionSuffix)</InformationalVersion>
   </PropertyGroup>
 
   <!-- Packaging -->
-- 
cgit v1.2.3