|
55 | 55 | $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; |
56 | 56 | $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; |
57 | 57 | " /> |
| 58 | + |
| 59 | + <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 --> |
| 60 | + <ProjectToExclude Include=" |
| 61 | + $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj; |
| 62 | + " |
| 63 | + Condition=" '$(TargetOsName)' == 'win' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " /> |
58 | 64 | </ItemGroup> |
59 | 65 |
|
60 | 66 | <Choose> |
|
76 | 82 | <AdditionalProperties>Platform=x86</AdditionalProperties> |
77 | 83 | <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass> |
78 | 84 | </ProjectToBuild> |
| 85 | + <ProjectToBuild Include="$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" > |
| 86 | + <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass> |
| 87 | + </ProjectToBuild> |
79 | 88 | </ItemGroup> |
80 | 89 | </When> |
81 | 90 | <Otherwise> |
82 | 91 | <!-- BuildNative --> |
83 | | - <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') "> |
| 92 | + <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND '$(DotNetBuild)' == 'true' "> |
| 93 | + <NativeProjects Condition="'$(TargetArchitecture)' == 'x64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" /> |
| 94 | + <NativeProjects Condition="'$(TargetArchitecture)' == 'x86'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" /> |
| 95 | + <NativeProjects Condition="'$(TargetArchitecture)' == 'arm64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" /> |
| 96 | + </ItemGroup> |
| 97 | + |
| 98 | + <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND '$(DotNetBuild)' != 'true' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') "> |
84 | 99 | <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" /> |
85 | 100 | <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" /> |
86 | 101 | <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" /> |
|
0 commit comments