Fix build

Author: wtgodbe

.azure/pipelines/ci-public.yml

@@ -136,6 +136,7 @@ stages:
                 -pack
                 -all
                 -noBuildJava
+                -noBuildNative
                 /p:OnlyPackPlatformSpecificPackages=true
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
@@ -151,6 +152,7 @@ stages:
                 -sign
                 -pack
                 -noBuildJava
+                -noBuildNative
                 /p:DotNetSignType=$(_SignType)
                 /p:OnlyPackPlatformSpecificPackages=true
                 $(_BuildArgs)

.azure/pipelines/ci.yml

@@ -185,6 +185,7 @@ extends:
                     -pack
                     -all
                     -noBuildJava
+                    -noBuildNative
                     /p:OnlyPackPlatformSpecificPackages=true
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
@@ -200,6 +201,7 @@ extends:
                     -sign
                     -pack
                     -noBuildJava
+                    -noBuildNative
                     /p:DotNetSignType=$(_SignType)
                     /p:OnlyPackPlatformSpecificPackages=true
                     $(_BuildArgs)

eng/Build.props

@@ -55,6 +55,12 @@
                       $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
                       " />
+
+    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
+    <ProjectToExclude Include="
+                      $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
+                      "
+                      Condition=" '$(TargetOsName)' == 'win' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
   </ItemGroup>
 
   <Choose>
@@ -76,16 +82,25 @@
           <AdditionalProperties>Platform=x86</AdditionalProperties>
           <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
         </ProjectToBuild>
+        <ProjectToBuild Include="$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" >
+          <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
+        </ProjectToBuild>
       </ItemGroup>
     </When>
     <Otherwise>
       <!-- BuildNative -->
-      <ItemGroup Condition=" '$(TargetOsName)' == 'win'">
+      <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND '$(DotNetBuild)' == 'true' ">
         <NativeProjects Condition="'$(TargetArchitecture)' == 'x64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
         <NativeProjects Condition="'$(TargetArchitecture)' == 'x86'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
         <NativeProjects Condition="'$(TargetArchitecture)' == 'arm64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
       </ItemGroup>
 
+      <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND $(DotNetBuild)' != 'true' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
+        <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
+        <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
+        <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
+      </ItemGroup>
+
       <ItemGroup>
         <ProjectToBuild Condition=" $(BuildNative) " Include="@(NativeProjects)" Exclude="@(ProjectToExclude)" BuildStep="native" />
         <ProjectToExclude Condition=" !$(BuildNative) " Include="@(NativeProjects)" />