Add TreatAsLocalProperty support for the properties that make up BuildConfiguration

build.proj

@@ -65,7 +65,7 @@
     <MSBuild Projects="@(BuildToolsProject)"
              ContinueOnError="ErrorAndContinue"
              Condition="'%(Identity)' != ''"
-             Properties="TargetGroup=%(BuildToolsProject.TargetGroup)" />
+             Properties="Configuration=%(BuildToolsProject.TargetGroup);TargetGroup=%(BuildToolsProject.TargetGroup)" />
   </Target>
 
   <Target Name="Sync" DependsOnTargets="BuildCoreFxTools">

dir.props

@@ -146,6 +146,9 @@
     <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">netcoreapp-$(BuildConfiguration_OSGroup)-$(BuildConfiguration_ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
 
     <BuildConfigurationImportFile>$(ToolsDir)/configuration/configuration.props</BuildConfigurationImportFile>
+
+    <!-- Need to try and keep the same logic as the native builds as we need this for packaging -->
+    <NativeBinDir>$(BinDir)$(BuildConfiguration_OSGroup).$(ArchGroup).$(ConfigurationGroup)/native</NativeBinDir>
   </PropertyGroup>
 
   <Import Project="$(BuildConfigurationImportFile)" Condition="Exists('$(BuildConfigurationImportFile)')" />

external/dir.props

@@ -5,6 +5,7 @@
     <IsRuntimeAssembly>false</IsRuntimeAssembly>
   </PropertyGroup>
   <PropertyGroup>
+    <IntermediateOutputPath>$(IntermediateOutputPath)$(ArchGroup)/</IntermediateOutputPath>
     <ProjectJsonTemplate>$(MSBuildThisProjectDirectory)project.json.template</ProjectJsonTemplate>
     <ProjectJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.json</ProjectJson>
     <ProjectLockJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.lock.json</ProjectLockJson>

external/dir.targets

@@ -20,7 +20,7 @@
       Overwrite="true"
                       />
     <ItemGroup>
-      <FileWrites Include="$(ProjectJson)" />
+      <FileWrites Include="$(ProjectJson);$(ProjectLockJson)" />
     </ItemGroup>
 
   </Target>

pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj

@@ -24,7 +24,7 @@
     <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" />
     <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" />
   </ItemGroup>
-  
+
   <PropertyGroup>
     <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage>
     <TargetFrameworkName>netcoreapp</TargetFrameworkName>
@@ -35,13 +35,12 @@
 
     <RefBinDir>$(BinDir)$(TargetFrameworkName)/pkg/ref</RefBinDir>
     <LibBinDir>$(BinDir)$(TargetFrameworkName)/pkg/lib</LibBinDir>
-    <NativeBinDir>$(BinDir)$(OSGroup).$(PackagePlatform).$(ConfigurationGroup)/native</NativeBinDir>
 
     <NETStandardLibraryPackage>NETStandard.Library2</NETStandardLibraryPackage>
     <NETStandardLibraryPackageVersion>2.0.0-beta-24709-0</NETStandardLibraryPackageVersion>
     <NETStandardVersion>1.7</NETStandardVersion>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <SuppressNETStandardMissingFile Include="mscorlib" />
     <SuppressNETStandardMissingFile Include="netstandard" />
@@ -57,7 +56,7 @@
 
   <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
     <ProjectReference Include="@(Project)" />
-    
+
     <!-- Include refs -->
     <RefFile Include="$(RefBinDir)/*.*">
       <TargetPath>ref/$(TargetFramework)</TargetPath>
@@ -113,7 +112,7 @@
     <Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackage)' but missing from this package.  This error has been suppressed." />
     <Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackage)' but missing from this package." />
   </Target>
-  
+
   <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
     <ItemGroup>
       <File>

pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.props

@@ -13,46 +13,37 @@
     <OfficialBuildRID Include="fedora.24-x64" />
     <OfficialBuildRID Include="opensuse.13.2-x64" />
     <OfficialBuildRID Include="opensuse.42.1-x64" />
-    <OfficialBuildRID Include="osx.10.10-x64">
-      <OSGroup>OSX</OSGroup>
-    </OfficialBuildRID>
+    <OfficialBuildRID Include="osx.10.10-x64" />
     <OfficialBuildRID Include="rhel.7-x64" />
     <OfficialBuildRID Include="ubuntu.14.04-x64" />
     <OfficialBuildRID Include="ubuntu.16.04-x64" />
     <OfficialBuildRID Include="ubuntu.16.10-x64" />
     <OfficialBuildRID Include="win7-x86">
       <Platform>x86</Platform>
-      <OSGroup>Windows_NT</OSGroup>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win7-x64">
-      <OSGroup>Windows_NT</OSGroup>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="win7-x64" />
     <OfficialBuildRID Include="win8-arm">
       <Platform>arm</Platform>
-      <OSGroup>Windows_NT</OSGroup>
     </OfficialBuildRID>
     <OfficialBuildRID Include="win10-arm64">
       <Platform>arm64</Platform>
-      <OSGroup>Windows_NT</OSGroup>
     </OfficialBuildRID>
 
     <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set -->
     <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
     <BuildRID Include="$(PackageRID)">
       <Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform>
       <Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform>
-      <OSGroup>$(BuildConfiguration_OSGroup)</OSGroup>
     </BuildRID>
   </ItemGroup>
 
   <ItemGroup>
     <_project Include="@(BuildRID)">
-      <OSGroup Condition="'%(OSGroup)' == ''">Linux</OSGroup>
       <Platform Condition="'%(Platform)' == ''">amd64</Platform>
       <PackageTargetRuntime>%(Identity)</PackageTargetRuntime>
-      <AdditionalProperties>PackageTargetRuntime=%(Identity);OSGroup=%(OSGroup);Platform=%(Platform)</AdditionalProperties>
+      <AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties>
     </_project>
-    
+
     <Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" />
   </ItemGroup>
 </Project>

src/Tools/CoreFx.Tools/GenerateConfigurationProps.cs

@@ -61,6 +61,7 @@ public override bool Execute()
             CreateRuntimeIdentifier(project);
 
             var projectPath = Path.Combine(PropsFolder, $"{PropsFileName}{PropsFileExtension}");
+            project.TreatAsLocalProperty = string.Join<string>(";", ConfigurationFactory.GetProperties().Select(pi => pi.Name));
             project.Save(projectPath);
 
             return !Log.HasLoggedErrors;