Skip to content

Restore a build target #788

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
papeh merged 2 commits into from
Mar 30, 2026
Merged

Restore a build target #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
060ab36
Restore a build target
papeh Mar 27, 2026
9f04bc4
All so
papeh Mar 30, 2026
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
13 changes: 13 additions & 0 deletions Build/SetupInclude.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,19 @@
/>
<Message Text="Updated CommonAssemblyInfo.cs, bldinc.h and GlobalInclude.properties (if needed)." />
</Target>
<Target Name="GeneratePartsAndLayoutFiles" DependsOnTargets="GenerateCellarConstants">
<XslTransformation
OutputPaths="$(fwrt)/DistFiles/Parts/GeneratedParts.xml"
XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/PartGenerate.xslt"
/>
<XslTransformation
OutputPaths="$(fwrt)/DistFiles/Parts/Generated.fwlayout"
XmlInputPaths="$(LcmModelArtifactsDir)/MasterLCModel.xml"
XslInputPath="$(fwrt)/Src/Common/Controls/DetailControls/PartGenerator/LayoutGenerate.xslt"
/>
<Message Text="Updated GeneratedParts.xml and Generated.fwlayout (if needed)." />
</Target>
<PropertyGroup>
<!-- Only compute fwrt if not already set (e.g., by NativeBuild.csproj) -->
<fwrt Condition="'$(fwrt)'==''">$([System.IO.Path]::GetFullPath("$(MSBuildProjectDirectory)/.."))</fwrt>
Expand Down
1 change: 1 addition & 0 deletions Build/SilVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<SilLcmVersion>11.0.0-beta0159</SilLcmVersion>
<SilLibPalasoVersion>17.0.0</SilLibPalasoVersion>
<SilChorusVersion>6.0.0-beta0063</SilChorusVersion>
<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
<SilMachineVersion>3.7.13</SilMachineVersion>
<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>
<IcuNugetVersion>70.1.152</IcuNugetVersion>
Expand Down
9 changes: 3 additions & 6 deletions Build/Src/NativeBuild/NativeBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
They must be explicitly referenced here because NativeBuild.csproj is a traditional
MSBuild project, not an SDK-style project, so it doesn't inherit from Directory.Build.props.
-->
<PackageReference Include="SIL.Chorus.L10ns" Version="3.0.1">
<PackageReference Include="SIL.Chorus.L10ns" Version="$(SilChorusL10nsVersion)">
<IncludeAssets>none</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -67,11 +67,8 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<!-- Override the Build target to call native build instead -->
<Target
Name="Build"
DependsOnTargets="allCppNoTest"
>
<!-- Override the Build target to call native build instead. Also generate Parts and Layout files. -->
<Target Name="Build" DependsOnTargets="allCppNoTest;GeneratePartsAndLayoutFiles">
<Message Text="Native C++ components built successfully" Importance="high" />
</Target>
<!-- Ensure Clean works -->
Expand Down
Loading
Loading