Avoid deferred Arcade importing (dotnet#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 <[email protected]> * 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 <[email protected]>
macsux · Dec 28, 2020 · 75d5cc3 · 75d5cc3
1 parent c142f16
commit 75d5cc3
Show file tree

Hide file tree

Showing 46 changed files with 332 additions and 657 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -5,20 +5,24 @@
     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>
     <!--
       Define this here (not just in Versions.props) because the SDK resets it
       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 -->

diff --git a/eng/Configurations.props b/eng/Configurations.props
diff --git a/eng/Signing.props b/eng/Signing.props
@@ -1,10 +1,5 @@
 <Project InitialTargets="SetupFilesToSign">
 
-  <!-- If this file was pulled in via prepare-artifacts.proj (a non-SDK project, these files are already
-       imported. -->
-  <Import Project="$(RepositoryEngineeringDir)Configurations.props" Condition="'$(PrepareArtifacts)' != 'true'" />
-  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" Condition="'$(PrepareArtifacts)' != 'true'" />
-
   <PropertyGroup>
     <!--
       Windows arm/arm64 jobs don't have MSIs to sign. Keep it simple: allow not finding any matches
@@ -45,10 +40,10 @@
     <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
   </ItemGroup>
   <ItemGroup Condition="'$(PrepareArtifacts)' == 'true' and '$(PostBuildSign)' == 'true'">
-    <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.msi" />
-    <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.exe" />
-    <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.nupkg" />
-    <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.zip" />
+    <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.msi" />
+    <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.exe" />
+    <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.nupkg" />
+    <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.zip" />
 
     <ItemsToSignWithoutPaths Include="@(ItemsToSignWithPaths->'%(Filename)%(Extension)')" />
     <ItemsToSignPostBuild Include="@(ItemsToSignWithoutPaths->Distinct())" />
@@ -61,8 +56,8 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(SignDiagnostics)' == 'true'">
-      <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordaccore*.dll" />
-      <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordbi.dll" />
+      <ItemsToSign Include="$(DiagnosticsFilesRoot)\**\mscordaccore*.dll" />
+      <ItemsToSign Include="$(DiagnosticsFilesRoot)\**\mscordbi.dll" />
       <!--
         The DAC should be signed with the SHA2 cert (both long and short name).
         We already add the short-name DAC above, so add the long-name DAC here.