Skip to content

Build projects that consume tool shims in pass 2 #61249

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

Closed
wants to merge 1 commit into from
Closed

Build projects that consume tool shims in pass 2 #61249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@
$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
"
Condition=" '$(TargetOsName)' == 'win' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />

<!-- These projects requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build them in pass 2 -->
Copy link
Member

@wtgodbe wtgodbe Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit, but they only require x64 & x86 assets

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix - thanks.

<ProjectToExclude Include="
$(RepoRoot)src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj;
$(RepoRoot)src\Tools\Microsoft.dotnet-openapi\src\Microsoft.dotnet-openapi.csproj;
"
Condition=" '$(TargetOsName)' == 'win' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
</ItemGroup>

<Choose>
Expand Down Expand Up @@ -98,6 +105,13 @@
<ProjectToBuild Include="$(RepoRoot)src\SiteExtensions\LoggingAggregate\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj">
<DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
</ProjectToBuild>
<!-- Build tools projects that require multiple shims -->
<ProjectToBuild Include="$(RepoRoot)src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj" >
<DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
</ProjectToBuild>
<ProjectToBuild Include="$(RepoRoot)src\Tools\Microsoft.dotnet-openapi\**\*.csproj" >
<DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
</ProjectToBuild>
</ItemGroup>
</When>
<Otherwise>
Expand Down
4 changes: 1 addition & 3 deletions src/Tools/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<Project>
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
<!-- Microsoft tool packages are required to target both x64 and x86. -->
<!-- In VMR builds we only use the current RID. -->
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' != 'true' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' ">$(TargetRid)</PackAsToolShimRuntimeIdentifiers>
<PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND ('$(DotNetBuild)' != 'true' OR '$(TargetOsName)' == 'win')">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
<!-- None of the tool projects are project reference providers. -->
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
<!--
Expand Down
Loading