Refactor ReadyToRun configuration for CoreCLR

Author: kotlarmilos

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -214,11 +214,16 @@
 	</PropertyGroup>
 
 	<!-- ReadyToRun configuration for CoreCLR -->
-	<PropertyGroup Condition="'$(UseMonoRuntime)' != 'true' And '$(PublishReadyToRun)' == 'true'">
-		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-		<PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
+	<PropertyGroup Condition="'$(UseMonoRuntime)' == 'false' And '$(_PlatformName)' != 'macOS'">
+		<PublishReadyToRun Condition="'$(PublishReadyToRun)' == ''">true</PublishReadyToRun>
+		<PublishReadyToRunComposite Condition="'$(PublishReadyToRun)' == 'true'">true</PublishReadyToRunComposite>
+		<PublishReadyToRunContainerFormat Condition="'$(PublishReadyToRun)' == 'true'">macho</PublishReadyToRunContainerFormat>
 	</PropertyGroup>
 
+	<ItemGroup Condition="'$(UseMonoRuntime)' == 'false' And '$(_PlatformName)' != 'macOS' And '$(PublishReadyToRun)' != 'true'">
+		<_BundlerEnvironmentVariables Include="DOTNET_ReadyToRun" Value="0" />
+	</ItemGroup>
+
 	<!-- Compute _SdkIsSimulator from the RuntimeIdentifier -->
 	<PropertyGroup>
 		<_SdkIsSimulator Condition="'$(RuntimeIdentifier)' != '' And '$(_SdkIsSimulator)' == ''">$(RuntimeIdentifier.Contains('simulator'))</_SdkIsSimulator>

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -1247,12 +1247,6 @@
 							"
 			/>
 		</ItemGroup>
-
-		<!-- CoreCLR: these are variables currently needed to make CoreCLR work -->
-		<ItemGroup Condition="'$(UseMonoRuntime)' == 'false' And '$(_PlatformName)' != 'macOS'">
-			<_BundlerEnvironmentVariables Include="DOTNET_ReadyToRun" Value="1" Condition="'$(PublishReadyToRun)' == 'true'" />
-			<_BundlerEnvironmentVariables Include="DOTNET_ReadyToRun" Value="0" Condition="'$(PublishReadyToRun)' != 'true'" />
-		</ItemGroup>
 	</Target>
 
 	<!-- App bundle creation tasks -->