diff --git a/eng/Subsets.props b/eng/Subsets.props index 68569344a6ea0d..41f63f11bbd795 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -121,8 +121,7 @@ <_NativeAotSupportedOS Condition="'$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd'">true <_NativeAotSupportedArch Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86')">true - true - true + true true @@ -287,12 +286,7 @@ AdditionalProperties="%(AdditionalProperties); ClrCrossComponentsSubset=true; HostArchitecture=$(BuildArchitecture); - TargetArchitecture=$(TargetArchitecture); HostCrossOS=$(HostOS); - HostOS=$(HostOS); - TargetOS=$(TargetOS); - RuntimeIdentifier=$(RuntimeIdentifier); - NETCoreSdkPortableRuntimeIdentifier=$(NETCoreSdkPortableRuntimeIdentifier); PgoInstrument=false; NoPgoOptimize=true; CrossBuild=false; diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index ffab9cbb1289b1..823dab33c645c4 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -10,15 +10,20 @@ $(RuntimeBinDir)ilc-published/ - true - $(ROOTFS_DIR) - true - true - true + false + false + false + + false + true + $(ROOTFS_DIR) + true + true + true true - + @@ -48,7 +53,7 @@ clang @@ -70,7 +75,7 @@ <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '[1-9]\d*')) - + @@ -81,7 +86,7 @@ - + diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj index aebad93eae08e0..3fbdc4590fdc1a 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj @@ -7,6 +7,11 @@ + false + false + false + + false true $(PackageRID) true @@ -16,7 +21,7 @@ - + true true @@ -36,7 +41,7 @@ - + $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) $(ROOTFS_DIR) @@ -53,12 +58,12 @@ false - + + Condition="'$(NativeAotSupported)' == 'true'" /> @@ -86,7 +91,7 @@ clang diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index c9d40b79d38db5..8d492718edd92a 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -15,6 +15,8 @@ true false + + false diff --git a/src/native/managed/compile-native.proj b/src/native/managed/compile-native.proj index ef7b427944efca..bcda8c5d6b57b5 100644 --- a/src/native/managed/compile-native.proj +++ b/src/native/managed/compile-native.proj @@ -13,11 +13,26 @@ + + + + false + + false + + false + + false + false + true + false + + $(ROOTFS_DIR) lld - --gcc-toolchain=$(ROOTFS_DIR)/usr + --gcc-toolchain=$(ROOTFS_DIR)/usr @@ -36,6 +51,6 @@ ReferenceOutputAssembly="false" AdditionalProperties="%(AdditionalProperties);$(SplitSubprojectProps)" Targets="LinkNative" - Condition="'$(UseNativeAotForComponents)' == 'true'"/> + Condition="$(SupportsNativeAotComponents)"/>