Fix -allconfigurations build on linux (dotnet/corefx#36780)

* Fix -allconfigurations build on linux

* Fix whitespace

Commit migrated from https://github.com/dotnet/corefx/commit/80672656a723818863ae0021370cc4f9ddfbdc73

diff --git a/src/libraries/external/tools/Configurations.props b/src/libraries/external/tools/Configurations.props
index 27813fc..2870dce 100644 (file)
--- a/src/libraries/external/tools/Configurations.props
+++ b/src/libraries/external/tools/Configurations.props
@@ -1,14 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
-      netfx;
-      uap10.0.16299;
-      uap10.0.16299aot;
-      uap;
-      uapaot;
-      mono;
+      netstandard;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
index f0c090b..7ce2ea9 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
@@ -24,7 +24,6 @@
     <OfficialBuildRID Include="win-x86">
       <Platform>x86</Platform>
     </OfficialBuildRID>
-    <OfficialBuildRID Include="@(OfficialBuildRID->'%(Identity)-aot')" />
 
     <!-- The following RIDs are not officically supported and are not
          built during official builds, however we wish to include them
@@ -35,8 +34,5 @@
     <OfficialBuildRID Include="tizen.5.0.0-armel">
       <Platform>armel</Platform>
     </OfficialBuildRID>
-    <OfficialBuildRID Include="webassembly-wasm-aot">
-      <Platform>wasm</Platform>
-    </OfficialBuildRID>
   </ItemGroup>
 </Project>

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
index 0d0db11..c930dc7 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
@@ -9,6 +9,8 @@
     <LibBinDir>$(UAPPackageRuntimePath)</LibBinDir>
     <LibBinDir Condition="$(PackageTargetRuntime.EndsWith('-aot'))">$(UAPAOTPackageRuntimePath)</LibBinDir>
     <IsFrameworkPackage>true</IsFrameworkPackage>
+    <!-- we cannot build native on Unix -->
+    <IncludeNativeFiles Condition="'$(OS)' != 'Windows_NT'">false</IncludeNativeFiles>
     <!-- Private packages need symbols -->
     <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
 

diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props
index 145c507..43c8dd9 100644 (file)
--- a/src/libraries/shims/manual/Directory.Build.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -22,7 +22,9 @@
     <ContractAssemblyPath>$(NetFxRefPath)$(MSBuildProjectName).dll</ContractAssemblyPath>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);netcoreapp</DefineConstants>
     <!-- Use runtime assemblies for the TargetGroup, using build configuration OSGroup -->
-    <RefPath>$(ArtifactsBinDir)runtime/$(TargetGroup)-$(_bc_OSGroup)-$(_bc_ConfigurationGroup)-$(ArchGroup)/</RefPath>
+    <_runtimeOSGroup>$(_bc_OSGroup)</_runtimeOSGroup>
+    <_runtimeOSGroup Condition="'$(TargetsUAP)' == 'true'">Windows_NT</_runtimeOSGroup>
+    <RefPath>$(ArtifactsBinDir)runtime/$(TargetGroup)-$(_runtimeOSGroup)-$(_bc_ConfigurationGroup)-$(ArchGroup)/</RefPath>
   </PropertyGroup>
 
   <ItemGroup>