Skip to content
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

Make XDP build in OneBranch again #793

Merged
merged 15 commits into from
Feb 10, 2025
Merged

Make XDP build in OneBranch again #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4bc42a0
remove MSI from onebranch builds
mtfriesen Jan 23, 2025
3567269
try setting UCRT mode during nuget restore
mtfriesen Jan 28, 2025
38b9f8d
try again
mtfriesen Jan 28, 2025
da344d9
?
mtfriesen Jan 29, 2025
a44527d
next level
mtfriesen Jan 30, 2025
451322f
??
mtfriesen Jan 30, 2025
4ccd706
?!?
mtfriesen Jan 30, 2025
1f3d989
revert dirs non-workaround
mtfriesen Feb 5, 2025
aadab97
make directory.build.props include parents (if they exist)
mtfriesen Feb 5, 2025
1bdeca2
try ES suggestion
mtfriesen Feb 8, 2025
91bb50e
try UseInternalMSUniCrtPackage in wix
mtfriesen Feb 9, 2025
b027fec
undocked: try to avoid pulling in undocked props/targets files in wix
mtfriesen Feb 10, 2025
8bbef33
temp hardcode undocked official
mtfriesen Feb 10, 2025
49604db
revert hardcode workaround and comment
mtfriesen Feb 10, 2025
f585f02
add another comment for mysterious directory.build.props change
mtfriesen Feb 10, 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
2 changes: 2 additions & 0 deletions samples/directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Pull in parent Directory.Build.props, if it exists. OneBranch auto-injects into the root. -->
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))" Condition="'$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))' != ''" />
<Import Project="$(SolutionDir)test\xdp.test.props" />
</Project>
3 changes: 0 additions & 3 deletions src/onebranch/onebranch.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<Target Name="Catalog" Condition="'$(BuildStage)' == 'Catalog'" AfterTargets="Build" >
<MSBuild Projects="$(SolutionDir)src\xdp\xdp.vcxproj" Targets="Inf2Cat" Properties="EnableInf2Cat=true"/>
</Target>
<Target Name="PackageMsi" Condition="'$(BuildStage)' == 'Package'" AfterTargets="Package" >
<MSBuild Projects="$(SolutionDir)src\xdpinstaller\xdpinstaller.wixproj" Targets="Build"/>
</Target>
<ItemGroup Condition="'$(BuildStage)' == 'AllPackage'">
<ProjectReference Include="$(SolutionDir)src\nuget\nuget.vcxproj">
<Project>{fbf60d12-183d-42d1-b884-8b9fa4f1273f}</Project>
Expand Down
11 changes: 7 additions & 4 deletions src/xdpinstaller/xdpinstaller.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@
<ItemGroup Condition="'$(BuildStage)' != 'Binary'">
<Compile Include="product.wxs" />
</ItemGroup>
<!-- OneBranch doesn't build the WiX project, but loading the .props and .targets files during
NuGet restore causes unrelated OneBranch errors. Suppress these internally for now.
-->
<ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" Version="$(WixVer)" />
<PackageReference Include="WixToolset.Util.wixext" Version="$(WixVer)" />
<PackageReference Include="WixToolset.UI.wixext" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
<PackageReference Include="WixToolset.Util.wixext" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
</ItemGroup>
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="$(WixVer)" />
<Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="$(WixVer)" />
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
<Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
<Target Name="SignMsi" Condition="'$(BuildStage)' != 'Binary' and '$(SignMode)' != 'Off'" AfterTargets="Build">
<MSBuild Projects="$(SolutionDir)src\xdpinstaller\xdpinstaller.vcxproj" Targets="SignMsi"/>
</Target>
Expand Down
2 changes: 2 additions & 0 deletions test/directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Pull in parent Directory.Build.props, if it exists. OneBranch auto-injects into the root. -->
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))" Condition="'$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))' != ''" />
<Import Project="$(SolutionDir)test\xdp.test.props" />
</Project>