Merge branch 'release/2.1' to release/2.2

Directory.Build.targets

@@ -56,6 +56,7 @@
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
+  <Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
   <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
   <Import Project="eng\targets\CSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
   <Import Project="eng\targets\FSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />

build/repo.props

@@ -82,7 +82,7 @@
         <NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
 
         <ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
-          <!-- Required to prevent triggering double-builds. See src\Servers\IIS\ResolveIisReferences.targets for details. -->
+          <!-- Required to prevent triggering double-builds. See eng\targets\ResolveIisReferences.targets for details. -->
           <AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x64'">Platform=x64</AdditionalProperties>
           <AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x86'">Platform=x86</AdditionalProperties>
         </ProjectToBuild>

src/Servers/IIS/ResolveIisReferences.targets → eng/targets/ResolveIisReferences.targets

@@ -10,14 +10,14 @@ with the right MSBuild incantations to get output copied to the right place.
     <When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' ">
         <Reference Remove="AspNetCoreModule" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
       </ItemGroup>
 
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
         <Reference Remove="AspNetCoreModuleV2" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
       </ItemGroup>
 
       <ItemGroup Condition="@(NativeProjectReference->Count()) != 0">

src/Servers/IIS/Directory.Build.targets

@@ -1,5 +0,0 @@
-<Project>
-  <Import Project="ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-</Project>