Skip to content

Rework bootstrap layout usage for AOT publish of cdac project #122471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoyosjs merged 3 commits into from
Dec 13, 2025
Merged

Rework bootstrap layout usage for AOT publish of cdac project #122471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a6c91b
Rework bootstrap layout usage for AOT publish of cdac project
hoyosjs Dec 11, 2025
efed0f7
Remove one more UseBootstrapLayout
hoyosjs Dec 12, 2025
9ed9200
Set NeedsAotPublish before including the .NET SDK
jkoritzinsky Dec 12, 2025
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
7 changes: 4 additions & 3 deletions eng/targetingpacks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<TargetingpacksTargetsImported>true</TargetingpacksTargetsImported>
</PropertyGroup>

<PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
'$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)'">
<PropertyGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true' and
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
'$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)')
or '$(UseBootstrapLayout)' == 'true'">
<UseLocalTargetingRuntimePack Condition="'$(UseLocalTargetingRuntimePack)' == ''">true</UseLocalTargetingRuntimePack>
</PropertyGroup>

Expand Down
7 changes: 4 additions & 3 deletions src/native/managed/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project>
<Import Project="..\..\..\Directory.Build.props" />
<Import Project=".\native-library.props" Condition="'$(IsSourceProject)' == 'true' and '$(Language)' == 'C#'" />
<PropertyGroup>

<PropertyGroup Condition="'$(UseBootstrapLayout)' == 'true'">
<UseLocalTargetingRuntimePack>true</UseLocalTargetingRuntimePack>
<UseBootstrapLayout Condition="'$(NeedsAotPublish)' == 'true' and '$(UseBootstrap)' == 'true'">true</UseBootstrapLayout>
</PropertyGroup>

<Import Project=".\native-library.props" Condition="'$(NeedsAotPublish)' == 'true'" />
</Project>
2 changes: 1 addition & 1 deletion src/native/managed/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<Import Project=".\native-library.targets" Condition="'$(IsSourceProject)' == 'true' and '$(Language)' == 'C#'" />
<Import Project=".\native-library.targets" Condition="'$(NeedsAotPublish)' == 'true'" />
<Import Project="..\..\..\Directory.Build.targets" />
<Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" Condition="'$(UseBootstrapLayout)' == 'true'" />
<Import Project="$(RepositoryEngineeringDir)liveILLink.targets" Condition="'$(UseBootstrapLayout)' == 'true'" />
Expand Down
7 changes: 6 additions & 1 deletion src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project>
<PropertyGroup>
<NeedsAotPublish>true</NeedsAotPublish>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<AssemblyName>$(LibPrefix)$(MSBuildProjectName)</AssemblyName>
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
Expand Down Expand Up @@ -32,4 +36,5 @@
<ProjectReference Include="..\Microsoft.Diagnostics.DataContractReader.Legacy\Microsoft.Diagnostics.DataContractReader.Legacy.csproj" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>
1 change: 0 additions & 1 deletion src/native/managed/subproject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<SubprojectProps Include="RuntimeConfiguration" Value="$(RuntimeConfiguration)" />
<SubprojectProps Include="LibrariesConfiguration" Value="$(LibrariesConfiguration)" />
<SubprojectProps Include="RuntimeIdentifier" Value="$(PortableTargetRid)" />
<SubprojectProps Include="UseBootstrapLayout" Value="$(UseBootstrap)" />
</ItemGroup>

<PropertyGroup>
Expand Down
Loading