Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,8 @@
<_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true'">true</_BuildMonoRuntimePack>
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildHostPack>
<_BuildCdacPack Condition="'$(_CDacToolsBuilt)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' and ('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'linux')">true</_BuildCdacPack>
<!-- Some source build configurations and musl need to work out packaging errors before they can be enabled -->
<_BuildCdacPack Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetsLinuxMusl)' == 'true' or '$(TargetArchitecture)' == 'loongarch64' or '$(TargetArchitecture)' == 'riscv64'">false</_BuildCdacPack>
<!-- Some configurations need to work out packaging errors before they can be enabled -->
<_BuildCdacPack Condition="'$(TargetArchitecture)' == 'loongarch64'">false</_BuildCdacPack>
<_BuildBundle Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion eng/liveILLink.targets
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
ReferenceOutputAssembly="false"
PrivateAssets="all"
Private="false"
SetConfiguration="Configuration=$(ToolsConfiguration)">
SetConfiguration="Configuration=$(ToolsConfiguration)"
GlobalPropertiesToRemove="RuntimeIdentifier">
<!-- Keep TFMs in sync with ILLink.Tasks.csproj -->
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(NetCoreAppToolCurrent)</SetTargetFramework>
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkToolCurrent)</SetTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ extends:
jobParameters:
testScope: innerloop
nameSuffix: CoreCLR_Bootstrapped
buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -rc Checked --bootstrap
buildArgs: -s clr+libs+host+packs+tools.cdac -c $(_BuildConfig) -rc Checked --bootstrap
timeoutInMinutes: 120
condition: >-
or(
Expand Down
6 changes: 4 additions & 2 deletions src/native/managed/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project>
<Import Project=".\native-library.targets" Condition="'$(IsSourceProject)' == 'true' and '$(Language)' == 'C#'" />
<Import Project="..\..\..\Directory.Build.targets" />
<Import Project=".\native-library.targets" Condition="'$(IsSourceProject)' == 'true' and '$(Language)' == 'C#'" />
<Import Project="..\..\..\Directory.Build.targets" />
<Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" Condition="'$(UseBootstrapLayout)' == 'true'" />
<Import Project="$(RepositoryEngineeringDir)liveILLink.targets" Condition="'$(UseBootstrapLayout)' == 'true'" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public static IPlatformAgnosticContext GetContextForPlatform(Target target)
RuntimeInfoArchitecture.X64 => new ContextHolder<AMD64Context>(),
RuntimeInfoArchitecture.Arm => new ContextHolder<ARMContext>(),
RuntimeInfoArchitecture.Arm64 => new ContextHolder<ARM64Context>(),
RuntimeInfoArchitecture.RiscV64 => new ContextHolder<RISCV64Context>(),
RuntimeInfoArchitecture.Unknown => throw new InvalidOperationException($"Processor architecture is required for creating a platform specific context and is not provided by the target"),
_ => throw new InvalidOperationException($"Unsupported architecture {runtimeInfo.GetTargetArchitecture()}"),
};
Expand Down
Loading
Loading