Merge conflicts

build/Compile.targets

@@ -6,9 +6,7 @@
     <RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
     <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
     <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
-    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
-    <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
-    <SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
+    <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
   </PropertyGroup>
 
   <ItemGroup>

build/MSBuildExtensions.props

@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
+  </PropertyGroup>
+  
   <ItemGroup>
     <MSBuildExtensionsContent Include="$(MSBuildImportsDir)/**/*" />
   </ItemGroup>

src/redist/redist.csproj

@@ -81,6 +81,10 @@
       <Copy SourceFiles="@(MSBuildExtensionsContent)"
             DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
 
+      <PropertyGroup>
+        <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
+      </PropertyGroup>
+
       <ItemGroup>
         <NuPkgContentForMSBuildExtensions Include="$(MSBuildTargetsDirectory)/**/*.targets;
                                                    $(MSBuildTargetsDirectory)/**/*.Targets;