Add netcoreappaot target group (dotnet/corefx#30980)

Changes to add a new netcoreappaot target group, similar to netcoreapp but it builds against the .NET Native core libraries. A couple of libraries, such as System.Linq.Expressions, have aot-specific definitions that are enabled for netcoreappaot.

Commit migrated from https://github.com/dotnet/corefx/commit/3333166174e54ae9435c31e0a68a6784e9aacc41

diff --git a/src/libraries/CoreFx.Private.TestUtilities/src/Configurations.props b/src/libraries/CoreFx.Private.TestUtilities/src/Configurations.props
index 44eaf2e..98a29de 100644 (file)
--- a/src/libraries/CoreFx.Private.TestUtilities/src/Configurations.props
+++ b/src/libraries/CoreFx.Private.TestUtilities/src/Configurations.props
@@ -8,8 +8,9 @@
       netfx-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
-      netcoreapp2.0-Windows_NT;      
-      netcoreapp2.0-Unix;      
+      netcoreapp2.0-Windows_NT;
+      netcoreapp2.0-Unix;
+      netcoreappaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
index 46547f5..7fd3421 100644 (file)
--- a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
+++ b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
@@ -21,7 +21,7 @@
     <Compile Condition="'$(TargetGroup)' == 'netfx'" Include="System\Diagnostics\RemoteExecutorTestBase.netfx.cs" />
     <Compile Condition="'$(TargetGroup)' != 'uap'" Include="System\Diagnostics\RemoteExecutorTestBase.Process.cs" />
     <Compile Condition="'$(TargetGroup)' == 'uap'" Include="System\Diagnostics\RemoteExecutorTestBase.uap.cs" />
-    <Compile Condition="'$(TargetGroup)' == 'uapaot'" Include="System\Diagnostics\RemoteExecutorTestBase.uapaot.cs" />
+    <Compile Condition="'$(TargetsAOT)'=='true'" Include="System\Diagnostics\RemoteExecutorTestBase.aot.cs" />
     <Compile Condition="'$(TargetGroup)' == 'netfx'" Include="System\PlatformDetection.NetFx.cs" />
     <Compile Condition="'$(TargetGroup)' != 'netfx'" Include="System\PlatformDetection.NonNetFx.cs" />
     <Compile Include="System\PlatformDetection.cs" />
@@ -118,4 +118,4 @@
   <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
     <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uapaot.cs b/src/libraries/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs
similarity index 100%
rename from src/libraries/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.uapaot.cs
rename to src/libraries/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs

diff --git a/src/libraries/System.AppContext/src/Configurations.props b/src/libraries/System.AppContext/src/Configurations.props
index 11b4c45..c80d775 100644 (file)
--- a/src/libraries/System.AppContext/src/Configurations.props
+++ b/src/libraries/System.AppContext/src/Configurations.props
@@ -3,9 +3,10 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
       uapaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Buffers/src/Configurations.props b/src/libraries/System.Buffers/src/Configurations.props
index f8eca1e..e725b0e 100644 (file)
--- a/src/libraries/System.Buffers/src/Configurations.props
+++ b/src/libraries/System.Buffers/src/Configurations.props
@@ -8,6 +8,7 @@
     <BuildConfigurations>
       $(PackageConfigurations);
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
       uapaot-Windows_NT;

diff --git a/src/libraries/System.Collections.Concurrent/src/Configurations.props b/src/libraries/System.Collections.Concurrent/src/Configurations.props
index 62eb1c4..ef3b559 100644 (file)
--- a/src/libraries/System.Collections.Concurrent/src/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/src/Configurations.props
@@ -4,7 +4,8 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Collections/src/Configurations.props b/src/libraries/System.Collections/src/Configurations.props
index 527cede..fe285ae 100644 (file)
--- a/src/libraries/System.Collections/src/Configurations.props
+++ b/src/libraries/System.Collections/src/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.Debug/src/Configurations.props b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
index 1c078f4..3af99f6 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       uap-Windows_NT;
       uapaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
index 527cede..45d3e7f 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
+      netcoreappaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
index f9bd4c4..c3829e9 100644 (file)
--- a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
@@ -35,10 +35,10 @@
     <ProjectReference Include="..\..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" />
     <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'!='true'">
     <Compile Include="System\Diagnostics\StackFrameExtensions.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <Compile Include="System\Diagnostics\SymbolStore\ISymbolDocumentWriter.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
@@ -47,4 +47,4 @@
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
     <Reference Include="mscorlib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.Tools/src/Configurations.props b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Diagnostics.Tools/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Globalization.Calendars/src/Configurations.props b/src/libraries/System.Globalization.Calendars/src/Configurations.props
index bbb5be8..7bb38dd 100644 (file)
--- a/src/libraries/System.Globalization.Calendars/src/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/src/Configurations.props
@@ -4,7 +4,8 @@
     <BuildConfigurations>
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Globalization/src/Configurations.props b/src/libraries/System.Globalization/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Globalization/src/Configurations.props
+++ b/src/libraries/System.Globalization/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Linq.Expressions/src/Configurations.props b/src/libraries/System.Linq.Expressions/src/Configurations.props
index e058fea..d727ec1 100644 (file)
--- a/src/libraries/System.Linq.Expressions/src/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/src/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       uapaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index 0e66067..34ee87b 100644 (file)
--- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -8,16 +8,16 @@
     <ProjectGuid>{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}</ProjectGuid>
     <AssemblyName>System.Linq.Expressions</AssemblyName>
     <RootNamespace>System.Linq.Expressions</RootNamespace>
-    <IsInterpreting Condition="'$(TargetGroup)' == 'uapaot'">true</IsInterpreting>
-    <!-- These defines are disabled on UapAot due to https://github.com/dotnet/corefx/issues/29745 -->
-    <DefineConstants Condition="'$(TargetGroup)' != 'uapaot'"> $(DefineConstants);FEATURE_DLG_INVOKE;FEATURE_FAST_CREATE</DefineConstants>
+    <IsInterpreting Condition="'$(TargetsAOT)'=='true'">true</IsInterpreting>    
+    <!-- These defines are disabled on Aot due to https://github.com/dotnet/corefx/issues/29745 -->
+    <DefineConstants Condition="'$(TargetsAOT)'!='true'"> $(DefineConstants);FEATURE_DLG_INVOKE;FEATURE_FAST_CREATE</DefineConstants>    
     <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants>
     <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <PropertyGroup Condition="'$(TargetsAOT)'=='true'">
     <DefineConstants>$(DefineConstants);FEATURE_DYNAMIC_DELEGATE</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -231,4 +231,4 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Memory/Directory.Build.props b/src/libraries/System.Memory/Directory.Build.props
index dfbd8da..c0c2e75 100644 (file)
--- a/src/libraries/System.Memory/Directory.Build.props
+++ b/src/libraries/System.Memory/Directory.Build.props
@@ -9,4 +9,4 @@
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsUAP>true</IsUAP>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Memory/src/Configurations.props b/src/libraries/System.Memory/src/Configurations.props
index 0171f86..7bb38dd 100644 (file)
--- a/src/libraries/System.Memory/src/Configurations.props
+++ b/src/libraries/System.Memory/src/Configurations.props
@@ -4,6 +4,7 @@
     <BuildConfigurations>
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 8b9abcc..ff3577c 100644 (file)
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -597,7 +597,7 @@
     <Compile Include="System\Net\Http\HttpClientHandler.Core.cs" />
     <Compile Include="uap\System\Net\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'netcoreappaot' OR '$(TargetGroup)' == 'uap'">
     <Reference Include="Microsoft.Win32.Primitives" />
     <Reference Include="System.Buffers" />
     <Reference Include="System.Collections" />

diff --git a/src/libraries/System.Numerics.Vectors/src/Configurations.props b/src/libraries/System.Numerics.Vectors/src/Configurations.props
index 3e3accd..b258e0d 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/src/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/src/Configurations.props
@@ -11,6 +11,7 @@
       uap-Windows_NT;
       netfx-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       $(PackageConfigurations)
     </BuildConfigurations>

diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 9f7e3ea..41f1ac4 100644 (file)
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -5,7 +5,7 @@
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTargetingNetFx Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)'=='net46'">true</IsTargetingNetFx>
-    <IsTargetingNetCoreApp Condition="'$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap' OR '$(TargetGroup)'=='uapaot'">true</IsTargetingNetCoreApp>
+    <IsTargetingNetCoreApp Condition="'$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap' OR '$(TargetGroup)'=='uapaot' OR '$(TargetGroup)'=='netcoreappaot'">true</IsTargetingNetCoreApp>
     <IsPartialFacadeAssembly Condition="'$(IsTargetingNetFx)'=='true' OR '$(IsTargetingNetCoreApp)'=='true'">true</IsPartialFacadeAssembly>
     <HasIntrinsics Condition="'$(TargetsNetCoreApp)'=='true'">true</HasIntrinsics>
     <DefineConstants Condition="'$(HasIntrinsics)'=='true'">$(DefineConstants);HAS_INTRINSICS</DefineConstants>

diff --git a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
index 262829a..0383eaf 100644 (file)
--- a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
+++ b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
+      netcoreappaot;
       uap-Windows_NT;
       uapaot-Windows_NT;
     </BuildConfigurations>

diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
index dc4e21e..4a6f111 100644 (file)
--- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
+++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -9,9 +9,9 @@
     <DebugSymbols>true</DebugSymbols>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DefineConstants>$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
-    <DefineConstants Condition="'$(TargetGroup)' == 'uapaot'">$(DefineConstants);uapaot</DefineConstants>
+    <DefineConstants Condition="'$(TargetsAOT)'=='true'">$(DefineConstants);uapaot</DefineConstants>
     <!-- We do not want to block reflection for this assembly -->
-    <BlockReflectionAttribute Condition="'$(TargetGroup)'=='uapaot'">false</BlockReflectionAttribute>
+    <BlockReflectionAttribute Condition="'$(TargetsAOT)'=='true'">false</BlockReflectionAttribute>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
@@ -48,7 +48,7 @@
     <Compile Include="$(RuntimeSerializationSources)\Globals.cs" />
     <Compile Include="$(RuntimeSerializationSources)\GenericParameterDataContract.cs" />
     <Compile Include="$(RuntimeSerializationSources)\HybridObjectCache.cs" />
-    <Compile Include="$(RuntimeSerializationSources)\InvalidDataContract.cs" Condition="'$(TargetGroup)' == 'uapaot'" />
+    <Compile Include="$(RuntimeSerializationSources)\InvalidDataContract.cs" Condition="'$(TargetsAOT)'=='true'" />
     <Compile Include="$(RuntimeSerializationSources)\ObjectToIdCache.cs" />
     <Compile Include="$(RuntimeSerializationSources)\ObjectReferenceStack.cs" />
     <Compile Include="$(RuntimeSerializationSources)\PrimitiveDataContract.cs" />
@@ -72,7 +72,7 @@
     <Compile Include="$(RuntimeSerializationSources)\KnownTypeDataContractResolver.cs" />
     <Compile Include="$(RuntimeSerializationSources)\XmlObjectSerializerReadContextComplex.cs" />
     <Compile Include="$(RuntimeSerializationSources)\XmlObjectSerializerWriteContextComplex.cs" />
-    <Compile Include="$(RuntimeSerializationSources)\BitFlagsGenerator.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="$(RuntimeSerializationSources)\BitFlagsGenerator.cs" Condition="'$(TargetsAOT)'!='true'" />
     <Compile Include="$(RuntimeSerializationSources)\DataContractSurrogateCaller.cs" />
     <Compile Include="$(RuntimeSerializationSources)\DataContractSerializerExtensions.cs" />
     <Compile Include="$(RuntimeSerializationSources)\XmlSerializableServices.cs" />
@@ -137,7 +137,7 @@
     <Compile Include="$(JsonSources)\IXmlJsonWriterInitializer.cs" />
     <Compile Include="$(JsonSources)\ByteArrayHelperWithString.cs" />
     <Compile Include="$(JsonSources)\JsonEncodingStreamWrapper.cs" />
-    <Compile Include="$(JsonSources)\JsonFormatGeneratorStatics.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="$(JsonSources)\JsonFormatGeneratorStatics.cs" Condition="'$(TargetsAOT)'!='true'" />
     <Compile Include="System\Runtime\Serialization\AccessorBuilder.cs" />
     <Compile Include="$(CommonPath)\System\CodeDom\CodeTypeReference.cs" />
     <Compile Include="$(CommonPath)\System\CodeDom\CodeTypeReferenceCollection.cs" />
@@ -161,7 +161,7 @@
     <Compile Include="System\Xml\XmlCanonicalWriter.cs" />
     <Compile Include="System\Xml\XmlSigningNodeWriter.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -188,4 +188,4 @@
     <Reference Include="System.Xml.XDocument" />
     <Reference Include="System.Xml.XmlSerializer" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Private.Reflection.Metadata.Ecma335/src/Configurations.props b/src/libraries/System.Private.Reflection.Metadata.Ecma335/src/Configurations.props
index 58fcc75..68fd829 100644 (file)
--- a/src/libraries/System.Private.Reflection.Metadata.Ecma335/src/Configurations.props
+++ b/src/libraries/System.Private.Reflection.Metadata.Ecma335/src/Configurations.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       uapaot-Windows_NT;
+      netcoreappaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Private.Uri/src/Configurations.props b/src/libraries/System.Private.Uri/src/Configurations.props
index b36e05b..9365fc8 100644 (file)
--- a/src/libraries/System.Private.Uri/src/Configurations.props
+++ b/src/libraries/System.Private.Uri/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
index 030cc79..9443a83 100644 (file)
--- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
@@ -39,10 +39,10 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="System\Uri.Unix.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Private.Xml/src/Configurations.props b/src/libraries/System.Private.Xml/src/Configurations.props
index 11b4c45..c80d775 100644 (file)
--- a/src/libraries/System.Private.Xml/src/Configurations.props
+++ b/src/libraries/System.Private.Xml/src/Configurations.props
@@ -3,9 +3,10 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
       uapaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
index b490411..7eeb6e1 100644 (file)
--- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
+++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
@@ -5,9 +5,9 @@
     <RootNamespace>System.Xml</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn),649,169,414</NoWarn>
-    <FeatureCompiledXsl Condition="'$(TargetGroup)' != 'uap' AND '$(TargetGroup)' != 'uapaot'">true</FeatureCompiledXsl>
+    <FeatureCompiledXsl Condition="'$(TargetGroup)' != 'uap' AND '$(TargetGroup)' != 'uapaot' AND '$(TargetGroup)' != 'netcoreappaot'">true</FeatureCompiledXsl>
     <DefineConstants Condition="'$(FeatureCompiledXsl)' == 'true'">$(DefineConstants);FEATURE_COMPILED_XSL</DefineConstants>
-    <DefineConstants Condition="'$(TargetGroup)' == 'uapaot'">$(DefineConstants);FEATURE_SERIALIZATION_UAPAOT;UAPAOT</DefineConstants>
+    <DefineConstants Condition="'$(TargetsAOT)' == 'true'">$(DefineConstants);FEATURE_SERIALIZATION_UAPAOT;UAPAOT</DefineConstants>
     <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Reflection.Extensions/src/Configurations.props b/src/libraries/System.Reflection.Extensions/src/Configurations.props
index dcb70af..5c3fd68 100644 (file)
--- a/src/libraries/System.Reflection.Extensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/src/Configurations.props
@@ -5,6 +5,7 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp;
+      netcoreappaot;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Reflection.Primitives/src/Configurations.props b/src/libraries/System.Reflection.Primitives/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Reflection.Primitives/src/Configurations.props
+++ b/src/libraries/System.Reflection.Primitives/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
index 2339882..64219a8 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
@@ -11,6 +11,7 @@
       $(PackageConfigurations);
       netfx;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
       uapaot-Windows_NT;

diff --git a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
index 7a6ff1c..30af27d 100644 (file)
--- a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" Condition="'$(TargetsNetFx)' == 'true'" />
-    <ReferenceFromRuntime Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'uapaot'" />
+    <ReferenceFromRuntime Include="System.Private.CoreLib" Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'uapaot' OR '$(TargetGroup)' == 'netcoreappaot'" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netstandard1.5'">
     <Reference Include="System.Reflection" />

diff --git a/src/libraries/System.Reflection/src/Configurations.props b/src/libraries/System.Reflection/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Reflection/src/Configurations.props
+++ b/src/libraries/System.Reflection/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Resources.ResourceManager/src/Configurations.props b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Resources.ResourceManager/src/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.Extensions/src/Configurations.props b/src/libraries/System.Runtime.Extensions/src/Configurations.props
index e058fea..d727ec1 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/src/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       uapaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index 5ba1cce..16ef444 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -254,10 +254,10 @@
     <Reference Include="mscorlib" />
     <Reference Include="Windows" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <ReferenceFromRuntime Include="System.Private.Interop" />
   </ItemGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.InteropServices/src/ApiCompatBaseline.netcoreappaot.txt b/src/libraries/System.Runtime.InteropServices/src/ApiCompatBaseline.netcoreappaot.txt
new file mode 100644 (file)
index 0000000..e309cf6
--- /dev/null
+++ b/src/libraries/System.Runtime.InteropServices/src/ApiCompatBaseline.netcoreappaot.txt
@@ -0,0 +1,16 @@
+Compat issues with assembly System.Runtime.InteropServices:
+CannotRemoveBaseTypeOrInterface : Type 'System.IO.UnmanagedMemoryStream' does not inherit from base type 'System.MarshalByRefObject' in the implementation but it does in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GenerateGuidForType(System.Type)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GenerateProgIdForType(System.Type)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GetComObjectData(System.Object, System.Object)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GetHINSTANCE(System.Reflection.Module)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GetIDispatchForObject(System.Object)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GetTypedObjectForIUnknown(System.IntPtr, System.Type)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr, System.Int32)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.SetComObjectData(System.Object, System.Object, System.Object)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.StringToCoTaskMemUTF8(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.UnmanagedType System.Runtime.InteropServices.UnmanagedType.LPUTF8Str' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.GetExceptionPointers()' does not exist in the implementation but it does exist in the contract.
+Total Issues: 13

diff --git a/src/libraries/System.Runtime.InteropServices/src/Configurations.props b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
index 527cede..b08cab5 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
@@ -4,6 +4,7 @@
     <BuildConfigurations>
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
     </BuildConfigurations>

diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index 264ca32..ff73f73 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -4,8 +4,8 @@
     <AssemblyName>System.Runtime.InteropServices</AssemblyName>
     <OutputType>Library</OutputType>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <GenFacadesIgnoreMissingTypes Condition="'$(TargetGroup)' == 'uapaot'">true</GenFacadesIgnoreMissingTypes>
-    <NoWarn Condition="'$(TargetGroup)' == 'uapaot'">0436;3001</NoWarn>
+    <GenFacadesIgnoreMissingTypes Condition="'$(TargetsAOT)' == 'true'">true</GenFacadesIgnoreMissingTypes>
+    <NoWarn Condition="'$(TargetsAOT)' == 'true'">0436;3001</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
@@ -22,22 +22,22 @@
     <Compile Include="System\Runtime\CompilerServices\Attributes.cs" />
     <Compile Include="System\Runtime\InteropServices\Attributes.cs" />
     <Compile Include="System\Runtime\InteropServices\ComAwareEventInfo.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComEventInterfaceAttribute.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttribute.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\HandleCollector.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="System\Runtime\InteropServices\ComEventInterfaceAttribute.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttribute.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\HandleCollector.cs" Condition="'$(TargetsAOT)' != 'true'" />
     <Compile Include="System\Runtime\InteropServices\IMarshal.cs" />
     <Compile Include="System\Runtime\InteropServices\RuntimeEnvironment.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\advf.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\datadir.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\dvaspect.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\formatetc.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\IAdviseSink.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\advf.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\datadir.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\dvaspect.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\formatetc.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\IAdviseSink.cs" Condition="'$(TargetsAOT)' != 'true'" />
     <Compile Include="System\Runtime\InteropServices\ComTypes\IDataObject.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\IEnumFormatETC.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\IEnumFormatETC.cs" Condition="'$(TargetsAOT)' != 'true'" />
     <Compile Include="System\Runtime\InteropServices\ComTypes\IEnumSTATDATA.cs" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\statdata.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\stgmedium.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
-    <Compile Include="System\Runtime\InteropServices\ComTypes\tymed.cs" Condition="'$(TargetGroup)' != 'uapaot'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\statdata.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\stgmedium.cs" Condition="'$(TargetsAOT)' != 'true'" />
+    <Compile Include="System\Runtime\InteropServices\ComTypes\tymed.cs" Condition="'$(TargetsAOT)' != 'true'" />
     <Compile Include="System\Runtime\InteropServices\AssemblyRegistrationFlags.cs" />
     <Compile Include="System\Runtime\InteropServices\ExporterEventKind.cs" />
     <Compile Include="System\Runtime\InteropServices\RegistrationClassContext.cs" />
@@ -49,10 +49,10 @@
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)' == 'true'">
     <ReferenceFromRuntime Include="System.Private.Interop" />
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj">
-      <TargetGroup>uapaot</TargetGroup>
+      <TargetGroup>$(TargetGroup)</TargetGroup>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.Loader/src/ApiCompatBaseline.netcoreappaot.txt b/src/libraries/System.Runtime.Loader/src/ApiCompatBaseline.netcoreappaot.txt
new file mode 100644 (file)
index 0000000..5da8e21
--- /dev/null
+++ b/src/libraries/System.Runtime.Loader/src/ApiCompatBaseline.netcoreappaot.txt
@@ -0,0 +1,20 @@
+Compat issues with assembly System.Runtime.Loader:
+TypesMustExist : Type 'System.Reflection.Metadata.AssemblyExtensions' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Default.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.GetAssemblyName(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.GetLoadContext(System.Reflection.Assembly)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Load(System.Reflection.AssemblyName)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromAssemblyName(System.Reflection.AssemblyName)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromAssemblyPath(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromNativeImagePath(System.String, System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromStream(System.IO.Stream)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromStream(System.IO.Stream, System.IO.Stream)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDll(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDllFromPath(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.SetProfileOptimizationRoot(System.String)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.StartProfileOptimization(System.String)' does not exist in the implementation but it does exist in the contract.
+Total Issues: 18

diff --git a/src/libraries/System.Runtime.Loader/src/Configurations.props b/src/libraries/System.Runtime.Loader/src/Configurations.props
index 4e9b1a0..c80d775 100644 (file)
--- a/src/libraries/System.Runtime.Loader/src/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/src/Configurations.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
       uapaot-Windows_NT;

diff --git a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
index 7fea775..e8e28b8 100644 (file)
--- a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
+++ b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj
@@ -2,11 +2,11 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Loader</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <GenFacadesIgnoreMissingTypes Condition="'$(TargetGroup)'=='uapaot'">true</GenFacadesIgnoreMissingTypes>
+    <GenFacadesIgnoreMissingTypes Condition="'$(TargetsAOT)'=='true'">true</GenFacadesIgnoreMissingTypes>
     <ProjectGuid>{485A65F0-51C9-4B95-A7A8-A4860C231E67}</ProjectGuid>
     <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime/ref/Configurations.props b/src/libraries/System.Runtime/ref/Configurations.props
index c701755..83fbdb9 100644 (file)
--- a/src/libraries/System.Runtime/ref/Configurations.props
+++ b/src/libraries/System.Runtime/ref/Configurations.props
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
+      netcoreappaot;
       uap;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.csproj b/src/libraries/System.Runtime/ref/System.Runtime.csproj
index dba7b92..e4f6090 100644 (file)
--- a/src/libraries/System.Runtime/ref/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/ref/System.Runtime.csproj
@@ -13,4 +13,4 @@
     <Compile Include="System.Runtime.cs" />
     <Compile Include="System.Runtime.Manual.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt b/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt
new file mode 100644 (file)
index 0000000..0e8e28d
--- /dev/null
+++ b/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt
@@ -0,0 +1,2 @@
+Compat issues with assembly System.Runtime:
+MembersMustExist : Member 'System.String System.Runtime.CompilerServices.RuntimeFeature.DefaultImplementationsOfInterfaces' does not exist in the implementation but it does exist in the contract.

diff --git a/src/libraries/System.Runtime/src/Configurations.props b/src/libraries/System.Runtime/src/Configurations.props
index 527cede..fe285ae 100644 (file)
--- a/src/libraries/System.Runtime/src/Configurations.props
+++ b/src/libraries/System.Runtime/src/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj
index c975cb7..be31802 100644 (file)
--- a/src/libraries/System.Runtime/src/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/src/System.Runtime.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>System.Runtime</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <ILLinkClearInitLocals>true</ILLinkClearInitLocals>
-    <GenFacadesIgnoreMissingTypes Condition="'$(TargetGroup)'=='uapaot' OR '$(TargetGroup)' == 'uap'">true</GenFacadesIgnoreMissingTypes>
+    <GenFacadesIgnoreMissingTypes Condition="'$(TargetsAOT)'=='true' OR '$(TargetGroup)' == 'uap'">true</GenFacadesIgnoreMissingTypes>
     <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
@@ -25,4 +25,4 @@
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
index bbb5be8..7bb38dd 100644 (file)
--- a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
@@ -4,7 +4,8 @@
     <BuildConfigurations>
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.Encoding/src/Configurations.props b/src/libraries/System.Text.Encoding/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Text.Encoding/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.RegularExpressions/ref/Configurations.props b/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
index c701755..83fbdb9 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/ref/Configurations.props
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
+      netcoreappaot;
       uap;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.RegularExpressions/src/Configurations.props b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
index a8910ef..b1a5694 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/src/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
@@ -4,6 +4,7 @@
     <BuildConfigurations>
       uap-Windows_NT;
       netcoreapp;
+      netcoreappaot;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index cfdf5a1..b1e6ae0 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -3,6 +3,7 @@
     <ProjectGuid>{2C58640B-5BED-4E83-9554-CD2B9762643F}</ProjectGuid>
     <AssemblyName>System.Text.RegularExpressions</AssemblyName>
     <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_COMPILED</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'netcoreappaot'">$(DefineConstants);FEATURE_COMPILEAPIS</DefineConstants>
     <ILLinkClearInitLocals>true</ILLinkClearInitLocals>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release</Configurations>
@@ -73,9 +74,9 @@
     <Reference Include="System.Threading" />
   </ItemGroup>
   <!-- References required for compiled feature -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'netcoreappaot'">
     <Reference Include="System.Reflection.Emit.ILGeneration" />
     <Reference Include="System.Reflection.Emit.Lightweight" />
     <Reference Include="System.Reflection.Primitives" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs
index 4e392d8..73591d0 100644 (file)
--- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs
+++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs
@@ -212,7 +212,9 @@ namespace System.Text.RegularExpressions
         {
             return RegexCompiler.Compile(code, roptions);
         }
+#endif
 
+#if FEATURE_COMPILEAPIS
         public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname)
         {
             throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly);
@@ -227,7 +229,7 @@ namespace System.Text.RegularExpressions
         {
             throw new PlatformNotSupportedException(SR.PlatformNotSupported_CompileToAssembly);
         }
-#endif
+#endif // FEATURE_COMPILEAPIS
 
         /// <summary>
         /// Escapes a minimal set of metacharacters (\, *, +, ?, |, {, [, (, ), ^, $, ., #, and

diff --git a/src/libraries/System.Threading.Overlapped/src/Configurations.props b/src/libraries/System.Threading.Overlapped/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/src/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
index 9b7a91f..f7489af 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
@@ -5,9 +5,9 @@
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <!-- System.Threading.Tasks.Extensions has forwarded types into the runtime on netcoreapp/uap
          It must win over assemblies versioned at 4.2.* -->
-    <AssemblyVersion Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' ">4.3.0.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'netcoreappaot'">4.3.0.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsUAP>true</IsUAP>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
index e4522e4..f072130 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
@@ -8,6 +8,7 @@
     <BuildConfigurations>
       $(PackageConfigurations);
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
     </BuildConfigurations>

diff --git a/src/libraries/System.Threading.Tasks/src/Configurations.props b/src/libraries/System.Threading.Tasks/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Threading.Tasks/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading.Thread/src/Configurations.props b/src/libraries/System.Threading.Thread/src/Configurations.props
index 4c3df1a..bfd9f4b 100644 (file)
--- a/src/libraries/System.Threading.Thread/src/Configurations.props
+++ b/src/libraries/System.Threading.Thread/src/Configurations.props
@@ -5,7 +5,8 @@
       uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading.ThreadPool/src/Configurations.props b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Threading.ThreadPool/src/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading.Timer/src/Configurations.props b/src/libraries/System.Threading.Timer/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Threading.Timer/src/Configurations.props
+++ b/src/libraries/System.Threading.Timer/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Threading/src/Configurations.props b/src/libraries/System.Threading/src/Configurations.props
index aed58fb..38e2613 100644 (file)
--- a/src/libraries/System.Threading/src/Configurations.props
+++ b/src/libraries/System.Threading/src/Configurations.props
@@ -5,7 +5,8 @@
       uap-Windows_NT;
       uapaot-Windows_NT;
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/config.json b/src/libraries/config.json
index 232effe..3f2f57f 100644 (file)
--- a/src/libraries/config.json
+++ b/src/libraries/config.json
@@ -3,7 +3,7 @@
     "TargetGroup": {
       "description": "Sets the target framework for the BuildConfiguration you want to build.",
       "valueType": "property",
-      "values": ["netcoreapp", "netstandard", "netfx", "uap", "mono"],
+      "values": ["netcoreapp", "netcoreappaot", "netstandard", "netfx", "uap", "mono"],
       "defaultValue": "netcoreapp"
     },
     "OSGroup": {

diff --git a/src/libraries/external/runtime/Configurations.props b/src/libraries/external/runtime/Configurations.props
index a69f408..d44d223 100644 (file)
--- a/src/libraries/external/runtime/Configurations.props
+++ b/src/libraries/external/runtime/Configurations.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp-Windows_NT;
+      netcoreappaot-Windows_NT;
       netcoreapp-Unix;
       uap10.0.16299;
       uap10.0.16299aot;
@@ -11,4 +12,4 @@
       mono;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index 2e6b17e..f7b0733 100644 (file)
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -6,7 +6,7 @@
     <RidSpecificAssets>true</RidSpecificAssets>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'  Or '$(TargetGroup)' == 'uap10.0.16299aot'">
+  <PropertyGroup Condition="'$(TargetsAOT)'=='true'">
     <!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker -->
     <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort>
@@ -14,9 +14,9 @@
     <BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'  Or '$(TargetGroup)' == 'uap10.0.16299aot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <PackageReference Include="Microsoft.TargetingPack.Private.NETNative">
-      <Version Condition="'$(TargetGroup)'=='uapaot'">1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
+      <Version Condition="'$(TargetGroup)'=='uapaot' OR '$(TargetGroup)'=='netcoreappaot'">1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
       <!-- Following is version used in release/uwp6.0 -->
       <Version Condition="'$(TargetGroup)'=='uap10.0.16299aot'">1.1.0-rel-25728-00</Version>
     </PackageReference>
@@ -25,7 +25,7 @@
     <FileToExclude Include="System.Private.CoreLib.WinRTInterop" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetGroup)'!='uapaot'  And '$(TargetGroup)' != 'uap10.0.16299aot'">
+  <ItemGroup Condition="'$(TargetsAOT)'!='true'">
     <PackageReference Include="Microsoft.NETCore.Platforms">
       <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version>
     </PackageReference>

diff --git a/src/libraries/external/test-runtime/Configurations.props b/src/libraries/external/test-runtime/Configurations.props
index c24a6d1..10a9c0e 100644 (file)
--- a/src/libraries/external/test-runtime/Configurations.props
+++ b/src/libraries/external/test-runtime/Configurations.props
@@ -4,8 +4,9 @@
     <BuildConfigurations>
       uap;
       uapaot;
+      netcoreappaot;
       netstandard;
       netfx;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
index 2b3566c..03d79cd 100644 (file)
--- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj
+++ b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
@@ -139,7 +139,7 @@
   </ItemGroup>
 
   <!-- System.Data.SqlClient tests require sni.dll in the test folder -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <ItemGroup Condition="'$(TargetsAOT)'=='true'">
     <PackageReference Include="runtime.native.System.Data.SqlClient.sni">
       <Version>$(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion)</Version>
     </PackageReference>
@@ -198,7 +198,7 @@
 
   <Target Name="CopyTestILCToolsToTestHost"
           AfterTargets="RestorePackages"
-          Condition="'$(TargetGroup)' == 'uapaot'">
+          Condition="'$(TargetsAOT)'=='true'">
     <PropertyGroup>
       <TestILCToolsPackageName>TestILC</TestILCToolsPackageName>
       <TestILCToolsPackageName Condition="'$(ArchGroup)' == 'x64'">$(TestILCToolsPackageName).amd64ret</TestILCToolsPackageName>

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 76ef027..d22b809 100644 (file)
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -7,19 +7,6 @@
     "any",
     "base"
   ],
-  "alpine-corert": [
-    "alpine-corert",
-    "alpine",
-    "linux-musl-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "alpine-x64": [
     "alpine-x64",
     "alpine",
@@ -32,27 +19,6 @@
     "any",
     "base"
   ],
-  "alpine-x64-corert": [
-    "alpine-x64-corert",
-    "alpine-corert",
-    "alpine-x64",
-    "linux-musl-x64-corert",
-    "alpine",
-    "linux-musl-corert",
-    "linux-musl-x64",
-    "linux-x64-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
@@ -62,21 +28,6 @@
     "any",
     "base"
   ],
-  "alpine.3.6-corert": [
-    "alpine.3.6-corert",
-    "alpine.3.6",
-    "alpine-corert",
-    "alpine",
-    "linux-musl-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "alpine.3.6-x64": [
     "alpine.3.6-x64",
     "alpine.3.6",
@@ -91,31 +42,6 @@
     "any",
     "base"
   ],
-  "alpine.3.6-x64-corert": [
-    "alpine.3.6-x64-corert",
-    "alpine.3.6-corert",
-    "alpine.3.6-x64",
-    "alpine.3.6",
-    "alpine-x64-corert",
-    "alpine-corert",
-    "alpine-x64",
-    "alpine",
-    "linux-musl-x64-corert",
-    "linux-musl-corert",
-    "linux-musl-x64",
-    "linux-musl",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "alpine.3.7": [
     "alpine.3.7",
     "alpine.3.6",
@@ -126,23 +52,6 @@
     "any",
     "base"
   ],
-  "alpine.3.7-corert": [
-    "alpine.3.7-corert",
-    "alpine.3.7",
-    "alpine.3.6-corert",
-    "alpine.3.6",
-    "alpine-corert",
-    "alpine",
-    "linux-musl-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "alpine.3.7-x64": [
     "alpine.3.7-x64",
     "alpine.3.7",
@@ -159,35 +68,6 @@
     "any",
     "base"
   ],
-  "alpine.3.7-x64-corert": [
-    "alpine.3.7-x64-corert",
-    "alpine.3.7-corert",
-    "alpine.3.7-x64",
-    "alpine.3.7",
-    "alpine.3.6-x64-corert",
-    "alpine.3.6-corert",
-    "alpine.3.6-x64",
-    "alpine.3.6",
-    "alpine-x64-corert",
-    "alpine-corert",
-    "alpine-x64",
-    "alpine",
-    "linux-musl-x64-corert",
-    "linux-musl-corert",
-    "linux-musl-x64",
-    "linux-musl",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "android": [
     "android",
     "linux",
@@ -205,23 +85,6 @@
     "any",
     "base"
   ],
-  "android-arm-corert": [
-    "android-arm-corert",
-    "android-corert",
-    "android-arm",
-    "linux-arm-corert",
-    "android",
-    "linux-corert",
-    "linux-arm",
-    "unix-arm-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "android-arm64": [
     "android-arm64",
     "android",
@@ -232,34 +95,6 @@
     "any",
     "base"
   ],
-  "android-arm64-corert": [
-    "android-arm64-corert",
-    "android-corert",
-    "android-arm64",
-    "linux-arm64-corert",
-    "android",
-    "linux-corert",
-    "linux-arm64",
-    "unix-arm64-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "android-corert": [
-    "android-corert",
-    "android",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "android.21": [
     "android.21",
     "android",
@@ -280,27 +115,6 @@
     "any",
     "base"
   ],
-  "android.21-arm-corert": [
-    "android.21-arm-corert",
-    "android.21-corert",
-    "android.21-arm",
-    "android.21",
-    "android-arm-corert",
-    "android-corert",
-    "android-arm",
-    "android",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "android.21-arm64": [
     "android.21-arm64",
     "android.21",
@@ -313,40 +127,6 @@
     "any",
     "base"
   ],
-  "android.21-arm64-corert": [
-    "android.21-arm64-corert",
-    "android.21-corert",
-    "android.21-arm64",
-    "android.21",
-    "android-arm64-corert",
-    "android-corert",
-    "android-arm64",
-    "android",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "android.21-corert": [
-    "android.21-corert",
-    "android.21",
-    "android-corert",
-    "android",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "any": [
     "any",
     "base"
@@ -367,19 +147,6 @@
     "any",
     "base"
   ],
-  "centos-corert": [
-    "centos-corert",
-    "centos",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "centos-x64": [
     "centos-x64",
     "centos",
@@ -392,27 +159,6 @@
     "any",
     "base"
   ],
-  "centos-x64-corert": [
-    "centos-x64-corert",
-    "centos-corert",
-    "centos-x64",
-    "rhel-x64-corert",
-    "centos",
-    "rhel-corert",
-    "rhel-x64",
-    "linux-x64-corert",
-    "rhel",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "centos.7": [
     "centos.7",
     "centos",
@@ -423,23 +169,6 @@
     "any",
     "base"
   ],
-  "centos.7-corert": [
-    "centos.7-corert",
-    "centos.7",
-    "centos-corert",
-    "rhel.7-corert",
-    "centos",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "centos.7-x64": [
     "centos.7-x64",
     "centos.7",
@@ -456,39 +185,6 @@
     "any",
     "base"
   ],
-  "centos.7-x64-corert": [
-    "centos.7-x64-corert",
-    "centos.7-corert",
-    "centos.7-x64",
-    "centos.7",
-    "centos-x64-corert",
-    "centos-corert",
-    "rhel.7-corert",
-    "centos-x64",
-    "rhel.7-x64",
-    "centos",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "corert": [
-    "corert",
-    "any",
-    "base"
-  ],
   "debian": [
     "debian",
     "linux",
@@ -506,23 +202,6 @@
     "any",
     "base"
   ],
-  "debian-arm-corert": [
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "linux-arm-corert",
-    "debian",
-    "linux-corert",
-    "linux-arm",
-    "unix-arm-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian-arm64": [
     "debian-arm64",
     "debian",
@@ -533,23 +212,6 @@
     "any",
     "base"
   ],
-  "debian-arm64-corert": [
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "linux-arm64-corert",
-    "debian",
-    "linux-corert",
-    "linux-arm64",
-    "unix-arm64-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian-armel": [
     "debian-armel",
     "debian",
@@ -560,34 +222,6 @@
     "any",
     "base"
   ],
-  "debian-armel-corert": [
-    "debian-armel-corert",
-    "debian-corert",
-    "debian-armel",
-    "linux-armel-corert",
-    "debian",
-    "linux-corert",
-    "linux-armel",
-    "unix-armel-corert",
-    "linux",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "debian-corert": [
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian-x64": [
     "debian-x64",
     "debian",
@@ -598,23 +232,6 @@
     "any",
     "base"
   ],
-  "debian-x64-corert": [
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "linux-x64-corert",
-    "debian",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian-x86": [
     "debian-x86",
     "debian",
@@ -625,23 +242,6 @@
     "any",
     "base"
   ],
-  "debian-x86-corert": [
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "linux-x86-corert",
-    "debian",
-    "linux-corert",
-    "linux-x86",
-    "unix-x86-corert",
-    "linux",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.8": [
     "debian.8",
     "debian",
@@ -662,27 +262,6 @@
     "any",
     "base"
   ],
-  "debian.8-arm-corert": [
-    "debian.8-arm-corert",
-    "debian.8-corert",
-    "debian.8-arm",
-    "debian.8",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.8-arm64": [
     "debian.8-arm64",
     "debian.8",
@@ -695,27 +274,6 @@
     "any",
     "base"
   ],
-  "debian.8-arm64-corert": [
-    "debian.8-arm64-corert",
-    "debian.8-corert",
-    "debian.8-arm64",
-    "debian.8",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.8-armel": [
     "debian.8-armel",
     "debian.8",
@@ -728,108 +286,32 @@
     "any",
     "base"
   ],
-  "debian.8-armel-corert": [
-    "debian.8-armel-corert",
-    "debian.8-corert",
-    "debian.8-armel",
+  "debian.8-x64": [
+    "debian.8-x64",
     "debian.8",
-    "debian-armel-corert",
-    "debian-corert",
-    "debian-armel",
+    "debian-x64",
     "debian",
-    "linux-armel-corert",
-    "linux-corert",
-    "linux-armel",
+    "linux-x64",
     "linux",
-    "unix-armel-corert",
-    "unix-corert",
-    "unix-armel",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "debian.8-corert": [
-    "debian.8-corert",
+  "debian.8-x86": [
+    "debian.8-x86",
     "debian.8",
-    "debian-corert",
+    "debian-x86",
     "debian",
-    "linux-corert",
+    "linux-x86",
     "linux",
-    "unix-corert",
+    "unix-x86",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "debian.8-x64": [
-    "debian.8-x64",
-    "debian.8",
-    "debian-x64",
-    "debian",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "debian.8-x64-corert": [
-    "debian.8-x64-corert",
-    "debian.8-corert",
-    "debian.8-x64",
-    "debian.8",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "debian.8-x86": [
-    "debian.8-x86",
-    "debian.8",
-    "debian-x86",
-    "debian",
-    "linux-x86",
-    "linux",
-    "unix-x86",
-    "unix",
-    "any",
-    "base"
-  ],
-  "debian.8-x86-corert": [
-    "debian.8-x86-corert",
-    "debian.8-corert",
-    "debian.8-x86",
-    "debian.8",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "debian.9": [
-    "debian.9",
+  "debian.9": [
+    "debian.9",
     "debian",
     "linux",
     "unix",
@@ -848,27 +330,6 @@
     "any",
     "base"
   ],
-  "debian.9-arm-corert": [
-    "debian.9-arm-corert",
-    "debian.9-corert",
-    "debian.9-arm",
-    "debian.9",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.9-arm64": [
     "debian.9-arm64",
     "debian.9",
@@ -881,27 +342,6 @@
     "any",
     "base"
   ],
-  "debian.9-arm64-corert": [
-    "debian.9-arm64-corert",
-    "debian.9-corert",
-    "debian.9-arm64",
-    "debian.9",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.9-armel": [
     "debian.9-armel",
     "debian.9",
@@ -914,40 +354,6 @@
     "any",
     "base"
   ],
-  "debian.9-armel-corert": [
-    "debian.9-armel-corert",
-    "debian.9-corert",
-    "debian.9-armel",
-    "debian.9",
-    "debian-armel-corert",
-    "debian-corert",
-    "debian-armel",
-    "debian",
-    "linux-armel-corert",
-    "linux-corert",
-    "linux-armel",
-    "linux",
-    "unix-armel-corert",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "debian.9-corert": [
-    "debian.9-corert",
-    "debian.9",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.9-x64": [
     "debian.9-x64",
     "debian.9",
@@ -960,27 +366,6 @@
     "any",
     "base"
   ],
-  "debian.9-x64-corert": [
-    "debian.9-x64-corert",
-    "debian.9-corert",
-    "debian.9-x64",
-    "debian.9",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "debian.9-x86": [
     "debian.9-x86",
     "debian.9",
@@ -993,27 +378,6 @@
     "any",
     "base"
   ],
-  "debian.9-x86-corert": [
-    "debian.9-x86-corert",
-    "debian.9-corert",
-    "debian.9-x86",
-    "debian.9",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora": [
     "fedora",
     "linux",
@@ -1021,17 +385,6 @@
     "any",
     "base"
   ],
-  "fedora-corert": [
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora-x64": [
     "fedora-x64",
     "fedora",
@@ -1042,23 +395,6 @@
     "any",
     "base"
   ],
-  "fedora-x64-corert": [
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "linux-x64-corert",
-    "fedora",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.23": [
     "fedora.23",
     "fedora",
@@ -1067,19 +403,6 @@
     "any",
     "base"
   ],
-  "fedora.23-corert": [
-    "fedora.23-corert",
-    "fedora.23",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.23-x64": [
     "fedora.23-x64",
     "fedora.23",
@@ -1092,27 +415,6 @@
     "any",
     "base"
   ],
-  "fedora.23-x64-corert": [
-    "fedora.23-x64-corert",
-    "fedora.23-corert",
-    "fedora.23-x64",
-    "fedora.23",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.24": [
     "fedora.24",
     "fedora",
@@ -1121,19 +423,6 @@
     "any",
     "base"
   ],
-  "fedora.24-corert": [
-    "fedora.24-corert",
-    "fedora.24",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.24-x64": [
     "fedora.24-x64",
     "fedora.24",
@@ -1146,27 +435,6 @@
     "any",
     "base"
   ],
-  "fedora.24-x64-corert": [
-    "fedora.24-x64-corert",
-    "fedora.24-corert",
-    "fedora.24-x64",
-    "fedora.24",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.25": [
     "fedora.25",
     "fedora",
@@ -1175,19 +443,6 @@
     "any",
     "base"
   ],
-  "fedora.25-corert": [
-    "fedora.25-corert",
-    "fedora.25",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.25-x64": [
     "fedora.25-x64",
     "fedora.25",
@@ -1200,27 +455,6 @@
     "any",
     "base"
   ],
-  "fedora.25-x64-corert": [
-    "fedora.25-x64-corert",
-    "fedora.25-corert",
-    "fedora.25-x64",
-    "fedora.25",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.26": [
     "fedora.26",
     "fedora",
@@ -1229,19 +463,6 @@
     "any",
     "base"
   ],
-  "fedora.26-corert": [
-    "fedora.26-corert",
-    "fedora.26",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.26-x64": [
     "fedora.26-x64",
     "fedora.26",
@@ -1254,27 +475,6 @@
     "any",
     "base"
   ],
-  "fedora.26-x64-corert": [
-    "fedora.26-x64-corert",
-    "fedora.26-corert",
-    "fedora.26-x64",
-    "fedora.26",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.27": [
     "fedora.27",
     "fedora",
@@ -1283,19 +483,6 @@
     "any",
     "base"
   ],
-  "fedora.27-corert": [
-    "fedora.27-corert",
-    "fedora.27",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.27-x64": [
     "fedora.27-x64",
     "fedora.27",
@@ -1308,27 +495,6 @@
     "any",
     "base"
   ],
-  "fedora.27-x64-corert": [
-    "fedora.27-x64-corert",
-    "fedora.27-corert",
-    "fedora.27-x64",
-    "fedora.27",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.28": [
     "fedora.28",
     "fedora",
@@ -1337,19 +503,6 @@
     "any",
     "base"
   ],
-  "fedora.28-corert": [
-    "fedora.28-corert",
-    "fedora.28",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.28-x64": [
     "fedora.28-x64",
     "fedora.28",
@@ -1362,27 +515,6 @@
     "any",
     "base"
   ],
-  "fedora.28-x64-corert": [
-    "fedora.28-x64-corert",
-    "fedora.28-corert",
-    "fedora.28-x64",
-    "fedora.28",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.29": [
     "fedora.29",
     "fedora",
@@ -1391,19 +523,6 @@
     "any",
     "base"
   ],
-  "fedora.29-corert": [
-    "fedora.29-corert",
-    "fedora.29",
-    "fedora-corert",
-    "fedora",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "fedora.29-x64": [
     "fedora.29-x64",
     "fedora.29",
@@ -1416,105 +535,34 @@
     "any",
     "base"
   ],
-  "fedora.29-x64-corert": [
-    "fedora.29-x64-corert",
-    "fedora.29-corert",
-    "fedora.29-x64",
-    "fedora.29",
-    "fedora-x64-corert",
-    "fedora-corert",
-    "fedora-x64",
-    "fedora",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd": [
     "freebsd",
     "unix",
     "any",
     "base"
   ],
-  "freebsd-corert": [
-    "freebsd-corert",
+  "freebsd-x64": [
+    "freebsd-x64",
     "freebsd",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "freebsd-x64": [
-    "freebsd-x64",
+  "freebsd.11": [
+    "freebsd.11",
     "freebsd",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "freebsd-x64-corert": [
-    "freebsd-x64-corert",
-    "freebsd-corert",
+  "freebsd.11-x64": [
+    "freebsd.11-x64",
+    "freebsd.11",
     "freebsd-x64",
-    "unix-x64-corert",
     "freebsd",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "freebsd.11": [
-    "freebsd.11",
-    "freebsd",
-    "unix",
-    "any",
-    "base"
-  ],
-  "freebsd.11-corert": [
-    "freebsd.11-corert",
-    "freebsd.11",
-    "freebsd-corert",
-    "freebsd",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "freebsd.11-x64": [
-    "freebsd.11-x64",
-    "freebsd.11",
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "freebsd.11-x64-corert": [
-    "freebsd.11-x64-corert",
-    "freebsd.11-corert",
-    "freebsd.11-x64",
-    "freebsd.11",
-    "freebsd-x64-corert",
-    "freebsd-corert",
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -1526,19 +574,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.0-corert": [
-    "freebsd.11.0-corert",
-    "freebsd.11.0",
-    "freebsd.11-corert",
-    "freebsd.11",
-    "freebsd-corert",
-    "freebsd",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd.11.0-x64": [
     "freebsd.11.0-x64",
     "freebsd.11.0",
@@ -1551,27 +586,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.0-x64-corert": [
-    "freebsd.11.0-x64-corert",
-    "freebsd.11.0-corert",
-    "freebsd.11.0-x64",
-    "freebsd.11.0",
-    "freebsd.11-x64-corert",
-    "freebsd.11-corert",
-    "freebsd.11-x64",
-    "freebsd.11",
-    "freebsd-x64-corert",
-    "freebsd-corert",
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd.11.1": [
     "freebsd.11.1",
     "freebsd.11.0",
@@ -1581,21 +595,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.1-corert": [
-    "freebsd.11.1-corert",
-    "freebsd.11.1",
-    "freebsd.11.0-corert",
-    "freebsd.11.0",
-    "freebsd.11-corert",
-    "freebsd.11",
-    "freebsd-corert",
-    "freebsd",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd.11.1-x64": [
     "freebsd.11.1-x64",
     "freebsd.11.1",
@@ -1610,31 +609,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.1-x64-corert": [
-    "freebsd.11.1-x64-corert",
-    "freebsd.11.1-corert",
-    "freebsd.11.1-x64",
-    "freebsd.11.1",
-    "freebsd.11.0-x64-corert",
-    "freebsd.11.0-corert",
-    "freebsd.11.0-x64",
-    "freebsd.11.0",
-    "freebsd.11-x64-corert",
-    "freebsd.11-corert",
-    "freebsd.11-x64",
-    "freebsd.11",
-    "freebsd-x64-corert",
-    "freebsd-corert",
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd.11.2": [
     "freebsd.11.2",
     "freebsd.11.1",
@@ -1645,23 +619,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.2-corert": [
-    "freebsd.11.2-corert",
-    "freebsd.11.2",
-    "freebsd.11.1-corert",
-    "freebsd.11.1",
-    "freebsd.11.0-corert",
-    "freebsd.11.0",
-    "freebsd.11-corert",
-    "freebsd.11",
-    "freebsd-corert",
-    "freebsd",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "freebsd.11.2-x64": [
     "freebsd.11.2-x64",
     "freebsd.11.2",
@@ -1678,35 +635,6 @@
     "any",
     "base"
   ],
-  "freebsd.11.2-x64-corert": [
-    "freebsd.11.2-x64-corert",
-    "freebsd.11.2-corert",
-    "freebsd.11.2-x64",
-    "freebsd.11.2",
-    "freebsd.11.1-x64-corert",
-    "freebsd.11.1-corert",
-    "freebsd.11.1-x64",
-    "freebsd.11.1",
-    "freebsd.11.0-x64-corert",
-    "freebsd.11.0-corert",
-    "freebsd.11.0-x64",
-    "freebsd.11.0",
-    "freebsd.11-x64-corert",
-    "freebsd.11-corert",
-    "freebsd.11-x64",
-    "freebsd.11",
-    "freebsd-x64-corert",
-    "freebsd-corert",
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "gentoo": [
     "gentoo",
     "linux",
@@ -1714,17 +642,6 @@
     "any",
     "base"
   ],
-  "gentoo-corert": [
-    "gentoo-corert",
-    "gentoo",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "gentoo-x64": [
     "gentoo-x64",
     "gentoo",
@@ -1735,23 +652,6 @@
     "any",
     "base"
   ],
-  "gentoo-x64-corert": [
-    "gentoo-x64-corert",
-    "gentoo-corert",
-    "gentoo-x64",
-    "linux-x64-corert",
-    "gentoo",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux": [
     "linux",
     "unix",
@@ -1766,19 +666,6 @@
     "any",
     "base"
   ],
-  "linux-arm-corert": [
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "unix-arm-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-arm64": [
     "linux-arm64",
     "linux",
@@ -1787,19 +674,6 @@
     "any",
     "base"
   ],
-  "linux-arm64-corert": [
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "unix-arm64-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-armel": [
     "linux-armel",
     "linux",
@@ -1808,28 +682,6 @@
     "any",
     "base"
   ],
-  "linux-armel-corert": [
-    "linux-armel-corert",
-    "linux-corert",
-    "linux-armel",
-    "unix-armel-corert",
-    "linux",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "linux-corert": [
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-musl": [
     "linux-musl",
     "linux",
@@ -1847,23 +699,6 @@
     "any",
     "base"
   ],
-  "linux-musl-arm-corert": [
-    "linux-musl-arm-corert",
-    "linux-musl-corert",
-    "linux-musl-arm",
-    "linux-arm-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-arm",
-    "unix-arm-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-musl-arm64": [
     "linux-musl-arm64",
     "linux-musl",
@@ -1874,23 +709,6 @@
     "any",
     "base"
   ],
-  "linux-musl-arm64-corert": [
-    "linux-musl-arm64-corert",
-    "linux-musl-corert",
-    "linux-musl-arm64",
-    "linux-arm64-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-arm64",
-    "unix-arm64-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-musl-armel": [
     "linux-musl-armel",
     "linux-musl",
@@ -1901,34 +719,6 @@
     "any",
     "base"
   ],
-  "linux-musl-armel-corert": [
-    "linux-musl-armel-corert",
-    "linux-musl-corert",
-    "linux-musl-armel",
-    "linux-armel-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-armel",
-    "unix-armel-corert",
-    "linux",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "linux-musl-corert": [
-    "linux-musl-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-musl-x64": [
     "linux-musl-x64",
     "linux-musl",
@@ -1939,23 +729,6 @@
     "any",
     "base"
   ],
-  "linux-musl-x64-corert": [
-    "linux-musl-x64-corert",
-    "linux-musl-corert",
-    "linux-musl-x64",
-    "linux-x64-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-musl-x86": [
     "linux-musl-x86",
     "linux-musl",
@@ -1966,23 +739,6 @@
     "any",
     "base"
   ],
-  "linux-musl-x86-corert": [
-    "linux-musl-x86-corert",
-    "linux-musl-corert",
-    "linux-musl-x86",
-    "linux-x86-corert",
-    "linux-musl",
-    "linux-corert",
-    "linux-x86",
-    "unix-x86-corert",
-    "linux",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-x64": [
     "linux-x64",
     "linux",
@@ -1991,19 +747,6 @@
     "any",
     "base"
   ],
-  "linux-x64-corert": [
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linux-x86": [
     "linux-x86",
     "linux",
@@ -2012,19 +755,6 @@
     "any",
     "base"
   ],
-  "linux-x86-corert": [
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "unix-x86-corert",
-    "linux",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.17": [
     "linuxmint.17",
     "ubuntu.14.04",
@@ -2035,23 +765,6 @@
     "any",
     "base"
   ],
-  "linuxmint.17-corert": [
-    "linuxmint.17-corert",
-    "linuxmint.17",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.17-x64": [
     "linuxmint.17-x64",
     "linuxmint.17",
@@ -2068,66 +781,50 @@
     "any",
     "base"
   ],
-  "linuxmint.17-x64-corert": [
-    "linuxmint.17-x64-corert",
-    "linuxmint.17-corert",
-    "linuxmint.17-x64",
-    "ubuntu.14.04-x64-corert",
+  "linuxmint.17.1": [
+    "linuxmint.17.1",
     "linuxmint.17",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x64",
     "ubuntu.14.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
     "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
     "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "linuxmint.17.1": [
+  "linuxmint.17.1-x64": [
+    "linuxmint.17.1-x64",
     "linuxmint.17.1",
+    "linuxmint.17-x64",
     "linuxmint.17",
+    "ubuntu.14.04-x64",
     "ubuntu.14.04",
+    "ubuntu-x64",
     "ubuntu",
+    "debian-x64",
     "debian",
+    "linux-x64",
     "linux",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "linuxmint.17.1-corert": [
-    "linuxmint.17.1-corert",
+  "linuxmint.17.2": [
+    "linuxmint.17.2",
     "linuxmint.17.1",
-    "linuxmint.17-corert",
     "linuxmint.17",
-    "ubuntu.14.04-corert",
     "ubuntu.14.04",
-    "ubuntu-corert",
     "ubuntu",
-    "debian-corert",
     "debian",
-    "linux-corert",
     "linux",
-    "unix-corert",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "linuxmint.17.1-x64": [
+  "linuxmint.17.2-x64": [
+    "linuxmint.17.2-x64",
+    "linuxmint.17.2",
     "linuxmint.17.1-x64",
     "linuxmint.17.1",
     "linuxmint.17-x64",
@@ -2145,228 +842,41 @@
     "any",
     "base"
   ],
-  "linuxmint.17.1-x64-corert": [
-    "linuxmint.17.1-x64-corert",
-    "linuxmint.17.1-corert",
-    "linuxmint.17.1-x64",
+  "linuxmint.17.3": [
+    "linuxmint.17.3",
+    "linuxmint.17.2",
     "linuxmint.17.1",
-    "linuxmint.17-x64-corert",
-    "linuxmint.17-corert",
-    "linuxmint.17-x64",
     "linuxmint.17",
-    "ubuntu.14.04-x64-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x64",
     "ubuntu.14.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
     "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
     "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "linuxmint.17.2": [
+  "linuxmint.17.3-x64": [
+    "linuxmint.17.3-x64",
+    "linuxmint.17.3",
+    "linuxmint.17.2-x64",
     "linuxmint.17.2",
+    "linuxmint.17.1-x64",
     "linuxmint.17.1",
+    "linuxmint.17-x64",
     "linuxmint.17",
+    "ubuntu.14.04-x64",
     "ubuntu.14.04",
+    "ubuntu-x64",
     "ubuntu",
+    "debian-x64",
     "debian",
+    "linux-x64",
     "linux",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "linuxmint.17.2-corert": [
-    "linuxmint.17.2-corert",
-    "linuxmint.17.2",
-    "linuxmint.17.1-corert",
-    "linuxmint.17.1",
-    "linuxmint.17-corert",
-    "linuxmint.17",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.2-x64": [
-    "linuxmint.17.2-x64",
-    "linuxmint.17.2",
-    "linuxmint.17.1-x64",
-    "linuxmint.17.1",
-    "linuxmint.17-x64",
-    "linuxmint.17",
-    "ubuntu.14.04-x64",
-    "ubuntu.14.04",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64",
-    "debian",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.2-x64-corert": [
-    "linuxmint.17.2-x64-corert",
-    "linuxmint.17.2-corert",
-    "linuxmint.17.2-x64",
-    "linuxmint.17.2",
-    "linuxmint.17.1-x64-corert",
-    "linuxmint.17.1-corert",
-    "linuxmint.17.1-x64",
-    "linuxmint.17.1",
-    "linuxmint.17-x64-corert",
-    "linuxmint.17-corert",
-    "linuxmint.17-x64",
-    "linuxmint.17",
-    "ubuntu.14.04-x64-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x64",
-    "ubuntu.14.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.3": [
-    "linuxmint.17.3",
-    "linuxmint.17.2",
-    "linuxmint.17.1",
-    "linuxmint.17",
-    "ubuntu.14.04",
-    "ubuntu",
-    "debian",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.3-corert": [
-    "linuxmint.17.3-corert",
-    "linuxmint.17.3",
-    "linuxmint.17.2-corert",
-    "linuxmint.17.2",
-    "linuxmint.17.1-corert",
-    "linuxmint.17.1",
-    "linuxmint.17-corert",
-    "linuxmint.17",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.3-x64": [
-    "linuxmint.17.3-x64",
-    "linuxmint.17.3",
-    "linuxmint.17.2-x64",
-    "linuxmint.17.2",
-    "linuxmint.17.1-x64",
-    "linuxmint.17.1",
-    "linuxmint.17-x64",
-    "linuxmint.17",
-    "ubuntu.14.04-x64",
-    "ubuntu.14.04",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64",
-    "debian",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "linuxmint.17.3-x64-corert": [
-    "linuxmint.17.3-x64-corert",
-    "linuxmint.17.3-corert",
-    "linuxmint.17.3-x64",
-    "linuxmint.17.3",
-    "linuxmint.17.2-x64-corert",
-    "linuxmint.17.2-corert",
-    "linuxmint.17.2-x64",
-    "linuxmint.17.2",
-    "linuxmint.17.1-x64-corert",
-    "linuxmint.17.1-corert",
-    "linuxmint.17.1-x64",
-    "linuxmint.17.1",
-    "linuxmint.17-x64-corert",
-    "linuxmint.17-corert",
-    "linuxmint.17-x64",
-    "linuxmint.17",
-    "ubuntu.14.04-x64-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x64",
-    "ubuntu.14.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18": [
     "linuxmint.18",
     "ubuntu.16.04",
@@ -2377,23 +887,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18-corert": [
-    "linuxmint.18-corert",
-    "linuxmint.18",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18-x64": [
     "linuxmint.18-x64",
     "linuxmint.18",
@@ -2410,35 +903,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18-x64-corert": [
-    "linuxmint.18-x64-corert",
-    "linuxmint.18-corert",
-    "linuxmint.18-x64",
-    "ubuntu.16.04-x64-corert",
-    "linuxmint.18",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-x64",
-    "ubuntu.16.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.1": [
     "linuxmint.18.1",
     "linuxmint.18",
@@ -2450,25 +914,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.1-corert": [
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1",
-    "linuxmint.18-corert",
-    "linuxmint.18",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.1-x64": [
     "linuxmint.18.1-x64",
     "linuxmint.18.1",
@@ -2487,39 +932,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.1-x64-corert": [
-    "linuxmint.18.1-x64-corert",
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1-x64",
-    "linuxmint.18.1",
-    "linuxmint.18-x64-corert",
-    "linuxmint.18-corert",
-    "linuxmint.18-x64",
-    "linuxmint.18",
-    "ubuntu.16.04-x64-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-x64",
-    "ubuntu.16.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.2": [
     "linuxmint.18.2",
     "linuxmint.18.1",
@@ -2532,27 +944,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.2-corert": [
-    "linuxmint.18.2-corert",
-    "linuxmint.18.2",
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1",
-    "linuxmint.18-corert",
-    "linuxmint.18",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.2-x64": [
     "linuxmint.18.2-x64",
     "linuxmint.18.2",
@@ -2573,43 +964,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.2-x64-corert": [
-    "linuxmint.18.2-x64-corert",
-    "linuxmint.18.2-corert",
-    "linuxmint.18.2-x64",
-    "linuxmint.18.2",
-    "linuxmint.18.1-x64-corert",
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1-x64",
-    "linuxmint.18.1",
-    "linuxmint.18-x64-corert",
-    "linuxmint.18-corert",
-    "linuxmint.18-x64",
-    "linuxmint.18",
-    "ubuntu.16.04-x64-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-x64",
-    "ubuntu.16.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.3": [
     "linuxmint.18.3",
     "linuxmint.18.2",
@@ -2623,29 +977,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.3-corert": [
-    "linuxmint.18.3-corert",
-    "linuxmint.18.3",
-    "linuxmint.18.2-corert",
-    "linuxmint.18.2",
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1",
-    "linuxmint.18-corert",
-    "linuxmint.18",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.18.3-x64": [
     "linuxmint.18.3-x64",
     "linuxmint.18.3",
@@ -2668,47 +999,6 @@
     "any",
     "base"
   ],
-  "linuxmint.18.3-x64-corert": [
-    "linuxmint.18.3-x64-corert",
-    "linuxmint.18.3-corert",
-    "linuxmint.18.3-x64",
-    "linuxmint.18.3",
-    "linuxmint.18.2-x64-corert",
-    "linuxmint.18.2-corert",
-    "linuxmint.18.2-x64",
-    "linuxmint.18.2",
-    "linuxmint.18.1-x64-corert",
-    "linuxmint.18.1-corert",
-    "linuxmint.18.1-x64",
-    "linuxmint.18.1",
-    "linuxmint.18-x64-corert",
-    "linuxmint.18-corert",
-    "linuxmint.18-x64",
-    "linuxmint.18",
-    "ubuntu.16.04-x64-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-x64",
-    "ubuntu.16.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.19": [
     "linuxmint.19",
     "ubuntu.18.04",
@@ -2719,23 +1009,6 @@
     "any",
     "base"
   ],
-  "linuxmint.19-corert": [
-    "linuxmint.19-corert",
-    "linuxmint.19",
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "linuxmint.19-x64": [
     "linuxmint.19-x64",
     "linuxmint.19",
@@ -2752,485 +1025,28 @@
     "any",
     "base"
   ],
-  "linuxmint.19-x64-corert": [
-    "linuxmint.19-x64-corert",
-    "linuxmint.19-corert",
-    "linuxmint.19-x64",
-    "ubuntu.18.04-x64-corert",
-    "linuxmint.19",
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04-x64",
-    "ubuntu.18.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol": [
-    "ol",
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol-corert": [
-    "ol-corert",
-    "ol",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol-x64": [
-    "ol-x64",
-    "ol",
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol-x64-corert": [
-    "ol-x64-corert",
-    "ol-corert",
-    "ol-x64",
-    "rhel-x64-corert",
-    "ol",
-    "rhel-corert",
-    "rhel-x64",
-    "linux-x64-corert",
-    "rhel",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7": [
-    "ol.7",
-    "ol",
-    "rhel.7",
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7-corert": [
-    "ol.7-corert",
-    "ol.7",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7-x64": [
-    "ol.7-x64",
-    "ol.7",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7-x64-corert": [
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "ol.7-x64",
-    "ol.7",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.0": [
-    "ol.7.0",
-    "ol.7",
-    "rhel.7.0",
-    "ol",
-    "rhel.7",
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.0-corert": [
-    "ol.7.0-corert",
-    "ol.7.0",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7",
-    "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.0-x64": [
-    "ol.7.0-x64",
-    "ol.7.0",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.0-x64-corert": [
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "ol.7.0-x64",
-    "ol.7.0",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.1": [
-    "ol.7.1",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7",
-    "rhel.7.0",
-    "ol",
-    "rhel.7",
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.1-corert": [
-    "ol.7.1-corert",
-    "ol.7.1",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7",
-    "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.1-x64": [
-    "ol.7.1-x64",
-    "ol.7.1",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.1-x64-corert": [
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "ol.7.1-x64",
-    "ol.7.1",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.2": [
-    "ol.7.2",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7",
-    "rhel.7.0",
-    "ol",
-    "rhel.7",
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.2-corert": [
-    "ol.7.2-corert",
-    "ol.7.2",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7",
-    "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
-    "ol",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ol.7.2-x64": [
-    "ol.7.2-x64",
-    "ol.7.2",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
-    "ol",
-    "rhel.7",
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ol.7.2-x64-corert": [
-    "ol.7.2-x64-corert",
-    "ol.7.2-corert",
-    "ol.7.2-x64",
-    "ol.7.2",
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
-    "ol.7-x64",
-    "rhel.7.0-x64",
-    "ol.7",
-    "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
+  "ol": [
+    "ol",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol-x64": [
     "ol-x64",
-    "rhel.7-x64",
     "ol",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
     "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.3": [
-    "ol.7.3",
-    "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0",
-    "rhel.7.1",
+  "ol.7": [
     "ol.7",
-    "rhel.7.0",
     "ol",
     "rhel.7",
     "rhel",
@@ -3239,135 +1055,56 @@
     "any",
     "base"
   ],
-  "ol.7.3-corert": [
-    "ol.7.3-corert",
-    "ol.7.3",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
-    "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
-    "ol.7.0",
-    "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
+  "ol.7-x64": [
+    "ol.7-x64",
     "ol.7",
-    "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-corert",
+    "rhel-x64",
     "rhel",
-    "linux-corert",
+    "linux-x64",
     "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.3-x64": [
-    "ol.7.3-x64",
-    "ol.7.3",
-    "ol.7.2-x64",
-    "rhel.7.3-x64",
-    "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
+  "ol.7.0": [
     "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64",
     "rhel",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "ol.7.3-x64-corert": [
-    "ol.7.3-x64-corert",
-    "ol.7.3-corert",
-    "ol.7.3-x64",
-    "ol.7.3",
-    "ol.7.2-x64-corert",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
-    "ol.7.2-x64",
-    "rhel.7.3-x64",
-    "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
-    "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
+  "ol.7.0-x64": [
     "ol.7.0-x64",
-    "rhel.7.1-x64",
     "ol.7.0",
-    "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
     "ol.7-x64",
     "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
     "ol-x64",
     "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
     "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.4": [
-    "ol.7.4",
-    "ol.7.3",
-    "rhel.7.4",
-    "ol.7.2",
-    "rhel.7.3",
+  "ol.7.1": [
     "ol.7.1",
-    "rhel.7.2",
     "ol.7.0",
     "rhel.7.1",
     "ol.7",
@@ -3380,148 +1117,76 @@
     "any",
     "base"
   ],
-  "ol.7.4-corert": [
-    "ol.7.4-corert",
-    "ol.7.4",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
-    "ol.7.3",
-    "rhel.7.4",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
-    "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
+  "ol.7.1-x64": [
+    "ol.7.1-x64",
     "ol.7.1",
-    "rhel.7.2",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
+    "ol.7-x64",
+    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-corert",
+    "rhel-x64",
     "rhel",
-    "linux-corert",
+    "linux-x64",
     "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.4-x64": [
-    "ol.7.4-x64",
-    "ol.7.4",
-    "ol.7.3-x64",
-    "rhel.7.4-x64",
-    "ol.7.3",
-    "rhel.7.4",
-    "ol.7.2-x64",
-    "rhel.7.3-x64",
+  "ol.7.2": [
     "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64",
     "rhel",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "ol.7.4-x64-corert": [
-    "ol.7.4-x64-corert",
-    "ol.7.4-corert",
-    "ol.7.4-x64",
-    "ol.7.4",
-    "ol.7.3-x64-corert",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
-    "ol.7.3-x64",
-    "rhel.7.4-x64",
-    "ol.7.3",
-    "rhel.7.4",
-    "ol.7.2-x64-corert",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
+  "ol.7.2-x64": [
     "ol.7.2-x64",
-    "rhel.7.3-x64",
     "ol.7.2",
-    "rhel.7.3",
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
     "ol.7.1-x64",
     "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
     "ol.7.0-x64",
     "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
     "ol.7-x64",
     "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
     "ol-x64",
     "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
     "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.5": [
-    "ol.7.5",
-    "ol.7.4",
-    "rhel.7.5",
+  "ol.7.3": [
     "ol.7.3",
-    "rhel.7.4",
     "ol.7.2",
     "rhel.7.3",
     "ol.7.1",
@@ -3538,161 +1203,96 @@
     "any",
     "base"
   ],
-  "ol.7.5-corert": [
-    "ol.7.5-corert",
-    "ol.7.5",
-    "ol.7.4-corert",
-    "rhel.7.5-corert",
-    "ol.7.4",
-    "rhel.7.5",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
+  "ol.7.3-x64": [
+    "ol.7.3-x64",
     "ol.7.3",
-    "rhel.7.4",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
+    "ol.7-x64",
+    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-corert",
+    "rhel-x64",
     "rhel",
-    "linux-corert",
+    "linux-x64",
     "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.5-x64": [
-    "ol.7.5-x64",
-    "ol.7.5",
-    "ol.7.4-x64",
-    "rhel.7.5-x64",
+  "ol.7.4": [
     "ol.7.4",
-    "rhel.7.5",
-    "ol.7.3-x64",
-    "rhel.7.4-x64",
     "ol.7.3",
     "rhel.7.4",
-    "ol.7.2-x64",
-    "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64",
     "rhel",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "ol.7.5-x64-corert": [
-    "ol.7.5-x64-corert",
-    "ol.7.5-corert",
-    "ol.7.5-x64",
-    "ol.7.5",
-    "ol.7.4-x64-corert",
-    "ol.7.4-corert",
-    "rhel.7.5-corert",
+  "ol.7.4-x64": [
     "ol.7.4-x64",
-    "rhel.7.5-x64",
     "ol.7.4",
-    "rhel.7.5",
-    "ol.7.3-x64-corert",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
     "ol.7.3-x64",
     "rhel.7.4-x64",
     "ol.7.3",
     "rhel.7.4",
-    "ol.7.2-x64-corert",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
     "ol.7.2-x64",
     "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
     "ol.7.1-x64",
     "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
     "ol.7.0-x64",
     "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
     "ol.7-x64",
     "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
     "ol-x64",
     "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
     "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.6": [
-    "ol.7.6",
+  "ol.7.5": [
     "ol.7.5",
-    "rhel.7.6",
     "ol.7.4",
     "rhel.7.5",
     "ol.7.3",
@@ -3713,214 +1313,128 @@
     "any",
     "base"
   ],
-  "ol.7.6-corert": [
-    "ol.7.6-corert",
-    "ol.7.6",
-    "ol.7.5-corert",
-    "rhel.7.6-corert",
+  "ol.7.5-x64": [
+    "ol.7.5-x64",
     "ol.7.5",
-    "rhel.7.6",
-    "ol.7.4-corert",
-    "rhel.7.5-corert",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
     "ol.7.4",
     "rhel.7.5",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
     "ol.7.3",
     "rhel.7.4",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-corert",
-    "rhel.7.0-corert",
+    "ol.7-x64",
+    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-corert",
-    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-corert",
+    "rhel-x64",
     "rhel",
-    "linux-corert",
+    "linux-x64",
     "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ol.7.6-x64": [
-    "ol.7.6-x64",
+  "ol.7.6": [
     "ol.7.6",
-    "ol.7.5-x64",
-    "rhel.7.6-x64",
     "ol.7.5",
     "rhel.7.6",
-    "ol.7.4-x64",
-    "rhel.7.5-x64",
     "ol.7.4",
     "rhel.7.5",
-    "ol.7.3-x64",
-    "rhel.7.4-x64",
     "ol.7.3",
     "rhel.7.4",
-    "ol.7.2-x64",
-    "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-x64",
-    "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64",
-    "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64",
-    "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64",
-    "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64",
     "rhel",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "ol.7.6-x64-corert": [
-    "ol.7.6-x64-corert",
-    "ol.7.6-corert",
+  "ol.7.6-x64": [
     "ol.7.6-x64",
     "ol.7.6",
-    "ol.7.5-x64-corert",
-    "ol.7.5-corert",
-    "rhel.7.6-corert",
     "ol.7.5-x64",
     "rhel.7.6-x64",
     "ol.7.5",
     "rhel.7.6",
-    "ol.7.4-x64-corert",
-    "ol.7.4-corert",
-    "rhel.7.5-corert",
     "ol.7.4-x64",
     "rhel.7.5-x64",
     "ol.7.4",
     "rhel.7.5",
-    "ol.7.3-x64-corert",
-    "ol.7.3-corert",
-    "rhel.7.4-corert",
     "ol.7.3-x64",
     "rhel.7.4-x64",
     "ol.7.3",
     "rhel.7.4",
-    "ol.7.2-x64-corert",
-    "ol.7.2-corert",
-    "rhel.7.3-corert",
     "ol.7.2-x64",
     "rhel.7.3-x64",
     "ol.7.2",
     "rhel.7.3",
-    "ol.7.1-x64-corert",
-    "ol.7.1-corert",
-    "rhel.7.2-corert",
     "ol.7.1-x64",
     "rhel.7.2-x64",
     "ol.7.1",
     "rhel.7.2",
-    "ol.7.0-x64-corert",
-    "ol.7.0-corert",
-    "rhel.7.1-corert",
     "ol.7.0-x64",
     "rhel.7.1-x64",
     "ol.7.0",
     "rhel.7.1",
-    "ol.7-x64-corert",
-    "ol.7-corert",
-    "rhel.7.0-corert",
     "ol.7-x64",
     "rhel.7.0-x64",
     "ol.7",
     "rhel.7.0",
-    "ol-x64-corert",
-    "ol-corert",
-    "rhel.7-corert",
     "ol-x64",
     "rhel.7-x64",
     "ol",
     "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
     "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "opensuse": [
-    "opensuse",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "opensuse-corert": [
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
+    "linux-x64",
     "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "opensuse-x64": [
-    "opensuse-x64",
+  "opensuse": [
     "opensuse",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "opensuse-x64-corert": [
-    "opensuse-x64-corert",
-    "opensuse-corert",
+  "opensuse-x64": [
     "opensuse-x64",
-    "linux-x64-corert",
     "opensuse",
-    "linux-corert",
     "linux-x64",
-    "unix-x64-corert",
     "linux",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -3932,19 +1446,6 @@
     "any",
     "base"
   ],
-  "opensuse.13.2-corert": [
-    "opensuse.13.2-corert",
-    "opensuse.13.2",
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.13.2-x64": [
     "opensuse.13.2-x64",
     "opensuse.13.2",
@@ -3957,27 +1458,6 @@
     "any",
     "base"
   ],
-  "opensuse.13.2-x64-corert": [
-    "opensuse.13.2-x64-corert",
-    "opensuse.13.2-corert",
-    "opensuse.13.2-x64",
-    "opensuse.13.2",
-    "opensuse-x64-corert",
-    "opensuse-corert",
-    "opensuse-x64",
-    "opensuse",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.15.0": [
     "opensuse.15.0",
     "opensuse",
@@ -3986,19 +1466,6 @@
     "any",
     "base"
   ],
-  "opensuse.15.0-corert": [
-    "opensuse.15.0-corert",
-    "opensuse.15.0",
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.15.0-x64": [
     "opensuse.15.0-x64",
     "opensuse.15.0",
@@ -4011,27 +1478,6 @@
     "any",
     "base"
   ],
-  "opensuse.15.0-x64-corert": [
-    "opensuse.15.0-x64-corert",
-    "opensuse.15.0-corert",
-    "opensuse.15.0-x64",
-    "opensuse.15.0",
-    "opensuse-x64-corert",
-    "opensuse-corert",
-    "opensuse-x64",
-    "opensuse",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.1": [
     "opensuse.42.1",
     "opensuse",
@@ -4040,19 +1486,6 @@
     "any",
     "base"
   ],
-  "opensuse.42.1-corert": [
-    "opensuse.42.1-corert",
-    "opensuse.42.1",
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.1-x64": [
     "opensuse.42.1-x64",
     "opensuse.42.1",
@@ -4065,27 +1498,6 @@
     "any",
     "base"
   ],
-  "opensuse.42.1-x64-corert": [
-    "opensuse.42.1-x64-corert",
-    "opensuse.42.1-corert",
-    "opensuse.42.1-x64",
-    "opensuse.42.1",
-    "opensuse-x64-corert",
-    "opensuse-corert",
-    "opensuse-x64",
-    "opensuse",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.2": [
     "opensuse.42.2",
     "opensuse",
@@ -4094,19 +1506,6 @@
     "any",
     "base"
   ],
-  "opensuse.42.2-corert": [
-    "opensuse.42.2-corert",
-    "opensuse.42.2",
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.2-x64": [
     "opensuse.42.2-x64",
     "opensuse.42.2",
@@ -4119,27 +1518,6 @@
     "any",
     "base"
   ],
-  "opensuse.42.2-x64-corert": [
-    "opensuse.42.2-x64-corert",
-    "opensuse.42.2-corert",
-    "opensuse.42.2-x64",
-    "opensuse.42.2",
-    "opensuse-x64-corert",
-    "opensuse-corert",
-    "opensuse-x64",
-    "opensuse",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.3": [
     "opensuse.42.3",
     "opensuse",
@@ -4148,19 +1526,6 @@
     "any",
     "base"
   ],
-  "opensuse.42.3-corert": [
-    "opensuse.42.3-corert",
-    "opensuse.42.3",
-    "opensuse-corert",
-    "opensuse",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "opensuse.42.3-x64": [
     "opensuse.42.3-x64",
     "opensuse.42.3",
@@ -4173,42 +1538,12 @@
     "any",
     "base"
   ],
-  "opensuse.42.3-x64-corert": [
-    "opensuse.42.3-x64-corert",
-    "opensuse.42.3-corert",
-    "opensuse.42.3-x64",
-    "opensuse.42.3",
-    "opensuse-x64-corert",
-    "opensuse-corert",
-    "opensuse-x64",
-    "opensuse",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx": [
     "osx",
     "unix",
     "any",
     "base"
   ],
-  "osx-corert": [
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx-x64": [
     "osx-x64",
     "osx",
@@ -4217,19 +1552,6 @@
     "any",
     "base"
   ],
-  "osx-x64-corert": [
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "unix-x64-corert",
-    "osx",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.10": [
     "osx.10.10",
     "osx",
@@ -4237,17 +1559,6 @@
     "any",
     "base"
   ],
-  "osx.10.10-corert": [
-    "osx.10.10-corert",
-    "osx.10.10",
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.10-x64": [
     "osx.10.10-x64",
     "osx.10.10",
@@ -4258,23 +1569,6 @@
     "any",
     "base"
   ],
-  "osx.10.10-x64-corert": [
-    "osx.10.10-x64-corert",
-    "osx.10.10-corert",
-    "osx.10.10-x64",
-    "osx.10.10",
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "osx",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.11": [
     "osx.10.11",
     "osx.10.10",
@@ -4283,19 +1577,6 @@
     "any",
     "base"
   ],
-  "osx.10.11-corert": [
-    "osx.10.11-corert",
-    "osx.10.11",
-    "osx.10.10-corert",
-    "osx.10.10",
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.11-x64": [
     "osx.10.11-x64",
     "osx.10.11",
@@ -4308,27 +1589,6 @@
     "any",
     "base"
   ],
-  "osx.10.11-x64-corert": [
-    "osx.10.11-x64-corert",
-    "osx.10.11-corert",
-    "osx.10.11-x64",
-    "osx.10.11",
-    "osx.10.10-x64-corert",
-    "osx.10.10-corert",
-    "osx.10.10-x64",
-    "osx.10.10",
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "osx",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.12": [
     "osx.10.12",
     "osx.10.11",
@@ -4338,21 +1598,6 @@
     "any",
     "base"
   ],
-  "osx.10.12-corert": [
-    "osx.10.12-corert",
-    "osx.10.12",
-    "osx.10.11-corert",
-    "osx.10.11",
-    "osx.10.10-corert",
-    "osx.10.10",
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.12-x64": [
     "osx.10.12-x64",
     "osx.10.12",
@@ -4367,31 +1612,6 @@
     "any",
     "base"
   ],
-  "osx.10.12-x64-corert": [
-    "osx.10.12-x64-corert",
-    "osx.10.12-corert",
-    "osx.10.12-x64",
-    "osx.10.12",
-    "osx.10.11-x64-corert",
-    "osx.10.11-corert",
-    "osx.10.11-x64",
-    "osx.10.11",
-    "osx.10.10-x64-corert",
-    "osx.10.10-corert",
-    "osx.10.10-x64",
-    "osx.10.10",
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "osx",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.13": [
     "osx.10.13",
     "osx.10.12",
@@ -4402,23 +1622,6 @@
     "any",
     "base"
   ],
-  "osx.10.13-corert": [
-    "osx.10.13-corert",
-    "osx.10.13",
-    "osx.10.12-corert",
-    "osx.10.12",
-    "osx.10.11-corert",
-    "osx.10.11",
-    "osx.10.10-corert",
-    "osx.10.10",
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.13-x64": [
     "osx.10.13-x64",
     "osx.10.13",
@@ -4435,35 +1638,6 @@
     "any",
     "base"
   ],
-  "osx.10.13-x64-corert": [
-    "osx.10.13-x64-corert",
-    "osx.10.13-corert",
-    "osx.10.13-x64",
-    "osx.10.13",
-    "osx.10.12-x64-corert",
-    "osx.10.12-corert",
-    "osx.10.12-x64",
-    "osx.10.12",
-    "osx.10.11-x64-corert",
-    "osx.10.11-corert",
-    "osx.10.11-x64",
-    "osx.10.11",
-    "osx.10.10-x64-corert",
-    "osx.10.10-corert",
-    "osx.10.10-x64",
-    "osx.10.10",
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "osx",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.14": [
     "osx.10.14",
     "osx.10.13",
@@ -4475,25 +1649,6 @@
     "any",
     "base"
   ],
-  "osx.10.14-corert": [
-    "osx.10.14-corert",
-    "osx.10.14",
-    "osx.10.13-corert",
-    "osx.10.13",
-    "osx.10.12-corert",
-    "osx.10.12",
-    "osx.10.11-corert",
-    "osx.10.11",
-    "osx.10.10-corert",
-    "osx.10.10",
-    "osx-corert",
-    "osx",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "osx.10.14-x64": [
     "osx.10.14-x64",
     "osx.10.14",
@@ -4507,113 +1662,19 @@
     "osx.10.10",
     "osx-x64",
     "osx",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "osx.10.14-x64-corert": [
-    "osx.10.14-x64-corert",
-    "osx.10.14-corert",
-    "osx.10.14-x64",
-    "osx.10.14",
-    "osx.10.13-x64-corert",
-    "osx.10.13-corert",
-    "osx.10.13-x64",
-    "osx.10.13",
-    "osx.10.12-x64-corert",
-    "osx.10.12-corert",
-    "osx.10.12-x64",
-    "osx.10.12",
-    "osx.10.11-x64-corert",
-    "osx.10.11-corert",
-    "osx.10.11-x64",
-    "osx.10.11",
-    "osx.10.10-x64-corert",
-    "osx.10.10-corert",
-    "osx.10.10-x64",
-    "osx.10.10",
-    "osx-x64-corert",
-    "osx-corert",
-    "osx-x64",
-    "osx",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "rhel": [
-    "rhel",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "rhel-corert": [
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "rhel-x64": [
-    "rhel-x64",
-    "rhel",
-    "linux-x64",
-    "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "rhel-x64-corert": [
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "linux-x64-corert",
-    "rhel",
-    "linux-corert",
-    "linux-x64",
-    "unix-x64-corert",
-    "linux",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "rhel.6": [
-    "rhel.6",
-    "rhel",
-    "linux",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "rhel.6-corert": [
-    "rhel.6-corert",
-    "rhel.6",
-    "rhel-corert",
+  "rhel": [
     "rhel",
-    "linux-corert",
     "linux",
-    "unix-corert",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "rhel.6-x64": [
-    "rhel.6-x64",
-    "rhel.6",
+  "rhel-x64": [
     "rhel-x64",
     "rhel",
     "linux-x64",
@@ -4623,45 +1684,31 @@
     "any",
     "base"
   ],
-  "rhel.6-x64-corert": [
-    "rhel.6-x64-corert",
-    "rhel.6-corert",
-    "rhel.6-x64",
+  "rhel.6": [
     "rhel.6",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
     "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "rhel.7": [
-    "rhel.7",
+  "rhel.6-x64": [
+    "rhel.6-x64",
+    "rhel.6",
+    "rhel-x64",
     "rhel",
+    "linux-x64",
     "linux",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "rhel.7-corert": [
-    "rhel.7-corert",
+  "rhel.7": [
     "rhel.7",
-    "rhel-corert",
     "rhel",
-    "linux-corert",
     "linux",
-    "unix-corert",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -4677,27 +1724,6 @@
     "any",
     "base"
   ],
-  "rhel.7-x64-corert": [
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.0": [
     "rhel.7.0",
     "rhel.7",
@@ -4707,21 +1733,6 @@
     "any",
     "base"
   ],
-  "rhel.7.0-corert": [
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.0-x64": [
     "rhel.7.0-x64",
     "rhel.7.0",
@@ -4736,31 +1747,6 @@
     "any",
     "base"
   ],
-  "rhel.7.0-x64-corert": [
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.1": [
     "rhel.7.1",
     "rhel.7.0",
@@ -4771,23 +1757,6 @@
     "any",
     "base"
   ],
-  "rhel.7.1-corert": [
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.1-x64": [
     "rhel.7.1-x64",
     "rhel.7.1",
@@ -4804,35 +1773,6 @@
     "any",
     "base"
   ],
-  "rhel.7.1-x64-corert": [
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.2": [
     "rhel.7.2",
     "rhel.7.1",
@@ -4844,25 +1784,6 @@
     "any",
     "base"
   ],
-  "rhel.7.2-corert": [
-    "rhel.7.2-corert",
-    "rhel.7.2",
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.2-x64": [
     "rhel.7.2-x64",
     "rhel.7.2",
@@ -4881,39 +1802,6 @@
     "any",
     "base"
   ],
-  "rhel.7.2-x64-corert": [
-    "rhel.7.2-x64-corert",
-    "rhel.7.2-corert",
-    "rhel.7.2-x64",
-    "rhel.7.2",
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.3": [
     "rhel.7.3",
     "rhel.7.2",
@@ -4926,27 +1814,6 @@
     "any",
     "base"
   ],
-  "rhel.7.3-corert": [
-    "rhel.7.3-corert",
-    "rhel.7.3",
-    "rhel.7.2-corert",
-    "rhel.7.2",
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.3-x64": [
     "rhel.7.3-x64",
     "rhel.7.3",
@@ -4967,43 +1834,6 @@
     "any",
     "base"
   ],
-  "rhel.7.3-x64-corert": [
-    "rhel.7.3-x64-corert",
-    "rhel.7.3-corert",
-    "rhel.7.3-x64",
-    "rhel.7.3",
-    "rhel.7.2-x64-corert",
-    "rhel.7.2-corert",
-    "rhel.7.2-x64",
-    "rhel.7.2",
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.4": [
     "rhel.7.4",
     "rhel.7.3",
@@ -5017,29 +1847,6 @@
     "any",
     "base"
   ],
-  "rhel.7.4-corert": [
-    "rhel.7.4-corert",
-    "rhel.7.4",
-    "rhel.7.3-corert",
-    "rhel.7.3",
-    "rhel.7.2-corert",
-    "rhel.7.2",
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.4-x64": [
     "rhel.7.4-x64",
     "rhel.7.4",
@@ -5062,47 +1869,6 @@
     "any",
     "base"
   ],
-  "rhel.7.4-x64-corert": [
-    "rhel.7.4-x64-corert",
-    "rhel.7.4-corert",
-    "rhel.7.4-x64",
-    "rhel.7.4",
-    "rhel.7.3-x64-corert",
-    "rhel.7.3-corert",
-    "rhel.7.3-x64",
-    "rhel.7.3",
-    "rhel.7.2-x64-corert",
-    "rhel.7.2-corert",
-    "rhel.7.2-x64",
-    "rhel.7.2",
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.5": [
     "rhel.7.5",
     "rhel.7.4",
@@ -5117,31 +1883,6 @@
     "any",
     "base"
   ],
-  "rhel.7.5-corert": [
-    "rhel.7.5-corert",
-    "rhel.7.5",
-    "rhel.7.4-corert",
-    "rhel.7.4",
-    "rhel.7.3-corert",
-    "rhel.7.3",
-    "rhel.7.2-corert",
-    "rhel.7.2",
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.5-x64": [
     "rhel.7.5-x64",
     "rhel.7.5",
@@ -5166,51 +1907,6 @@
     "any",
     "base"
   ],
-  "rhel.7.5-x64-corert": [
-    "rhel.7.5-x64-corert",
-    "rhel.7.5-corert",
-    "rhel.7.5-x64",
-    "rhel.7.5",
-    "rhel.7.4-x64-corert",
-    "rhel.7.4-corert",
-    "rhel.7.4-x64",
-    "rhel.7.4",
-    "rhel.7.3-x64-corert",
-    "rhel.7.3-corert",
-    "rhel.7.3-x64",
-    "rhel.7.3",
-    "rhel.7.2-x64-corert",
-    "rhel.7.2-corert",
-    "rhel.7.2-x64",
-    "rhel.7.2",
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.6": [
     "rhel.7.6",
     "rhel.7.5",
@@ -5226,33 +1922,6 @@
     "any",
     "base"
   ],
-  "rhel.7.6-corert": [
-    "rhel.7.6-corert",
-    "rhel.7.6",
-    "rhel.7.5-corert",
-    "rhel.7.5",
-    "rhel.7.4-corert",
-    "rhel.7.4",
-    "rhel.7.3-corert",
-    "rhel.7.3",
-    "rhel.7.2-corert",
-    "rhel.7.2",
-    "rhel.7.1-corert",
-    "rhel.7.1",
-    "rhel.7.0-corert",
-    "rhel.7.0",
-    "rhel.7-corert",
-    "rhel.7",
-    "rhel-corert",
-    "rhel",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "rhel.7.6-x64": [
     "rhel.7.6-x64",
     "rhel.7.6",
@@ -5274,102 +1943,25 @@
     "rhel",
     "linux-x64",
     "linux",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "rhel.7.6-x64-corert": [
-    "rhel.7.6-x64-corert",
-    "rhel.7.6-corert",
-    "rhel.7.6-x64",
-    "rhel.7.6",
-    "rhel.7.5-x64-corert",
-    "rhel.7.5-corert",
-    "rhel.7.5-x64",
-    "rhel.7.5",
-    "rhel.7.4-x64-corert",
-    "rhel.7.4-corert",
-    "rhel.7.4-x64",
-    "rhel.7.4",
-    "rhel.7.3-x64-corert",
-    "rhel.7.3-corert",
-    "rhel.7.3-x64",
-    "rhel.7.3",
-    "rhel.7.2-x64-corert",
-    "rhel.7.2-corert",
-    "rhel.7.2-x64",
-    "rhel.7.2",
-    "rhel.7.1-x64-corert",
-    "rhel.7.1-corert",
-    "rhel.7.1-x64",
-    "rhel.7.1",
-    "rhel.7.0-x64-corert",
-    "rhel.7.0-corert",
-    "rhel.7.0-x64",
-    "rhel.7.0",
-    "rhel.7-x64-corert",
-    "rhel.7-corert",
-    "rhel.7-x64",
-    "rhel.7",
-    "rhel-x64-corert",
-    "rhel-corert",
-    "rhel-x64",
-    "rhel",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "sles": [
-    "sles",
-    "linux",
-    "unix",
-    "any",
-    "base"
-  ],
-  "sles-corert": [
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
+    "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "sles-x64": [
-    "sles-x64",
+  "sles": [
     "sles",
-    "linux-x64",
     "linux",
-    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "sles-x64-corert": [
-    "sles-x64-corert",
-    "sles-corert",
+  "sles-x64": [
     "sles-x64",
-    "linux-x64-corert",
     "sles",
-    "linux-corert",
     "linux-x64",
-    "unix-x64-corert",
     "linux",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -5381,19 +1973,6 @@
     "any",
     "base"
   ],
-  "sles.12-corert": [
-    "sles.12-corert",
-    "sles.12",
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12-x64": [
     "sles.12-x64",
     "sles.12",
@@ -5406,27 +1985,6 @@
     "any",
     "base"
   ],
-  "sles.12-x64-corert": [
-    "sles.12-x64-corert",
-    "sles.12-corert",
-    "sles.12-x64",
-    "sles.12",
-    "sles-x64-corert",
-    "sles-corert",
-    "sles-x64",
-    "sles",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.1": [
     "sles.12.1",
     "sles.12",
@@ -5436,21 +1994,6 @@
     "any",
     "base"
   ],
-  "sles.12.1-corert": [
-    "sles.12.1-corert",
-    "sles.12.1",
-    "sles.12-corert",
-    "sles.12",
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.1-x64": [
     "sles.12.1-x64",
     "sles.12.1",
@@ -5465,31 +2008,6 @@
     "any",
     "base"
   ],
-  "sles.12.1-x64-corert": [
-    "sles.12.1-x64-corert",
-    "sles.12.1-corert",
-    "sles.12.1-x64",
-    "sles.12.1",
-    "sles.12-x64-corert",
-    "sles.12-corert",
-    "sles.12-x64",
-    "sles.12",
-    "sles-x64-corert",
-    "sles-corert",
-    "sles-x64",
-    "sles",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.2": [
     "sles.12.2",
     "sles.12.1",
@@ -5500,23 +2018,6 @@
     "any",
     "base"
   ],
-  "sles.12.2-corert": [
-    "sles.12.2-corert",
-    "sles.12.2",
-    "sles.12.1-corert",
-    "sles.12.1",
-    "sles.12-corert",
-    "sles.12",
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.2-x64": [
     "sles.12.2-x64",
     "sles.12.2",
@@ -5533,35 +2034,6 @@
     "any",
     "base"
   ],
-  "sles.12.2-x64-corert": [
-    "sles.12.2-x64-corert",
-    "sles.12.2-corert",
-    "sles.12.2-x64",
-    "sles.12.2",
-    "sles.12.1-x64-corert",
-    "sles.12.1-corert",
-    "sles.12.1-x64",
-    "sles.12.1",
-    "sles.12-x64-corert",
-    "sles.12-corert",
-    "sles.12-x64",
-    "sles.12",
-    "sles-x64-corert",
-    "sles-corert",
-    "sles-x64",
-    "sles",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.3": [
     "sles.12.3",
     "sles.12.2",
@@ -5573,25 +2045,6 @@
     "any",
     "base"
   ],
-  "sles.12.3-corert": [
-    "sles.12.3-corert",
-    "sles.12.3",
-    "sles.12.2-corert",
-    "sles.12.2",
-    "sles.12.1-corert",
-    "sles.12.1",
-    "sles.12-corert",
-    "sles.12",
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.12.3-x64": [
     "sles.12.3-x64",
     "sles.12.3",
@@ -5610,39 +2063,6 @@
     "any",
     "base"
   ],
-  "sles.12.3-x64-corert": [
-    "sles.12.3-x64-corert",
-    "sles.12.3-corert",
-    "sles.12.3-x64",
-    "sles.12.3",
-    "sles.12.2-x64-corert",
-    "sles.12.2-corert",
-    "sles.12.2-x64",
-    "sles.12.2",
-    "sles.12.1-x64-corert",
-    "sles.12.1-corert",
-    "sles.12.1-x64",
-    "sles.12.1",
-    "sles.12-x64-corert",
-    "sles.12-corert",
-    "sles.12-x64",
-    "sles.12",
-    "sles-x64-corert",
-    "sles-corert",
-    "sles-x64",
-    "sles",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.15": [
     "sles.15",
     "sles.12.3",
@@ -5655,27 +2075,6 @@
     "any",
     "base"
   ],
-  "sles.15-corert": [
-    "sles.15-corert",
-    "sles.15",
-    "sles.12.3-corert",
-    "sles.12.3",
-    "sles.12.2-corert",
-    "sles.12.2",
-    "sles.12.1-corert",
-    "sles.12.1",
-    "sles.12-corert",
-    "sles.12",
-    "sles-corert",
-    "sles",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "sles.15-x64": [
     "sles.15-x64",
     "sles.15",
@@ -5696,43 +2095,6 @@
     "any",
     "base"
   ],
-  "sles.15-x64-corert": [
-    "sles.15-x64-corert",
-    "sles.15-corert",
-    "sles.15-x64",
-    "sles.15",
-    "sles.12.3-x64-corert",
-    "sles.12.3-corert",
-    "sles.12.3-x64",
-    "sles.12.3",
-    "sles.12.2-x64-corert",
-    "sles.12.2-corert",
-    "sles.12.2-x64",
-    "sles.12.2",
-    "sles.12.1-x64-corert",
-    "sles.12.1-corert",
-    "sles.12.1-x64",
-    "sles.12.1",
-    "sles.12-x64-corert",
-    "sles.12-corert",
-    "sles.12-x64",
-    "sles.12",
-    "sles-x64-corert",
-    "sles-corert",
-    "sles-x64",
-    "sles",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen": [
     "tizen",
     "linux",
@@ -5750,34 +2112,6 @@
     "any",
     "base"
   ],
-  "tizen-armel-corert": [
-    "tizen-armel-corert",
-    "tizen-corert",
-    "tizen-armel",
-    "linux-armel-corert",
-    "tizen",
-    "linux-corert",
-    "linux-armel",
-    "unix-armel-corert",
-    "linux",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "tizen-corert": [
-    "tizen-corert",
-    "tizen",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen-x86": [
     "tizen-x86",
     "tizen",
@@ -5788,23 +2122,6 @@
     "any",
     "base"
   ],
-  "tizen-x86-corert": [
-    "tizen-x86-corert",
-    "tizen-corert",
-    "tizen-x86",
-    "linux-x86-corert",
-    "tizen",
-    "linux-corert",
-    "linux-x86",
-    "unix-x86-corert",
-    "linux",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen.4.0.0": [
     "tizen.4.0.0",
     "tizen",
@@ -5825,40 +2142,6 @@
     "any",
     "base"
   ],
-  "tizen.4.0.0-armel-corert": [
-    "tizen.4.0.0-armel-corert",
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0-armel",
-    "tizen.4.0.0",
-    "tizen-armel-corert",
-    "tizen-corert",
-    "tizen-armel",
-    "tizen",
-    "linux-armel-corert",
-    "linux-corert",
-    "linux-armel",
-    "linux",
-    "unix-armel-corert",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "tizen.4.0.0-corert": [
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0",
-    "tizen-corert",
-    "tizen",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen.4.0.0-x86": [
     "tizen.4.0.0-x86",
     "tizen.4.0.0",
@@ -5871,27 +2154,6 @@
     "any",
     "base"
   ],
-  "tizen.4.0.0-x86-corert": [
-    "tizen.4.0.0-x86-corert",
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0-x86",
-    "tizen.4.0.0",
-    "tizen-x86-corert",
-    "tizen-corert",
-    "tizen-x86",
-    "tizen",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen.5.0.0": [
     "tizen.5.0.0",
     "tizen.4.0.0",
@@ -5915,46 +2177,6 @@
     "any",
     "base"
   ],
-  "tizen.5.0.0-armel-corert": [
-    "tizen.5.0.0-armel-corert",
-    "tizen.5.0.0-corert",
-    "tizen.5.0.0-armel",
-    "tizen.5.0.0",
-    "tizen.4.0.0-armel-corert",
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0-armel",
-    "tizen.4.0.0",
-    "tizen-armel-corert",
-    "tizen-corert",
-    "tizen-armel",
-    "tizen",
-    "linux-armel-corert",
-    "linux-corert",
-    "linux-armel",
-    "linux",
-    "unix-armel-corert",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "tizen.5.0.0-corert": [
-    "tizen.5.0.0-corert",
-    "tizen.5.0.0",
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0",
-    "tizen-corert",
-    "tizen",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "tizen.5.0.0-x86": [
     "tizen.5.0.0-x86",
     "tizen.5.0.0",
@@ -5969,31 +2191,6 @@
     "any",
     "base"
   ],
-  "tizen.5.0.0-x86-corert": [
-    "tizen.5.0.0-x86-corert",
-    "tizen.5.0.0-corert",
-    "tizen.5.0.0-x86",
-    "tizen.5.0.0",
-    "tizen.4.0.0-x86-corert",
-    "tizen.4.0.0-corert",
-    "tizen.4.0.0-x86",
-    "tizen.4.0.0",
-    "tizen-x86-corert",
-    "tizen-corert",
-    "tizen-x86",
-    "tizen",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu": [
     "ubuntu",
     "debian",
@@ -6014,103 +2211,27 @@
     "any",
     "base"
   ],
-  "ubuntu-arm-corert": [
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "debian-arm-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian-arm",
-    "linux-arm-corert",
-    "debian",
-    "linux-corert",
-    "linux-arm",
-    "unix-arm-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu-arm64": [
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64",
-    "debian",
-    "linux-arm64",
-    "linux",
-    "unix-arm64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ubuntu-arm64-corert": [
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "debian-arm64-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian-arm64",
-    "linux-arm64-corert",
-    "debian",
-    "linux-corert",
-    "linux-arm64",
-    "unix-arm64-corert",
-    "linux",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu-corert": [
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu-x64": [
-    "ubuntu-x64",
+    "ubuntu-arm64",
     "ubuntu",
-    "debian-x64",
+    "debian-arm64",
     "debian",
-    "linux-x64",
+    "linux-arm64",
     "linux",
-    "unix-x64",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "ubuntu-x64-corert": [
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
+  "ubuntu-x64": [
     "ubuntu-x64",
-    "debian-x64-corert",
     "ubuntu",
-    "debian-corert",
     "debian-x64",
-    "linux-x64-corert",
     "debian",
-    "linux-corert",
     "linux-x64",
-    "unix-x64-corert",
     "linux",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -6126,27 +2247,6 @@
     "any",
     "base"
   ],
-  "ubuntu-x86-corert": [
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "debian-x86-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian-x86",
-    "linux-x86-corert",
-    "debian",
-    "linux-corert",
-    "linux-x86",
-    "unix-x86-corert",
-    "linux",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.04": [
     "ubuntu.14.04",
     "ubuntu",
@@ -6170,46 +2270,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.04-arm-corert": [
-    "ubuntu.14.04-arm-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-arm",
-    "ubuntu.14.04",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.14.04-corert": [
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.04-x64": [
     "ubuntu.14.04-x64",
     "ubuntu.14.04",
@@ -6224,31 +2284,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.04-x64-corert": [
-    "ubuntu.14.04-x64-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x64",
-    "ubuntu.14.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.04-x86": [
     "ubuntu.14.04-x86",
     "ubuntu.14.04",
@@ -6263,31 +2298,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.04-x86-corert": [
-    "ubuntu.14.04-x86-corert",
-    "ubuntu.14.04-corert",
-    "ubuntu.14.04-x86",
-    "ubuntu.14.04",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.10": [
     "ubuntu.14.10",
     "ubuntu",
@@ -6311,46 +2321,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.10-arm-corert": [
-    "ubuntu.14.10-arm-corert",
-    "ubuntu.14.10-corert",
-    "ubuntu.14.10-arm",
-    "ubuntu.14.10",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.14.10-corert": [
-    "ubuntu.14.10-corert",
-    "ubuntu.14.10",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.10-x64": [
     "ubuntu.14.10-x64",
     "ubuntu.14.10",
@@ -6365,31 +2335,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.10-x64-corert": [
-    "ubuntu.14.10-x64-corert",
-    "ubuntu.14.10-corert",
-    "ubuntu.14.10-x64",
-    "ubuntu.14.10",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.14.10-x86": [
     "ubuntu.14.10-x86",
     "ubuntu.14.10",
@@ -6404,31 +2349,6 @@
     "any",
     "base"
   ],
-  "ubuntu.14.10-x86-corert": [
-    "ubuntu.14.10-x86-corert",
-    "ubuntu.14.10-corert",
-    "ubuntu.14.10-x86",
-    "ubuntu.14.10",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.04": [
     "ubuntu.15.04",
     "ubuntu",
@@ -6452,46 +2372,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.04-arm-corert": [
-    "ubuntu.15.04-arm-corert",
-    "ubuntu.15.04-corert",
-    "ubuntu.15.04-arm",
-    "ubuntu.15.04",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.15.04-corert": [
-    "ubuntu.15.04-corert",
-    "ubuntu.15.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.04-x64": [
     "ubuntu.15.04-x64",
     "ubuntu.15.04",
@@ -6506,31 +2386,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.04-x64-corert": [
-    "ubuntu.15.04-x64-corert",
-    "ubuntu.15.04-corert",
-    "ubuntu.15.04-x64",
-    "ubuntu.15.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.04-x86": [
     "ubuntu.15.04-x86",
     "ubuntu.15.04",
@@ -6545,31 +2400,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.04-x86-corert": [
-    "ubuntu.15.04-x86-corert",
-    "ubuntu.15.04-corert",
-    "ubuntu.15.04-x86",
-    "ubuntu.15.04",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.10": [
     "ubuntu.15.10",
     "ubuntu",
@@ -6593,46 +2423,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.10-arm-corert": [
-    "ubuntu.15.10-arm-corert",
-    "ubuntu.15.10-corert",
-    "ubuntu.15.10-arm",
-    "ubuntu.15.10",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.15.10-corert": [
-    "ubuntu.15.10-corert",
-    "ubuntu.15.10",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.10-x64": [
     "ubuntu.15.10-x64",
     "ubuntu.15.10",
@@ -6647,31 +2437,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.10-x64-corert": [
-    "ubuntu.15.10-x64-corert",
-    "ubuntu.15.10-corert",
-    "ubuntu.15.10-x64",
-    "ubuntu.15.10",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.15.10-x86": [
     "ubuntu.15.10-x86",
     "ubuntu.15.10",
@@ -6686,31 +2451,6 @@
     "any",
     "base"
   ],
-  "ubuntu.15.10-x86-corert": [
-    "ubuntu.15.10-x86-corert",
-    "ubuntu.15.10-corert",
-    "ubuntu.15.10-x86",
-    "ubuntu.15.10",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.16.04": [
     "ubuntu.16.04",
     "ubuntu",
@@ -6729,126 +2469,36 @@
     "debian",
     "linux-arm",
     "linux",
-    "unix-arm",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ubuntu.16.04-arm-corert": [
-    "ubuntu.16.04-arm-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-arm",
-    "ubuntu.16.04",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.16.04-arm64": [
-    "ubuntu.16.04-arm64",
-    "ubuntu.16.04",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64",
-    "debian",
-    "linux-arm64",
-    "linux",
-    "unix-arm64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ubuntu.16.04-arm64-corert": [
-    "ubuntu.16.04-arm64-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-arm64",
-    "ubuntu.16.04",
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.16.04-corert": [
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
+    "unix-arm",
     "unix",
-    "corert",
     "any",
     "base"
   ],
-  "ubuntu.16.04-x64": [
-    "ubuntu.16.04-x64",
+  "ubuntu.16.04-arm64": [
+    "ubuntu.16.04-arm64",
     "ubuntu.16.04",
-    "ubuntu-x64",
+    "ubuntu-arm64",
     "ubuntu",
-    "debian-x64",
+    "debian-arm64",
     "debian",
-    "linux-x64",
+    "linux-arm64",
     "linux",
-    "unix-x64",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "ubuntu.16.04-x64-corert": [
-    "ubuntu.16.04-x64-corert",
-    "ubuntu.16.04-corert",
+  "ubuntu.16.04-x64": [
     "ubuntu.16.04-x64",
     "ubuntu.16.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
     "ubuntu-x64",
     "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
     "debian-x64",
     "debian",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -6866,31 +2516,6 @@
     "any",
     "base"
   ],
-  "ubuntu.16.04-x86-corert": [
-    "ubuntu.16.04-x86-corert",
-    "ubuntu.16.04-corert",
-    "ubuntu.16.04-x86",
-    "ubuntu.16.04",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.16.10": [
     "ubuntu.16.10",
     "ubuntu",
@@ -6914,31 +2539,6 @@
     "any",
     "base"
   ],
-  "ubuntu.16.10-arm-corert": [
-    "ubuntu.16.10-arm-corert",
-    "ubuntu.16.10-corert",
-    "ubuntu.16.10-arm",
-    "ubuntu.16.10",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.16.10-arm64": [
     "ubuntu.16.10-arm64",
     "ubuntu.16.10",
@@ -6953,46 +2553,6 @@
     "any",
     "base"
   ],
-  "ubuntu.16.10-arm64-corert": [
-    "ubuntu.16.10-arm64-corert",
-    "ubuntu.16.10-corert",
-    "ubuntu.16.10-arm64",
-    "ubuntu.16.10",
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.16.10-corert": [
-    "ubuntu.16.10-corert",
-    "ubuntu.16.10",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.16.10-x64": [
     "ubuntu.16.10-x64",
     "ubuntu.16.10",
@@ -7007,31 +2567,6 @@
     "any",
     "base"
   ],
-  "ubuntu.16.10-x64-corert": [
-    "ubuntu.16.10-x64-corert",
-    "ubuntu.16.10-corert",
-    "ubuntu.16.10-x64",
-    "ubuntu.16.10",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.16.10-x86": [
     "ubuntu.16.10-x86",
     "ubuntu.16.10",
@@ -7046,31 +2581,6 @@
     "any",
     "base"
   ],
-  "ubuntu.16.10-x86-corert": [
-    "ubuntu.16.10-x86-corert",
-    "ubuntu.16.10-corert",
-    "ubuntu.16.10-x86",
-    "ubuntu.16.10",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.04": [
     "ubuntu.17.04",
     "ubuntu",
@@ -7094,31 +2604,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.04-arm-corert": [
-    "ubuntu.17.04-arm-corert",
-    "ubuntu.17.04-corert",
-    "ubuntu.17.04-arm",
-    "ubuntu.17.04",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.04-arm64": [
     "ubuntu.17.04-arm64",
     "ubuntu.17.04",
@@ -7133,46 +2618,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.04-arm64-corert": [
-    "ubuntu.17.04-arm64-corert",
-    "ubuntu.17.04-corert",
-    "ubuntu.17.04-arm64",
-    "ubuntu.17.04",
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.17.04-corert": [
-    "ubuntu.17.04-corert",
-    "ubuntu.17.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.04-x64": [
     "ubuntu.17.04-x64",
     "ubuntu.17.04",
@@ -7187,31 +2632,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.04-x64-corert": [
-    "ubuntu.17.04-x64-corert",
-    "ubuntu.17.04-corert",
-    "ubuntu.17.04-x64",
-    "ubuntu.17.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.04-x86": [
     "ubuntu.17.04-x86",
     "ubuntu.17.04",
@@ -7226,31 +2646,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.04-x86-corert": [
-    "ubuntu.17.04-x86-corert",
-    "ubuntu.17.04-corert",
-    "ubuntu.17.04-x86",
-    "ubuntu.17.04",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.10": [
     "ubuntu.17.10",
     "ubuntu",
@@ -7274,31 +2669,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.10-arm-corert": [
-    "ubuntu.17.10-arm-corert",
-    "ubuntu.17.10-corert",
-    "ubuntu.17.10-arm",
-    "ubuntu.17.10",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.10-arm64": [
     "ubuntu.17.10-arm64",
     "ubuntu.17.10",
@@ -7313,46 +2683,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.10-arm64-corert": [
-    "ubuntu.17.10-arm64-corert",
-    "ubuntu.17.10-corert",
-    "ubuntu.17.10-arm64",
-    "ubuntu.17.10",
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.17.10-corert": [
-    "ubuntu.17.10-corert",
-    "ubuntu.17.10",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.10-x64": [
     "ubuntu.17.10-x64",
     "ubuntu.17.10",
@@ -7367,31 +2697,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.10-x64-corert": [
-    "ubuntu.17.10-x64-corert",
-    "ubuntu.17.10-corert",
-    "ubuntu.17.10-x64",
-    "ubuntu.17.10",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
-    "debian-x64",
-    "debian",
-    "linux-x64-corert",
-    "linux-corert",
-    "linux-x64",
-    "linux",
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.17.10-x86": [
     "ubuntu.17.10-x86",
     "ubuntu.17.10",
@@ -7406,31 +2711,6 @@
     "any",
     "base"
   ],
-  "ubuntu.17.10-x86-corert": [
-    "ubuntu.17.10-x86-corert",
-    "ubuntu.17.10-corert",
-    "ubuntu.17.10-x86",
-    "ubuntu.17.10",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.18.04": [
     "ubuntu.18.04",
     "ubuntu",
@@ -7454,31 +2734,6 @@
     "any",
     "base"
   ],
-  "ubuntu.18.04-arm-corert": [
-    "ubuntu.18.04-arm-corert",
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04-arm",
-    "ubuntu.18.04",
-    "ubuntu-arm-corert",
-    "ubuntu-corert",
-    "ubuntu-arm",
-    "ubuntu",
-    "debian-arm-corert",
-    "debian-corert",
-    "debian-arm",
-    "debian",
-    "linux-arm-corert",
-    "linux-corert",
-    "linux-arm",
-    "linux",
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "ubuntu.18.04-arm64": [
     "ubuntu.18.04-arm64",
     "ubuntu.18.04",
@@ -7486,89 +2741,24 @@
     "ubuntu",
     "debian-arm64",
     "debian",
-    "linux-arm64",
-    "linux",
-    "unix-arm64",
-    "unix",
-    "any",
-    "base"
-  ],
-  "ubuntu.18.04-arm64-corert": [
-    "ubuntu.18.04-arm64-corert",
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04-arm64",
-    "ubuntu.18.04",
-    "ubuntu-arm64-corert",
-    "ubuntu-corert",
-    "ubuntu-arm64",
-    "ubuntu",
-    "debian-arm64-corert",
-    "debian-corert",
-    "debian-arm64",
-    "debian",
-    "linux-arm64-corert",
-    "linux-corert",
-    "linux-arm64",
-    "linux",
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.18.04-corert": [
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04",
-    "ubuntu-corert",
-    "ubuntu",
-    "debian-corert",
-    "debian",
-    "linux-corert",
-    "linux",
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "ubuntu.18.04-x64": [
-    "ubuntu.18.04-x64",
-    "ubuntu.18.04",
-    "ubuntu-x64",
-    "ubuntu",
-    "debian-x64",
-    "debian",
-    "linux-x64",
+    "linux-arm64",
     "linux",
-    "unix-x64",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "ubuntu.18.04-x64-corert": [
-    "ubuntu.18.04-x64-corert",
-    "ubuntu.18.04-corert",
+  "ubuntu.18.04-x64": [
     "ubuntu.18.04-x64",
     "ubuntu.18.04",
-    "ubuntu-x64-corert",
-    "ubuntu-corert",
     "ubuntu-x64",
     "ubuntu",
-    "debian-x64-corert",
-    "debian-corert",
     "debian-x64",
     "debian",
-    "linux-x64-corert",
-    "linux-corert",
     "linux-x64",
     "linux",
-    "unix-x64-corert",
-    "unix-corert",
     "unix-x64",
     "unix",
-    "corert",
     "any",
     "base"
   ],
@@ -7586,31 +2776,6 @@
     "any",
     "base"
   ],
-  "ubuntu.18.04-x86-corert": [
-    "ubuntu.18.04-x86-corert",
-    "ubuntu.18.04-corert",
-    "ubuntu.18.04-x86",
-    "ubuntu.18.04",
-    "ubuntu-x86-corert",
-    "ubuntu-corert",
-    "ubuntu-x86",
-    "ubuntu",
-    "debian-x86-corert",
-    "debian-corert",
-    "debian-x86",
-    "debian",
-    "linux-x86-corert",
-    "linux-corert",
-    "linux-x86",
-    "linux",
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "unix": [
     "unix",
     "any",
@@ -7622,82 +2787,30 @@
     "any",
     "base"
   ],
-  "unix-arm-corert": [
-    "unix-arm-corert",
-    "unix-corert",
-    "unix-arm",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "unix-arm64": [
     "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "unix-arm64-corert": [
-    "unix-arm64-corert",
-    "unix-corert",
-    "unix-arm64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "unix-armel": [
     "unix-armel",
     "unix",
     "any",
     "base"
   ],
-  "unix-armel-corert": [
-    "unix-armel-corert",
-    "unix-corert",
-    "unix-armel",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
-  "unix-corert": [
-    "unix-corert",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "unix-x64": [
     "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "unix-x64-corert": [
-    "unix-x64-corert",
-    "unix-corert",
-    "unix-x64",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "unix-x86": [
     "unix-x86",
     "unix",
     "any",
     "base"
   ],
-  "unix-x86-corert": [
-    "unix-x86-corert",
-    "unix-corert",
-    "unix-x86",
-    "unix",
-    "corert",
-    "any",
-    "base"
-  ],
   "win": [
     "win",
     "any",
@@ -7725,15 +2838,6 @@
     "any",
     "base"
   ],
-  "win-arm-corert": [
-    "win-arm-corert",
-    "win-corert",
-    "win-arm",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win-arm64": [
     "win-arm64",
     "win",
@@ -7749,22 +2853,6 @@
     "any",
     "base"
   ],
-  "win-arm64-corert": [
-    "win-arm64-corert",
-    "win-corert",
-    "win-arm64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
-  "win-corert": [
-    "win-corert",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win-x64": [
     "win-x64",
     "win",
@@ -7780,15 +2868,6 @@
     "any",
     "base"
   ],
-  "win-x64-corert": [
-    "win-x64-corert",
-    "win-corert",
-    "win-x64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win-x86": [
     "win-x86",
     "win",
@@ -7804,15 +2883,6 @@
     "any",
     "base"
   ],
-  "win-x86-corert": [
-    "win-x86-corert",
-    "win-corert",
-    "win-x86",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win10": [
     "win10",
     "win81",
@@ -7876,31 +2946,6 @@
     "any",
     "base"
   ],
-  "win10-arm-corert": [
-    "win10-arm-corert",
-    "win10-corert",
-    "win10-arm",
-    "win10",
-    "win81-arm-corert",
-    "win81-corert",
-    "win81-arm",
-    "win81",
-    "win8-arm-corert",
-    "win8-corert",
-    "win8-arm",
-    "win8",
-    "win7-arm-corert",
-    "win7-corert",
-    "win7-arm",
-    "win7",
-    "win-arm-corert",
-    "win-corert",
-    "win-arm",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win10-arm64": [
     "win10-arm64",
     "win10",
@@ -7940,46 +2985,6 @@
     "any",
     "base"
   ],
-  "win10-arm64-corert": [
-    "win10-arm64-corert",
-    "win10-corert",
-    "win10-arm64",
-    "win10",
-    "win81-arm64-corert",
-    "win81-corert",
-    "win81-arm64",
-    "win81",
-    "win8-arm64-corert",
-    "win8-corert",
-    "win8-arm64",
-    "win8",
-    "win7-arm64-corert",
-    "win7-corert",
-    "win7-arm64",
-    "win7",
-    "win-arm64-corert",
-    "win-corert",
-    "win-arm64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
-  "win10-corert": [
-    "win10-corert",
-    "win10",
-    "win81-corert",
-    "win81",
-    "win8-corert",
-    "win8",
-    "win7-corert",
-    "win7",
-    "win-corert",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win10-x64": [
     "win10-x64",
     "win10",
@@ -8019,31 +3024,6 @@
     "any",
     "base"
   ],
-  "win10-x64-corert": [
-    "win10-x64-corert",
-    "win10-corert",
-    "win10-x64",
-    "win10",
-    "win81-x64-corert",
-    "win81-corert",
-    "win81-x64",
-    "win81",
-    "win8-x64-corert",
-    "win8-corert",
-    "win8-x64",
-    "win8",
-    "win7-x64-corert",
-    "win7-corert",
-    "win7-x64",
-    "win7",
-    "win-x64-corert",
-    "win-corert",
-    "win-x64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win10-x86": [
     "win10-x86",
     "win10",
@@ -8083,31 +3063,6 @@
     "any",
     "base"
   ],
-  "win10-x86-corert": [
-    "win10-x86-corert",
-    "win10-corert",
-    "win10-x86",
-    "win10",
-    "win81-x86-corert",
-    "win81-corert",
-    "win81-x86",
-    "win81",
-    "win8-x86-corert",
-    "win8-corert",
-    "win8-x86",
-    "win8",
-    "win7-x86-corert",
-    "win7-corert",
-    "win7-x86",
-    "win7",
-    "win-x86-corert",
-    "win-corert",
-    "win-x86",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win7": [
     "win7",
     "win",
@@ -8144,19 +3099,6 @@
     "any",
     "base"
   ],
-  "win7-arm-corert": [
-    "win7-arm-corert",
-    "win7-corert",
-    "win7-arm",
-    "win7",
-    "win-arm-corert",
-    "win-corert",
-    "win-arm",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win7-arm64": [
     "win7-arm64",
     "win7",
@@ -8178,28 +3120,6 @@
     "any",
     "base"
   ],
-  "win7-arm64-corert": [
-    "win7-arm64-corert",
-    "win7-corert",
-    "win7-arm64",
-    "win7",
-    "win-arm64-corert",
-    "win-corert",
-    "win-arm64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
-  "win7-corert": [
-    "win7-corert",
-    "win7",
-    "win-corert",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win7-x64": [
     "win7-x64",
     "win7",
@@ -8221,19 +3141,6 @@
     "any",
     "base"
   ],
-  "win7-x64-corert": [
-    "win7-x64-corert",
-    "win7-corert",
-    "win7-x64",
-    "win7",
-    "win-x64-corert",
-    "win-corert",
-    "win-x64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win7-x86": [
     "win7-x86",
     "win7",
@@ -8255,19 +3162,6 @@
     "any",
     "base"
   ],
-  "win7-x86-corert": [
-    "win7-x86-corert",
-    "win7-corert",
-    "win7-x86",
-    "win7",
-    "win-x86-corert",
-    "win-corert",
-    "win-x86",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win8": [
     "win8",
     "win7",
@@ -8313,23 +3207,6 @@
     "any",
     "base"
   ],
-  "win8-arm-corert": [
-    "win8-arm-corert",
-    "win8-corert",
-    "win8-arm",
-    "win8",
-    "win7-arm-corert",
-    "win7-corert",
-    "win7-arm",
-    "win7",
-    "win-arm-corert",
-    "win-corert",
-    "win-arm",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win8-arm64": [
     "win8-arm64",
     "win8",
@@ -8357,34 +3234,6 @@
     "any",
     "base"
   ],
-  "win8-arm64-corert": [
-    "win8-arm64-corert",
-    "win8-corert",
-    "win8-arm64",
-    "win8",
-    "win7-arm64-corert",
-    "win7-corert",
-    "win7-arm64",
-    "win7",
-    "win-arm64-corert",
-    "win-corert",
-    "win-arm64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
-  "win8-corert": [
-    "win8-corert",
-    "win8",
-    "win7-corert",
-    "win7",
-    "win-corert",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win8-x64": [
     "win8-x64",
     "win8",
@@ -8412,23 +3261,6 @@
     "any",
     "base"
   ],
-  "win8-x64-corert": [
-    "win8-x64-corert",
-    "win8-corert",
-    "win8-x64",
-    "win8",
-    "win7-x64-corert",
-    "win7-corert",
-    "win7-x64",
-    "win7",
-    "win-x64-corert",
-    "win-corert",
-    "win-x64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win8-x86": [
     "win8-x86",
     "win8",
@@ -8456,23 +3288,6 @@
     "any",
     "base"
   ],
-  "win8-x86-corert": [
-    "win8-x86-corert",
-    "win8-corert",
-    "win8-x86",
-    "win8",
-    "win7-x86-corert",
-    "win7-corert",
-    "win7-x86",
-    "win7",
-    "win-x86-corert",
-    "win-corert",
-    "win-x86",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win81": [
     "win81",
     "win8",
@@ -8527,27 +3342,6 @@
     "any",
     "base"
   ],
-  "win81-arm-corert": [
-    "win81-arm-corert",
-    "win81-corert",
-    "win81-arm",
-    "win81",
-    "win8-arm-corert",
-    "win8-corert",
-    "win8-arm",
-    "win8",
-    "win7-arm-corert",
-    "win7-corert",
-    "win7-arm",
-    "win7",
-    "win-arm-corert",
-    "win-corert",
-    "win-arm",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win81-arm64": [
     "win81-arm64",
     "win81",
@@ -8581,40 +3375,6 @@
     "any",
     "base"
   ],
-  "win81-arm64-corert": [
-    "win81-arm64-corert",
-    "win81-corert",
-    "win81-arm64",
-    "win81",
-    "win8-arm64-corert",
-    "win8-corert",
-    "win8-arm64",
-    "win8",
-    "win7-arm64-corert",
-    "win7-corert",
-    "win7-arm64",
-    "win7",
-    "win-arm64-corert",
-    "win-corert",
-    "win-arm64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
-  "win81-corert": [
-    "win81-corert",
-    "win81",
-    "win8-corert",
-    "win8",
-    "win7-corert",
-    "win7",
-    "win-corert",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win81-x64": [
     "win81-x64",
     "win81",
@@ -8648,27 +3408,6 @@
     "any",
     "base"
   ],
-  "win81-x64-corert": [
-    "win81-x64-corert",
-    "win81-corert",
-    "win81-x64",
-    "win81",
-    "win8-x64-corert",
-    "win8-corert",
-    "win8-x64",
-    "win8",
-    "win7-x64-corert",
-    "win7-corert",
-    "win7-x64",
-    "win7",
-    "win-x64-corert",
-    "win-corert",
-    "win-x64",
-    "win",
-    "corert",
-    "any",
-    "base"
-  ],
   "win81-x86": [
     "win81-x86",
     "win81",
@@ -8701,26 +3440,5 @@
     "aot",
     "any",
     "base"
-  ],
-  "win81-x86-corert": [
-    "win81-x86-corert",
-    "win81-corert",
-    "win81-x86",
-    "win81",
-    "win8-x86-corert",
-    "win8-corert",
-    "win8-x86",
-    "win8",
-    "win7-x86-corert",
-    "win7-corert",
-    "win7-x86",
-    "win7",
-    "win-x86-corert",
-    "win-corert",
-    "win-x86",
-    "win",
-    "corert",
-    "any",
-    "base"
   ]
 }
\ No newline at end of file

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 89b1b73..b864185 100644 (file)
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -5,75 +5,34 @@
         "linux-musl"
       ]
     },
-    "alpine-corert": {
-      "#import": [
-        "alpine",
-        "linux-musl-corert"
-      ]
-    },
     "alpine-x64": {
       "#import": [
         "alpine",
         "linux-musl-x64"
       ]
     },
-    "alpine-x64-corert": {
-      "#import": [
-        "alpine-corert",
-        "alpine-x64",
-        "linux-musl-x64-corert"
-      ]
-    },
     "alpine.3.6": {
       "#import": [
         "alpine"
       ]
     },
-    "alpine.3.6-corert": {
-      "#import": [
-        "alpine.3.6",
-        "alpine-corert"
-      ]
-    },
     "alpine.3.6-x64": {
       "#import": [
         "alpine.3.6",
         "alpine-x64"
       ]
     },
-    "alpine.3.6-x64-corert": {
-      "#import": [
-        "alpine.3.6-corert",
-        "alpine.3.6-x64",
-        "alpine.3.6",
-        "alpine-x64-corert"
-      ]
-    },
     "alpine.3.7": {
       "#import": [
         "alpine.3.6"
       ]
     },
-    "alpine.3.7-corert": {
-      "#import": [
-        "alpine.3.7",
-        "alpine.3.6-corert"
-      ]
-    },
     "alpine.3.7-x64": {
       "#import": [
         "alpine.3.7",
         "alpine.3.6-x64"
       ]
     },
-    "alpine.3.7-x64-corert": {
-      "#import": [
-        "alpine.3.7-corert",
-        "alpine.3.7-x64",
-        "alpine.3.7",
-        "alpine.3.6-x64-corert"
-      ]
-    },
     "android": {
       "#import": [
         "linux"
@@ -85,32 +44,12 @@
         "linux-arm"
       ]
     },
-    "android-arm-corert": {
-      "#import": [
-        "android-corert",
-        "android-arm",
-        "linux-arm-corert"
-      ]
-    },
     "android-arm64": {
       "#import": [
         "android",
         "linux-arm64"
       ]
     },
-    "android-arm64-corert": {
-      "#import": [
-        "android-corert",
-        "android-arm64",
-        "linux-arm64-corert"
-      ]
-    },
-    "android-corert": {
-      "#import": [
-        "android",
-        "linux-corert"
-      ]
-    },
     "android.21": {
       "#import": [
         "android"
@@ -122,34 +61,12 @@
         "android-arm"
       ]
     },
-    "android.21-arm-corert": {
-      "#import": [
-        "android.21-corert",
-        "android.21-arm",
-        "android.21",
-        "android-arm-corert"
-      ]
-    },
     "android.21-arm64": {
       "#import": [
         "android.21",
         "android-arm64"
       ]
     },
-    "android.21-arm64-corert": {
-      "#import": [
-        "android.21-corert",
-        "android.21-arm64",
-        "android.21",
-        "android-arm64-corert"
-      ]
-    },
-    "android.21-corert": {
-      "#import": [
-        "android.21",
-        "android-corert"
-      ]
-    },
     "any": {
       "#import": [
         "base"
@@ -168,38 +85,18 @@
         "rhel"
       ]
     },
-    "centos-corert": {
-      "#import": [
-        "centos",
-        "rhel-corert"
-      ]
-    },
     "centos-x64": {
       "#import": [
         "centos",
         "rhel-x64"
       ]
     },
-    "centos-x64-corert": {
-      "#import": [
-        "centos-corert",
-        "centos-x64",
-        "rhel-x64-corert"
-      ]
-    },
     "centos.7": {
       "#import": [
         "centos",
         "rhel.7"
       ]
     },
-    "centos.7-corert": {
-      "#import": [
-        "centos.7",
-        "centos-corert",
-        "rhel.7-corert"
-      ]
-    },
     "centos.7-x64": {
       "#import": [
         "centos.7",
@@ -207,19 +104,6 @@
         "rhel.7-x64"
       ]
     },
-    "centos.7-x64-corert": {
-      "#import": [
-        "centos.7-corert",
-        "centos.7-x64",
-        "centos.7",
-        "centos-x64-corert"
-      ]
-    },
-    "corert": {
-      "#import": [
-        "any"
-      ]
-    },
     "debian": {
       "#import": [
         "linux"
@@ -231,71 +115,30 @@
         "linux-arm"
       ]
     },
-    "debian-arm-corert": {
-      "#import": [
-        "debian-corert",
-        "debian-arm",
-        "linux-arm-corert"
-      ]
-    },
     "debian-arm64": {
       "#import": [
         "debian",
         "linux-arm64"
       ]
     },
-    "debian-arm64-corert": {
-      "#import": [
-        "debian-corert",
-        "debian-arm64",
-        "linux-arm64-corert"
-      ]
-    },
     "debian-armel": {
       "#import": [
         "debian",
         "linux-armel"
       ]
     },
-    "debian-armel-corert": {
-      "#import": [
-        "debian-corert",
-        "debian-armel",
-        "linux-armel-corert"
-      ]
-    },
-    "debian-corert": {
-      "#import": [
-        "debian",
-        "linux-corert"
-      ]
-    },
     "debian-x64": {
       "#import": [
         "debian",
         "linux-x64"
       ]
     },
-    "debian-x64-corert": {
-      "#import": [
-        "debian-corert",
-        "debian-x64",
-        "linux-x64-corert"
-      ]
-    },
     "debian-x86": {
       "#import": [
         "debian",
         "linux-x86"
       ]
     },
-    "debian-x86-corert": {
-      "#import": [
-        "debian-corert",
-        "debian-x86",
-        "linux-x86-corert"
-      ]
-    },
     "debian.8": {
       "#import": [
         "debian"
@@ -307,76 +150,30 @@
         "debian-arm"
       ]
     },
-    "debian.8-arm-corert": {
-      "#import": [
-        "debian.8-corert",
-        "debian.8-arm",
-        "debian.8",
-        "debian-arm-corert"
-      ]
-    },
     "debian.8-arm64": {
       "#import": [
         "debian.8",
         "debian-arm64"
       ]
     },
-    "debian.8-arm64-corert": {
-      "#import": [
-        "debian.8-corert",
-        "debian.8-arm64",
-        "debian.8",
-        "debian-arm64-corert"
-      ]
-    },
     "debian.8-armel": {
       "#import": [
         "debian.8",
         "debian-armel"
       ]
     },
-    "debian.8-armel-corert": {
-      "#import": [
-        "debian.8-corert",
-        "debian.8-armel",
-        "debian.8",
-        "debian-armel-corert"
-      ]
-    },
-    "debian.8-corert": {
-      "#import": [
-        "debian.8",
-        "debian-corert"
-      ]
-    },
     "debian.8-x64": {
       "#import": [
         "debian.8",
         "debian-x64"
       ]
     },
-    "debian.8-x64-corert": {
-      "#import": [
-        "debian.8-corert",
-        "debian.8-x64",
-        "debian.8",
-        "debian-x64-corert"
-      ]
-    },
     "debian.8-x86": {
       "#import": [
         "debian.8",
         "debian-x86"
       ]
     },
-    "debian.8-x86-corert": {
-      "#import": [
-        "debian.8-corert",
-        "debian.8-x86",
-        "debian.8",
-        "debian-x86-corert"
-      ]
-    },
     "debian.9": {
       "#import": [
         "debian"
@@ -388,423 +185,184 @@
         "debian-arm"
       ]
     },
-    "debian.9-arm-corert": {
-      "#import": [
-        "debian.9-corert",
-        "debian.9-arm",
-        "debian.9",
-        "debian-arm-corert"
-      ]
-    },
     "debian.9-arm64": {
       "#import": [
         "debian.9",
         "debian-arm64"
       ]
     },
-    "debian.9-arm64-corert": {
-      "#import": [
-        "debian.9-corert",
-        "debian.9-arm64",
-        "debian.9",
-        "debian-arm64-corert"
-      ]
-    },
     "debian.9-armel": {
       "#import": [
         "debian.9",
         "debian-armel"
       ]
     },
-    "debian.9-armel-corert": {
-      "#import": [
-        "debian.9-corert",
-        "debian.9-armel",
-        "debian.9",
-        "debian-armel-corert"
-      ]
-    },
-    "debian.9-corert": {
-      "#import": [
-        "debian.9",
-        "debian-corert"
-      ]
-    },
     "debian.9-x64": {
       "#import": [
         "debian.9",
         "debian-x64"
       ]
     },
-    "debian.9-x64-corert": {
-      "#import": [
-        "debian.9-corert",
-        "debian.9-x64",
-        "debian.9",
-        "debian-x64-corert"
-      ]
-    },
     "debian.9-x86": {
       "#import": [
         "debian.9",
         "debian-x86"
       ]
     },
-    "debian.9-x86-corert": {
-      "#import": [
-        "debian.9-corert",
-        "debian.9-x86",
-        "debian.9",
-        "debian-x86-corert"
-      ]
-    },
     "fedora": {
       "#import": [
         "linux"
       ]
     },
-    "fedora-corert": {
-      "#import": [
-        "fedora",
-        "linux-corert"
-      ]
-    },
     "fedora-x64": {
       "#import": [
         "fedora",
         "linux-x64"
       ]
     },
-    "fedora-x64-corert": {
-      "#import": [
-        "fedora-corert",
-        "fedora-x64",
-        "linux-x64-corert"
-      ]
-    },
     "fedora.23": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.23-corert": {
-      "#import": [
-        "fedora.23",
-        "fedora-corert"
-      ]
-    },
     "fedora.23-x64": {
       "#import": [
         "fedora.23",
         "fedora-x64"
       ]
     },
-    "fedora.23-x64-corert": {
-      "#import": [
-        "fedora.23-corert",
-        "fedora.23-x64",
-        "fedora.23",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.24": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.24-corert": {
-      "#import": [
-        "fedora.24",
-        "fedora-corert"
-      ]
-    },
     "fedora.24-x64": {
       "#import": [
         "fedora.24",
         "fedora-x64"
       ]
     },
-    "fedora.24-x64-corert": {
-      "#import": [
-        "fedora.24-corert",
-        "fedora.24-x64",
-        "fedora.24",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.25": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.25-corert": {
-      "#import": [
-        "fedora.25",
-        "fedora-corert"
-      ]
-    },
     "fedora.25-x64": {
       "#import": [
         "fedora.25",
         "fedora-x64"
       ]
     },
-    "fedora.25-x64-corert": {
-      "#import": [
-        "fedora.25-corert",
-        "fedora.25-x64",
-        "fedora.25",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.26": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.26-corert": {
-      "#import": [
-        "fedora.26",
-        "fedora-corert"
-      ]
-    },
     "fedora.26-x64": {
       "#import": [
         "fedora.26",
         "fedora-x64"
       ]
     },
-    "fedora.26-x64-corert": {
-      "#import": [
-        "fedora.26-corert",
-        "fedora.26-x64",
-        "fedora.26",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.27": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.27-corert": {
-      "#import": [
-        "fedora.27",
-        "fedora-corert"
-      ]
-    },
     "fedora.27-x64": {
       "#import": [
         "fedora.27",
         "fedora-x64"
       ]
     },
-    "fedora.27-x64-corert": {
-      "#import": [
-        "fedora.27-corert",
-        "fedora.27-x64",
-        "fedora.27",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.28": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.28-corert": {
-      "#import": [
-        "fedora.28",
-        "fedora-corert"
-      ]
-    },
     "fedora.28-x64": {
       "#import": [
         "fedora.28",
         "fedora-x64"
       ]
     },
-    "fedora.28-x64-corert": {
-      "#import": [
-        "fedora.28-corert",
-        "fedora.28-x64",
-        "fedora.28",
-        "fedora-x64-corert"
-      ]
-    },
     "fedora.29": {
       "#import": [
         "fedora"
       ]
     },
-    "fedora.29-corert": {
-      "#import": [
-        "fedora.29",
-        "fedora-corert"
-      ]
-    },
     "fedora.29-x64": {
       "#import": [
         "fedora.29",
         "fedora-x64"
       ]
     },
-    "fedora.29-x64-corert": {
-      "#import": [
-        "fedora.29-corert",
-        "fedora.29-x64",
-        "fedora.29",
-        "fedora-x64-corert"
-      ]
-    },
     "freebsd": {
       "#import": [
         "unix"
       ]
     },
-    "freebsd-corert": {
-      "#import": [
-        "freebsd",
-        "unix-corert"
-      ]
-    },
     "freebsd-x64": {
       "#import": [
         "freebsd",
         "unix-x64"
       ]
     },
-    "freebsd-x64-corert": {
-      "#import": [
-        "freebsd-corert",
-        "freebsd-x64",
-        "unix-x64-corert"
-      ]
-    },
     "freebsd.11": {
       "#import": [
         "freebsd"
       ]
     },
-    "freebsd.11-corert": {
-      "#import": [
-        "freebsd.11",
-        "freebsd-corert"
-      ]
-    },
     "freebsd.11-x64": {
       "#import": [
         "freebsd.11",
         "freebsd-x64"
       ]
     },
-    "freebsd.11-x64-corert": {
-      "#import": [
-        "freebsd.11-corert",
-        "freebsd.11-x64",
-        "freebsd.11",
-        "freebsd-x64-corert"
-      ]
-    },
     "freebsd.11.0": {
       "#import": [
         "freebsd.11"
       ]
     },
-    "freebsd.11.0-corert": {
-      "#import": [
-        "freebsd.11.0",
-        "freebsd.11-corert"
-      ]
-    },
     "freebsd.11.0-x64": {
       "#import": [
         "freebsd.11.0",
         "freebsd.11-x64"
       ]
     },
-    "freebsd.11.0-x64-corert": {
-      "#import": [
-        "freebsd.11.0-corert",
-        "freebsd.11.0-x64",
-        "freebsd.11.0",
-        "freebsd.11-x64-corert"
-      ]
-    },
     "freebsd.11.1": {
       "#import": [
         "freebsd.11.0"
       ]
     },
-    "freebsd.11.1-corert": {
-      "#import": [
-        "freebsd.11.1",
-        "freebsd.11.0-corert"
-      ]
-    },
     "freebsd.11.1-x64": {
       "#import": [
         "freebsd.11.1",
         "freebsd.11.0-x64"
       ]
     },
-    "freebsd.11.1-x64-corert": {
-      "#import": [
-        "freebsd.11.1-corert",
-        "freebsd.11.1-x64",
-        "freebsd.11.1",
-        "freebsd.11.0-x64-corert"
-      ]
-    },
     "freebsd.11.2": {
       "#import": [
         "freebsd.11.1"
       ]
     },
-    "freebsd.11.2-corert": {
-      "#import": [
-        "freebsd.11.2",
-        "freebsd.11.1-corert"
-      ]
-    },
     "freebsd.11.2-x64": {
       "#import": [
         "freebsd.11.2",
         "freebsd.11.1-x64"
       ]
     },
-    "freebsd.11.2-x64-corert": {
-      "#import": [
-        "freebsd.11.2-corert",
-        "freebsd.11.2-x64",
-        "freebsd.11.2",
-        "freebsd.11.1-x64-corert"
-      ]
-    },
     "gentoo": {
       "#import": [
         "linux"
       ]
     },
-    "gentoo-corert": {
-      "#import": [
-        "gentoo",
-        "linux-corert"
-      ]
-    },
     "gentoo-x64": {
       "#import": [
         "gentoo",
         "linux-x64"
       ]
     },
-    "gentoo-x64-corert": {
-      "#import": [
-        "gentoo-corert",
-        "gentoo-x64",
-        "linux-x64-corert"
-      ]
-    },
     "linux": {
       "#import": [
         "unix"
@@ -816,45 +374,18 @@
         "unix-arm"
       ]
     },
-    "linux-arm-corert": {
-      "#import": [
-        "linux-corert",
-        "linux-arm",
-        "unix-arm-corert"
-      ]
-    },
     "linux-arm64": {
       "#import": [
         "linux",
         "unix-arm64"
       ]
     },
-    "linux-arm64-corert": {
-      "#import": [
-        "linux-corert",
-        "linux-arm64",
-        "unix-arm64-corert"
-      ]
-    },
     "linux-armel": {
       "#import": [
         "linux",
         "unix-armel"
       ]
     },
-    "linux-armel-corert": {
-      "#import": [
-        "linux-corert",
-        "linux-armel",
-        "unix-armel-corert"
-      ]
-    },
-    "linux-corert": {
-      "#import": [
-        "linux",
-        "unix-corert"
-      ]
-    },
     "linux-musl": {
       "#import": [
         "linux"
@@ -866,356 +397,158 @@
         "linux-arm"
       ]
     },
-    "linux-musl-arm-corert": {
-      "#import": [
-        "linux-musl-corert",
-        "linux-musl-arm",
-        "linux-arm-corert"
-      ]
-    },
-    "linux-musl-arm64": {
+    "linux-musl-arm64": {
       "#import": [
         "linux-musl",
         "linux-arm64"
       ]
     },
-    "linux-musl-arm64-corert": {
-      "#import": [
-        "linux-musl-corert",
-        "linux-musl-arm64",
-        "linux-arm64-corert"
-      ]
-    },
     "linux-musl-armel": {
       "#import": [
         "linux-musl",
         "linux-armel"
       ]
     },
-    "linux-musl-armel-corert": {
-      "#import": [
-        "linux-musl-corert",
-        "linux-musl-armel",
-        "linux-armel-corert"
-      ]
-    },
-    "linux-musl-corert": {
-      "#import": [
-        "linux-musl",
-        "linux-corert"
-      ]
-    },
     "linux-musl-x64": {
       "#import": [
         "linux-musl",
         "linux-x64"
       ]
     },
-    "linux-musl-x64-corert": {
-      "#import": [
-        "linux-musl-corert",
-        "linux-musl-x64",
-        "linux-x64-corert"
-      ]
-    },
     "linux-musl-x86": {
       "#import": [
         "linux-musl",
         "linux-x86"
       ]
     },
-    "linux-musl-x86-corert": {
-      "#import": [
-        "linux-musl-corert",
-        "linux-musl-x86",
-        "linux-x86-corert"
-      ]
-    },
     "linux-x64": {
       "#import": [
         "linux",
         "unix-x64"
       ]
     },
-    "linux-x64-corert": {
-      "#import": [
-        "linux-corert",
-        "linux-x64",
-        "unix-x64-corert"
-      ]
-    },
     "linux-x86": {
       "#import": [
         "linux",
         "unix-x86"
       ]
     },
-    "linux-x86-corert": {
-      "#import": [
-        "linux-corert",
-        "linux-x86",
-        "unix-x86-corert"
-      ]
-    },
     "linuxmint.17": {
       "#import": [
         "ubuntu.14.04"
       ]
     },
-    "linuxmint.17-corert": {
-      "#import": [
-        "linuxmint.17",
-        "ubuntu.14.04-corert"
-      ]
-    },
     "linuxmint.17-x64": {
       "#import": [
         "linuxmint.17",
         "ubuntu.14.04-x64"
       ]
     },
-    "linuxmint.17-x64-corert": {
-      "#import": [
-        "linuxmint.17-corert",
-        "linuxmint.17-x64",
-        "ubuntu.14.04-x64-corert"
-      ]
-    },
     "linuxmint.17.1": {
       "#import": [
         "linuxmint.17"
       ]
     },
-    "linuxmint.17.1-corert": {
-      "#import": [
-        "linuxmint.17.1",
-        "linuxmint.17-corert"
-      ]
-    },
     "linuxmint.17.1-x64": {
       "#import": [
         "linuxmint.17.1",
         "linuxmint.17-x64"
       ]
     },
-    "linuxmint.17.1-x64-corert": {
-      "#import": [
-        "linuxmint.17.1-corert",
-        "linuxmint.17.1-x64",
-        "linuxmint.17.1",
-        "linuxmint.17-x64-corert"
-      ]
-    },
     "linuxmint.17.2": {
       "#import": [
         "linuxmint.17.1"
       ]
     },
-    "linuxmint.17.2-corert": {
-      "#import": [
-        "linuxmint.17.2",
-        "linuxmint.17.1-corert"
-      ]
-    },
     "linuxmint.17.2-x64": {
       "#import": [
         "linuxmint.17.2",
         "linuxmint.17.1-x64"
       ]
     },
-    "linuxmint.17.2-x64-corert": {
-      "#import": [
-        "linuxmint.17.2-corert",
-        "linuxmint.17.2-x64",
-        "linuxmint.17.2",
-        "linuxmint.17.1-x64-corert"
-      ]
-    },
     "linuxmint.17.3": {
       "#import": [
         "linuxmint.17.2"
       ]
     },
-    "linuxmint.17.3-corert": {
-      "#import": [
-        "linuxmint.17.3",
-        "linuxmint.17.2-corert"
-      ]
-    },
     "linuxmint.17.3-x64": {
       "#import": [
         "linuxmint.17.3",
         "linuxmint.17.2-x64"
       ]
     },
-    "linuxmint.17.3-x64-corert": {
-      "#import": [
-        "linuxmint.17.3-corert",
-        "linuxmint.17.3-x64",
-        "linuxmint.17.3",
-        "linuxmint.17.2-x64-corert"
-      ]
-    },
     "linuxmint.18": {
       "#import": [
         "ubuntu.16.04"
       ]
     },
-    "linuxmint.18-corert": {
-      "#import": [
-        "linuxmint.18",
-        "ubuntu.16.04-corert"
-      ]
-    },
     "linuxmint.18-x64": {
       "#import": [
         "linuxmint.18",
         "ubuntu.16.04-x64"
       ]
     },
-    "linuxmint.18-x64-corert": {
-      "#import": [
-        "linuxmint.18-corert",
-        "linuxmint.18-x64",
-        "ubuntu.16.04-x64-corert"
-      ]
-    },
     "linuxmint.18.1": {
       "#import": [
         "linuxmint.18"
       ]
     },
-    "linuxmint.18.1-corert": {
-      "#import": [
-        "linuxmint.18.1",
-        "linuxmint.18-corert"
-      ]
-    },
     "linuxmint.18.1-x64": {
       "#import": [
         "linuxmint.18.1",
         "linuxmint.18-x64"
       ]
     },
-    "linuxmint.18.1-x64-corert": {
-      "#import": [
-        "linuxmint.18.1-corert",
-        "linuxmint.18.1-x64",
-        "linuxmint.18.1",
-        "linuxmint.18-x64-corert"
-      ]
-    },
     "linuxmint.18.2": {
       "#import": [
         "linuxmint.18.1"
       ]
     },
-    "linuxmint.18.2-corert": {
-      "#import": [
-        "linuxmint.18.2",
-        "linuxmint.18.1-corert"
-      ]
-    },
     "linuxmint.18.2-x64": {
       "#import": [
         "linuxmint.18.2",
         "linuxmint.18.1-x64"
       ]
     },
-    "linuxmint.18.2-x64-corert": {
-      "#import": [
-        "linuxmint.18.2-corert",
-        "linuxmint.18.2-x64",
-        "linuxmint.18.2",
-        "linuxmint.18.1-x64-corert"
-      ]
-    },
     "linuxmint.18.3": {
       "#import": [
         "linuxmint.18.2"
       ]
     },
-    "linuxmint.18.3-corert": {
-      "#import": [
-        "linuxmint.18.3",
-        "linuxmint.18.2-corert"
-      ]
-    },
     "linuxmint.18.3-x64": {
       "#import": [
         "linuxmint.18.3",
         "linuxmint.18.2-x64"
       ]
     },
-    "linuxmint.18.3-x64-corert": {
-      "#import": [
-        "linuxmint.18.3-corert",
-        "linuxmint.18.3-x64",
-        "linuxmint.18.3",
-        "linuxmint.18.2-x64-corert"
-      ]
-    },
     "linuxmint.19": {
       "#import": [
         "ubuntu.18.04"
       ]
     },
-    "linuxmint.19-corert": {
-      "#import": [
-        "linuxmint.19",
-        "ubuntu.18.04-corert"
-      ]
-    },
     "linuxmint.19-x64": {
       "#import": [
         "linuxmint.19",
         "ubuntu.18.04-x64"
       ]
     },
-    "linuxmint.19-x64-corert": {
-      "#import": [
-        "linuxmint.19-corert",
-        "linuxmint.19-x64",
-        "ubuntu.18.04-x64-corert"
-      ]
-    },
     "ol": {
       "#import": [
         "rhel"
       ]
     },
-    "ol-corert": {
-      "#import": [
-        "ol",
-        "rhel-corert"
-      ]
-    },
     "ol-x64": {
       "#import": [
         "ol",
         "rhel-x64"
       ]
     },
-    "ol-x64-corert": {
-      "#import": [
-        "ol-corert",
-        "ol-x64",
-        "rhel-x64-corert"
-      ]
-    },
     "ol.7": {
       "#import": [
         "ol",
         "rhel.7"
       ]
     },
-    "ol.7-corert": {
-      "#import": [
-        "ol.7",
-        "ol-corert",
-        "rhel.7-corert"
-      ]
-    },
     "ol.7-x64": {
       "#import": [
         "ol.7",
@@ -1223,27 +556,12 @@
         "rhel.7-x64"
       ]
     },
-    "ol.7-x64-corert": {
-      "#import": [
-        "ol.7-corert",
-        "ol.7-x64",
-        "ol.7",
-        "ol-x64-corert"
-      ]
-    },
     "ol.7.0": {
       "#import": [
         "ol.7",
         "rhel.7.0"
       ]
     },
-    "ol.7.0-corert": {
-      "#import": [
-        "ol.7.0",
-        "ol.7-corert",
-        "rhel.7.0-corert"
-      ]
-    },
     "ol.7.0-x64": {
       "#import": [
         "ol.7.0",
@@ -1251,27 +569,12 @@
         "rhel.7.0-x64"
       ]
     },
-    "ol.7.0-x64-corert": {
-      "#import": [
-        "ol.7.0-corert",
-        "ol.7.0-x64",
-        "ol.7.0",
-        "ol.7-x64-corert"
-      ]
-    },
     "ol.7.1": {
       "#import": [
         "ol.7.0",
         "rhel.7.1"
       ]
     },
-    "ol.7.1-corert": {
-      "#import": [
-        "ol.7.1",
-        "ol.7.0-corert",
-        "rhel.7.1-corert"
-      ]
-    },
     "ol.7.1-x64": {
       "#import": [
         "ol.7.1",
@@ -1279,27 +582,12 @@
         "rhel.7.1-x64"
       ]
     },
-    "ol.7.1-x64-corert": {
-      "#import": [
-        "ol.7.1-corert",
-        "ol.7.1-x64",
-        "ol.7.1",
-        "ol.7.0-x64-corert"
-      ]
-    },
     "ol.7.2": {
       "#import": [
         "ol.7.1",
         "rhel.7.2"
       ]
     },
-    "ol.7.2-corert": {
-      "#import": [
-        "ol.7.2",
-        "ol.7.1-corert",
-        "rhel.7.2-corert"
-      ]
-    },
     "ol.7.2-x64": {
       "#import": [
         "ol.7.2",
@@ -1307,27 +595,12 @@
         "rhel.7.2-x64"
       ]
     },
-    "ol.7.2-x64-corert": {
-      "#import": [
-        "ol.7.2-corert",
-        "ol.7.2-x64",
-        "ol.7.2",
-        "ol.7.1-x64-corert"
-      ]
-    },
     "ol.7.3": {
       "#import": [
         "ol.7.2",
         "rhel.7.3"
       ]
     },
-    "ol.7.3-corert": {
-      "#import": [
-        "ol.7.3",
-        "ol.7.2-corert",
-        "rhel.7.3-corert"
-      ]
-    },
     "ol.7.3-x64": {
       "#import": [
         "ol.7.3",
@@ -1335,27 +608,12 @@
         "rhel.7.3-x64"
       ]
     },
-    "ol.7.3-x64-corert": {
-      "#import": [
-        "ol.7.3-corert",
-        "ol.7.3-x64",
-        "ol.7.3",
-        "ol.7.2-x64-corert"
-      ]
-    },
     "ol.7.4": {
       "#import": [
         "ol.7.3",
         "rhel.7.4"
       ]
     },
-    "ol.7.4-corert": {
-      "#import": [
-        "ol.7.4",
-        "ol.7.3-corert",
-        "rhel.7.4-corert"
-      ]
-    },
     "ol.7.4-x64": {
       "#import": [
         "ol.7.4",
@@ -1363,27 +621,12 @@
         "rhel.7.4-x64"
       ]
     },
-    "ol.7.4-x64-corert": {
-      "#import": [
-        "ol.7.4-corert",
-        "ol.7.4-x64",
-        "ol.7.4",
-        "ol.7.3-x64-corert"
-      ]
-    },
     "ol.7.5": {
       "#import": [
         "ol.7.4",
         "rhel.7.5"
       ]
     },
-    "ol.7.5-corert": {
-      "#import": [
-        "ol.7.5",
-        "ol.7.4-corert",
-        "rhel.7.5-corert"
-      ]
-    },
     "ol.7.5-x64": {
       "#import": [
         "ol.7.5",
@@ -1391,27 +634,12 @@
         "rhel.7.5-x64"
       ]
     },
-    "ol.7.5-x64-corert": {
-      "#import": [
-        "ol.7.5-corert",
-        "ol.7.5-x64",
-        "ol.7.5",
-        "ol.7.4-x64-corert"
-      ]
-    },
     "ol.7.6": {
       "#import": [
         "ol.7.5",
         "rhel.7.6"
       ]
     },
-    "ol.7.6-corert": {
-      "#import": [
-        "ol.7.6",
-        "ol.7.5-corert",
-        "rhel.7.6-corert"
-      ]
-    },
     "ol.7.6-x64": {
       "#import": [
         "ol.7.6",
@@ -1419,710 +647,314 @@
         "rhel.7.6-x64"
       ]
     },
-    "ol.7.6-x64-corert": {
-      "#import": [
-        "ol.7.6-corert",
-        "ol.7.6-x64",
-        "ol.7.6",
-        "ol.7.5-x64-corert"
-      ]
-    },
     "opensuse": {
       "#import": [
         "linux"
       ]
     },
-    "opensuse-corert": {
-      "#import": [
-        "opensuse",
-        "linux-corert"
-      ]
-    },
     "opensuse-x64": {
       "#import": [
         "opensuse",
         "linux-x64"
       ]
     },
-    "opensuse-x64-corert": {
-      "#import": [
-        "opensuse-corert",
-        "opensuse-x64",
-        "linux-x64-corert"
-      ]
-    },
     "opensuse.13.2": {
       "#import": [
         "opensuse"
       ]
     },
-    "opensuse.13.2-corert": {
-      "#import": [
-        "opensuse.13.2",
-        "opensuse-corert"
-      ]
-    },
     "opensuse.13.2-x64": {
       "#import": [
         "opensuse.13.2",
         "opensuse-x64"
       ]
     },
-    "opensuse.13.2-x64-corert": {
-      "#import": [
-        "opensuse.13.2-corert",
-        "opensuse.13.2-x64",
-        "opensuse.13.2",
-        "opensuse-x64-corert"
-      ]
-    },
     "opensuse.15.0": {
       "#import": [
         "opensuse"
       ]
     },
-    "opensuse.15.0-corert": {
-      "#import": [
-        "opensuse.15.0",
-        "opensuse-corert"
-      ]
-    },
     "opensuse.15.0-x64": {
       "#import": [
         "opensuse.15.0",
         "opensuse-x64"
       ]
     },
-    "opensuse.15.0-x64-corert": {
-      "#import": [
-        "opensuse.15.0-corert",
-        "opensuse.15.0-x64",
-        "opensuse.15.0",
-        "opensuse-x64-corert"
-      ]
-    },
     "opensuse.42.1": {
       "#import": [
         "opensuse"
       ]
     },
-    "opensuse.42.1-corert": {
-      "#import": [
-        "opensuse.42.1",
-        "opensuse-corert"
-      ]
-    },
     "opensuse.42.1-x64": {
       "#import": [
         "opensuse.42.1",
         "opensuse-x64"
       ]
     },
-    "opensuse.42.1-x64-corert": {
-      "#import": [
-        "opensuse.42.1-corert",
-        "opensuse.42.1-x64",
-        "opensuse.42.1",
-        "opensuse-x64-corert"
-      ]
-    },
     "opensuse.42.2": {
       "#import": [
         "opensuse"
       ]
     },
-    "opensuse.42.2-corert": {
-      "#import": [
-        "opensuse.42.2",
-        "opensuse-corert"
-      ]
-    },
     "opensuse.42.2-x64": {
       "#import": [
         "opensuse.42.2",
         "opensuse-x64"
       ]
     },
-    "opensuse.42.2-x64-corert": {
-      "#import": [
-        "opensuse.42.2-corert",
-        "opensuse.42.2-x64",
-        "opensuse.42.2",
-        "opensuse-x64-corert"
-      ]
-    },
     "opensuse.42.3": {
       "#import": [
         "opensuse"
       ]
     },
-    "opensuse.42.3-corert": {
-      "#import": [
-        "opensuse.42.3",
-        "opensuse-corert"
-      ]
-    },
     "opensuse.42.3-x64": {
       "#import": [
         "opensuse.42.3",
         "opensuse-x64"
       ]
     },
-    "opensuse.42.3-x64-corert": {
-      "#import": [
-        "opensuse.42.3-corert",
-        "opensuse.42.3-x64",
-        "opensuse.42.3",
-        "opensuse-x64-corert"
-      ]
-    },
     "osx": {
       "#import": [
         "unix"
       ]
     },
-    "osx-corert": {
-      "#import": [
-        "osx",
-        "unix-corert"
-      ]
-    },
     "osx-x64": {
       "#import": [
         "osx",
         "unix-x64"
       ]
     },
-    "osx-x64-corert": {
-      "#import": [
-        "osx-corert",
-        "osx-x64",
-        "unix-x64-corert"
-      ]
-    },
     "osx.10.10": {
       "#import": [
         "osx"
       ]
     },
-    "osx.10.10-corert": {
-      "#import": [
-        "osx.10.10",
-        "osx-corert"
-      ]
-    },
     "osx.10.10-x64": {
       "#import": [
         "osx.10.10",
         "osx-x64"
       ]
     },
-    "osx.10.10-x64-corert": {
-      "#import": [
-        "osx.10.10-corert",
-        "osx.10.10-x64",
-        "osx.10.10",
-        "osx-x64-corert"
-      ]
-    },
     "osx.10.11": {
       "#import": [
         "osx.10.10"
       ]
     },
-    "osx.10.11-corert": {
-      "#import": [
-        "osx.10.11",
-        "osx.10.10-corert"
-      ]
-    },
     "osx.10.11-x64": {
       "#import": [
         "osx.10.11",
         "osx.10.10-x64"
       ]
     },
-    "osx.10.11-x64-corert": {
-      "#import": [
-        "osx.10.11-corert",
-        "osx.10.11-x64",
-        "osx.10.11",
-        "osx.10.10-x64-corert"
-      ]
-    },
     "osx.10.12": {
       "#import": [
         "osx.10.11"
       ]
     },
-    "osx.10.12-corert": {
-      "#import": [
-        "osx.10.12",
-        "osx.10.11-corert"
-      ]
-    },
     "osx.10.12-x64": {
       "#import": [
         "osx.10.12",
         "osx.10.11-x64"
       ]
     },
-    "osx.10.12-x64-corert": {
-      "#import": [
-        "osx.10.12-corert",
-        "osx.10.12-x64",
-        "osx.10.12",
-        "osx.10.11-x64-corert"
-      ]
-    },
     "osx.10.13": {
       "#import": [
         "osx.10.12"
       ]
     },
-    "osx.10.13-corert": {
-      "#import": [
-        "osx.10.13",
-        "osx.10.12-corert"
-      ]
-    },
     "osx.10.13-x64": {
       "#import": [
         "osx.10.13",
         "osx.10.12-x64"
       ]
     },
-    "osx.10.13-x64-corert": {
-      "#import": [
-        "osx.10.13-corert",
-        "osx.10.13-x64",
-        "osx.10.13",
-        "osx.10.12-x64-corert"
-      ]
-    },
     "osx.10.14": {
       "#import": [
         "osx.10.13"
       ]
     },
-    "osx.10.14-corert": {
-      "#import": [
-        "osx.10.14",
-        "osx.10.13-corert"
-      ]
-    },
     "osx.10.14-x64": {
       "#import": [
         "osx.10.14",
         "osx.10.13-x64"
       ]
     },
-    "osx.10.14-x64-corert": {
-      "#import": [
-        "osx.10.14-corert",
-        "osx.10.14-x64",
-        "osx.10.14",
-        "osx.10.13-x64-corert"
-      ]
-    },
     "rhel": {
       "#import": [
         "linux"
       ]
     },
-    "rhel-corert": {
-      "#import": [
-        "rhel",
-        "linux-corert"
-      ]
-    },
     "rhel-x64": {
       "#import": [
         "rhel",
         "linux-x64"
       ]
     },
-    "rhel-x64-corert": {
-      "#import": [
-        "rhel-corert",
-        "rhel-x64",
-        "linux-x64-corert"
-      ]
-    },
     "rhel.6": {
       "#import": [
         "rhel"
       ]
     },
-    "rhel.6-corert": {
-      "#import": [
-        "rhel.6",
-        "rhel-corert"
-      ]
-    },
     "rhel.6-x64": {
       "#import": [
         "rhel.6",
         "rhel-x64"
       ]
     },
-    "rhel.6-x64-corert": {
-      "#import": [
-        "rhel.6-corert",
-        "rhel.6-x64",
-        "rhel.6",
-        "rhel-x64-corert"
-      ]
-    },
     "rhel.7": {
       "#import": [
         "rhel"
       ]
     },
-    "rhel.7-corert": {
-      "#import": [
-        "rhel.7",
-        "rhel-corert"
-      ]
-    },
     "rhel.7-x64": {
       "#import": [
         "rhel.7",
         "rhel-x64"
       ]
     },
-    "rhel.7-x64-corert": {
-      "#import": [
-        "rhel.7-corert",
-        "rhel.7-x64",
-        "rhel.7",
-        "rhel-x64-corert"
-      ]
-    },
     "rhel.7.0": {
       "#import": [
         "rhel.7"
       ]
     },
-    "rhel.7.0-corert": {
-      "#import": [
-        "rhel.7.0",
-        "rhel.7-corert"
-      ]
-    },
     "rhel.7.0-x64": {
       "#import": [
         "rhel.7.0",
         "rhel.7-x64"
       ]
     },
-    "rhel.7.0-x64-corert": {
-      "#import": [
-        "rhel.7.0-corert",
-        "rhel.7.0-x64",
-        "rhel.7.0",
-        "rhel.7-x64-corert"
-      ]
-    },
     "rhel.7.1": {
       "#import": [
         "rhel.7.0"
       ]
     },
-    "rhel.7.1-corert": {
-      "#import": [
-        "rhel.7.1",
-        "rhel.7.0-corert"
-      ]
-    },
     "rhel.7.1-x64": {
       "#import": [
         "rhel.7.1",
         "rhel.7.0-x64"
       ]
     },
-    "rhel.7.1-x64-corert": {
-      "#import": [
-        "rhel.7.1-corert",
-        "rhel.7.1-x64",
-        "rhel.7.1",
-        "rhel.7.0-x64-corert"
-      ]
-    },
     "rhel.7.2": {
       "#import": [
         "rhel.7.1"
       ]
     },
-    "rhel.7.2-corert": {
-      "#import": [
-        "rhel.7.2",
-        "rhel.7.1-corert"
-      ]
-    },
     "rhel.7.2-x64": {
       "#import": [
         "rhel.7.2",
         "rhel.7.1-x64"
       ]
     },
-    "rhel.7.2-x64-corert": {
-      "#import": [
-        "rhel.7.2-corert",
-        "rhel.7.2-x64",
-        "rhel.7.2",
-        "rhel.7.1-x64-corert"
-      ]
-    },
     "rhel.7.3": {
       "#import": [
         "rhel.7.2"
       ]
     },
-    "rhel.7.3-corert": {
-      "#import": [
-        "rhel.7.3",
-        "rhel.7.2-corert"
-      ]
-    },
     "rhel.7.3-x64": {
       "#import": [
         "rhel.7.3",
         "rhel.7.2-x64"
       ]
     },
-    "rhel.7.3-x64-corert": {
-      "#import": [
-        "rhel.7.3-corert",
-        "rhel.7.3-x64",
-        "rhel.7.3",
-        "rhel.7.2-x64-corert"
-      ]
-    },
     "rhel.7.4": {
       "#import": [
         "rhel.7.3"
       ]
     },
-    "rhel.7.4-corert": {
-      "#import": [
-        "rhel.7.4",
-        "rhel.7.3-corert"
-      ]
-    },
     "rhel.7.4-x64": {
       "#import": [
         "rhel.7.4",
         "rhel.7.3-x64"
       ]
     },
-    "rhel.7.4-x64-corert": {
-      "#import": [
-        "rhel.7.4-corert",
-        "rhel.7.4-x64",
-        "rhel.7.4",
-        "rhel.7.3-x64-corert"
-      ]
-    },
     "rhel.7.5": {
       "#import": [
         "rhel.7.4"
       ]
     },
-    "rhel.7.5-corert": {
-      "#import": [
-        "rhel.7.5",
-        "rhel.7.4-corert"
-      ]
-    },
     "rhel.7.5-x64": {
       "#import": [
         "rhel.7.5",
         "rhel.7.4-x64"
       ]
     },
-    "rhel.7.5-x64-corert": {
-      "#import": [
-        "rhel.7.5-corert",
-        "rhel.7.5-x64",
-        "rhel.7.5",
-        "rhel.7.4-x64-corert"
-      ]
-    },
     "rhel.7.6": {
       "#import": [
         "rhel.7.5"
       ]
     },
-    "rhel.7.6-corert": {
-      "#import": [
-        "rhel.7.6",
-        "rhel.7.5-corert"
-      ]
-    },
     "rhel.7.6-x64": {
       "#import": [
         "rhel.7.6",
         "rhel.7.5-x64"
       ]
     },
-    "rhel.7.6-x64-corert": {
-      "#import": [
-        "rhel.7.6-corert",
-        "rhel.7.6-x64",
-        "rhel.7.6",
-        "rhel.7.5-x64-corert"
-      ]
-    },
     "sles": {
       "#import": [
         "linux"
       ]
     },
-    "sles-corert": {
-      "#import": [
-        "sles",
-        "linux-corert"
-      ]
-    },
     "sles-x64": {
       "#import": [
         "sles",
         "linux-x64"
       ]
     },
-    "sles-x64-corert": {
-      "#import": [
-        "sles-corert",
-        "sles-x64",
-        "linux-x64-corert"
-      ]
-    },
     "sles.12": {
       "#import": [
         "sles"
       ]
     },
-    "sles.12-corert": {
-      "#import": [
-        "sles.12",
-        "sles-corert"
-      ]
-    },
     "sles.12-x64": {
       "#import": [
         "sles.12",
         "sles-x64"
       ]
     },
-    "sles.12-x64-corert": {
-      "#import": [
-        "sles.12-corert",
-        "sles.12-x64",
-        "sles.12",
-        "sles-x64-corert"
-      ]
-    },
     "sles.12.1": {
       "#import": [
         "sles.12"
       ]
     },
-    "sles.12.1-corert": {
-      "#import": [
-        "sles.12.1",
-        "sles.12-corert"
-      ]
-    },
     "sles.12.1-x64": {
       "#import": [
         "sles.12.1",
         "sles.12-x64"
       ]
     },
-    "sles.12.1-x64-corert": {
-      "#import": [
-        "sles.12.1-corert",
-        "sles.12.1-x64",
-        "sles.12.1",
-        "sles.12-x64-corert"
-      ]
-    },
     "sles.12.2": {
       "#import": [
         "sles.12.1"
       ]
     },
-    "sles.12.2-corert": {
-      "#import": [
-        "sles.12.2",
-        "sles.12.1-corert"
-      ]
-    },
     "sles.12.2-x64": {
       "#import": [
         "sles.12.2",
         "sles.12.1-x64"
       ]
     },
-    "sles.12.2-x64-corert": {
-      "#import": [
-        "sles.12.2-corert",
-        "sles.12.2-x64",
-        "sles.12.2",
-        "sles.12.1-x64-corert"
-      ]
-    },
     "sles.12.3": {
       "#import": [
         "sles.12.2"
       ]
     },
-    "sles.12.3-corert": {
-      "#import": [
-        "sles.12.3",
-        "sles.12.2-corert"
-      ]
-    },
     "sles.12.3-x64": {
       "#import": [
         "sles.12.3",
         "sles.12.2-x64"
       ]
     },
-    "sles.12.3-x64-corert": {
-      "#import": [
-        "sles.12.3-corert",
-        "sles.12.3-x64",
-        "sles.12.3",
-        "sles.12.2-x64-corert"
-      ]
-    },
     "sles.15": {
       "#import": [
         "sles.12.3"
       ]
     },
-    "sles.15-corert": {
-      "#import": [
-        "sles.15",
-        "sles.12.3-corert"
-      ]
-    },
     "sles.15-x64": {
       "#import": [
         "sles.15",
         "sles.12.3-x64"
       ]
     },
-    "sles.15-x64-corert": {
-      "#import": [
-        "sles.15-corert",
-        "sles.15-x64",
-        "sles.15",
-        "sles.12.3-x64-corert"
-      ]
-    },
     "tizen": {
       "#import": [
         "linux"
@@ -2134,32 +966,12 @@
         "linux-armel"
       ]
     },
-    "tizen-armel-corert": {
-      "#import": [
-        "tizen-corert",
-        "tizen-armel",
-        "linux-armel-corert"
-      ]
-    },
-    "tizen-corert": {
-      "#import": [
-        "tizen",
-        "linux-corert"
-      ]
-    },
     "tizen-x86": {
       "#import": [
         "tizen",
         "linux-x86"
       ]
     },
-    "tizen-x86-corert": {
-      "#import": [
-        "tizen-corert",
-        "tizen-x86",
-        "linux-x86-corert"
-      ]
-    },
     "tizen.4.0.0": {
       "#import": [
         "tizen"
@@ -2171,34 +983,12 @@
         "tizen-armel"
       ]
     },
-    "tizen.4.0.0-armel-corert": {
-      "#import": [
-        "tizen.4.0.0-corert",
-        "tizen.4.0.0-armel",
-        "tizen.4.0.0",
-        "tizen-armel-corert"
-      ]
-    },
-    "tizen.4.0.0-corert": {
-      "#import": [
-        "tizen.4.0.0",
-        "tizen-corert"
-      ]
-    },
     "tizen.4.0.0-x86": {
       "#import": [
         "tizen.4.0.0",
         "tizen-x86"
       ]
     },
-    "tizen.4.0.0-x86-corert": {
-      "#import": [
-        "tizen.4.0.0-corert",
-        "tizen.4.0.0-x86",
-        "tizen.4.0.0",
-        "tizen-x86-corert"
-      ]
-    },
     "tizen.5.0.0": {
       "#import": [
         "tizen.4.0.0"
@@ -2210,34 +1000,12 @@
         "tizen.4.0.0-armel"
       ]
     },
-    "tizen.5.0.0-armel-corert": {
-      "#import": [
-        "tizen.5.0.0-corert",
-        "tizen.5.0.0-armel",
-        "tizen.5.0.0",
-        "tizen.4.0.0-armel-corert"
-      ]
-    },
-    "tizen.5.0.0-corert": {
-      "#import": [
-        "tizen.5.0.0",
-        "tizen.4.0.0-corert"
-      ]
-    },
     "tizen.5.0.0-x86": {
       "#import": [
         "tizen.5.0.0",
         "tizen.4.0.0-x86"
       ]
     },
-    "tizen.5.0.0-x86-corert": {
-      "#import": [
-        "tizen.5.0.0-corert",
-        "tizen.5.0.0-x86",
-        "tizen.5.0.0",
-        "tizen.4.0.0-x86-corert"
-      ]
-    },
     "ubuntu": {
       "#import": [
         "debian"
@@ -2249,58 +1017,24 @@
         "debian-arm"
       ]
     },
-    "ubuntu-arm-corert": {
-      "#import": [
-        "ubuntu-corert",
-        "ubuntu-arm",
-        "debian-arm-corert"
-      ]
-    },
     "ubuntu-arm64": {
       "#import": [
         "ubuntu",
         "debian-arm64"
       ]
     },
-    "ubuntu-arm64-corert": {
-      "#import": [
-        "ubuntu-corert",
-        "ubuntu-arm64",
-        "debian-arm64-corert"
-      ]
-    },
-    "ubuntu-corert": {
-      "#import": [
-        "ubuntu",
-        "debian-corert"
-      ]
-    },
     "ubuntu-x64": {
       "#import": [
         "ubuntu",
         "debian-x64"
       ]
     },
-    "ubuntu-x64-corert": {
-      "#import": [
-        "ubuntu-corert",
-        "ubuntu-x64",
-        "debian-x64-corert"
-      ]
-    },
     "ubuntu-x86": {
       "#import": [
         "ubuntu",
         "debian-x86"
       ]
     },
-    "ubuntu-x86-corert": {
-      "#import": [
-        "ubuntu-corert",
-        "ubuntu-x86",
-        "debian-x86-corert"
-      ]
-    },
     "ubuntu.14.04": {
       "#import": [
         "ubuntu"
@@ -2312,48 +1046,18 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.14.04-arm-corert": {
-      "#import": [
-        "ubuntu.14.04-corert",
-        "ubuntu.14.04-arm",
-        "ubuntu.14.04",
-        "ubuntu-arm-corert"
-      ]
-    },
-    "ubuntu.14.04-corert": {
-      "#import": [
-        "ubuntu.14.04",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.14.04-x64": {
       "#import": [
         "ubuntu.14.04",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.14.04-x64-corert": {
-      "#import": [
-        "ubuntu.14.04-corert",
-        "ubuntu.14.04-x64",
-        "ubuntu.14.04",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.14.04-x86": {
       "#import": [
         "ubuntu.14.04",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.14.04-x86-corert": {
-      "#import": [
-        "ubuntu.14.04-corert",
-        "ubuntu.14.04-x86",
-        "ubuntu.14.04",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.14.10": {
       "#import": [
         "ubuntu"
@@ -2365,48 +1069,18 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.14.10-arm-corert": {
-      "#import": [
-        "ubuntu.14.10-corert",
-        "ubuntu.14.10-arm",
-        "ubuntu.14.10",
-        "ubuntu-arm-corert"
-      ]
-    },
-    "ubuntu.14.10-corert": {
-      "#import": [
-        "ubuntu.14.10",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.14.10-x64": {
       "#import": [
         "ubuntu.14.10",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.14.10-x64-corert": {
-      "#import": [
-        "ubuntu.14.10-corert",
-        "ubuntu.14.10-x64",
-        "ubuntu.14.10",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.14.10-x86": {
       "#import": [
         "ubuntu.14.10",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.14.10-x86-corert": {
-      "#import": [
-        "ubuntu.14.10-corert",
-        "ubuntu.14.10-x86",
-        "ubuntu.14.10",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.15.04": {
       "#import": [
         "ubuntu"
@@ -2418,46 +1092,16 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.15.04-arm-corert": {
-      "#import": [
-        "ubuntu.15.04-corert",
-        "ubuntu.15.04-arm",
-        "ubuntu.15.04",
-        "ubuntu-arm-corert"
-      ]
-    },
-    "ubuntu.15.04-corert": {
-      "#import": [
-        "ubuntu.15.04",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.15.04-x64": {
       "#import": [
         "ubuntu.15.04",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.15.04-x64-corert": {
-      "#import": [
-        "ubuntu.15.04-corert",
-        "ubuntu.15.04-x64",
-        "ubuntu.15.04",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.15.04-x86": {
       "#import": [
         "ubuntu.15.04",
-        "ubuntu-x86"
-      ]
-    },
-    "ubuntu.15.04-x86-corert": {
-      "#import": [
-        "ubuntu.15.04-corert",
-        "ubuntu.15.04-x86",
-        "ubuntu.15.04",
-        "ubuntu-x86-corert"
+        "ubuntu-x86"
       ]
     },
     "ubuntu.15.10": {
@@ -2471,48 +1115,18 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.15.10-arm-corert": {
-      "#import": [
-        "ubuntu.15.10-corert",
-        "ubuntu.15.10-arm",
-        "ubuntu.15.10",
-        "ubuntu-arm-corert"
-      ]
-    },
-    "ubuntu.15.10-corert": {
-      "#import": [
-        "ubuntu.15.10",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.15.10-x64": {
       "#import": [
         "ubuntu.15.10",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.15.10-x64-corert": {
-      "#import": [
-        "ubuntu.15.10-corert",
-        "ubuntu.15.10-x64",
-        "ubuntu.15.10",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.15.10-x86": {
       "#import": [
         "ubuntu.15.10",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.15.10-x86-corert": {
-      "#import": [
-        "ubuntu.15.10-corert",
-        "ubuntu.15.10-x86",
-        "ubuntu.15.10",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.16.04": {
       "#import": [
         "ubuntu"
@@ -2524,62 +1138,24 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.16.04-arm-corert": {
-      "#import": [
-        "ubuntu.16.04-corert",
-        "ubuntu.16.04-arm",
-        "ubuntu.16.04",
-        "ubuntu-arm-corert"
-      ]
-    },
     "ubuntu.16.04-arm64": {
       "#import": [
         "ubuntu.16.04",
         "ubuntu-arm64"
       ]
     },
-    "ubuntu.16.04-arm64-corert": {
-      "#import": [
-        "ubuntu.16.04-corert",
-        "ubuntu.16.04-arm64",
-        "ubuntu.16.04",
-        "ubuntu-arm64-corert"
-      ]
-    },
-    "ubuntu.16.04-corert": {
-      "#import": [
-        "ubuntu.16.04",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.16.04-x64": {
       "#import": [
         "ubuntu.16.04",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.16.04-x64-corert": {
-      "#import": [
-        "ubuntu.16.04-corert",
-        "ubuntu.16.04-x64",
-        "ubuntu.16.04",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.16.04-x86": {
       "#import": [
         "ubuntu.16.04",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.16.04-x86-corert": {
-      "#import": [
-        "ubuntu.16.04-corert",
-        "ubuntu.16.04-x86",
-        "ubuntu.16.04",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.16.10": {
       "#import": [
         "ubuntu"
@@ -2591,62 +1167,24 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.16.10-arm-corert": {
-      "#import": [
-        "ubuntu.16.10-corert",
-        "ubuntu.16.10-arm",
-        "ubuntu.16.10",
-        "ubuntu-arm-corert"
-      ]
-    },
     "ubuntu.16.10-arm64": {
       "#import": [
         "ubuntu.16.10",
         "ubuntu-arm64"
       ]
     },
-    "ubuntu.16.10-arm64-corert": {
-      "#import": [
-        "ubuntu.16.10-corert",
-        "ubuntu.16.10-arm64",
-        "ubuntu.16.10",
-        "ubuntu-arm64-corert"
-      ]
-    },
-    "ubuntu.16.10-corert": {
-      "#import": [
-        "ubuntu.16.10",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.16.10-x64": {
       "#import": [
         "ubuntu.16.10",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.16.10-x64-corert": {
-      "#import": [
-        "ubuntu.16.10-corert",
-        "ubuntu.16.10-x64",
-        "ubuntu.16.10",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.16.10-x86": {
       "#import": [
         "ubuntu.16.10",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.16.10-x86-corert": {
-      "#import": [
-        "ubuntu.16.10-corert",
-        "ubuntu.16.10-x86",
-        "ubuntu.16.10",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.17.04": {
       "#import": [
         "ubuntu"
@@ -2658,62 +1196,24 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.17.04-arm-corert": {
-      "#import": [
-        "ubuntu.17.04-corert",
-        "ubuntu.17.04-arm",
-        "ubuntu.17.04",
-        "ubuntu-arm-corert"
-      ]
-    },
     "ubuntu.17.04-arm64": {
       "#import": [
         "ubuntu.17.04",
         "ubuntu-arm64"
       ]
     },
-    "ubuntu.17.04-arm64-corert": {
-      "#import": [
-        "ubuntu.17.04-corert",
-        "ubuntu.17.04-arm64",
-        "ubuntu.17.04",
-        "ubuntu-arm64-corert"
-      ]
-    },
-    "ubuntu.17.04-corert": {
-      "#import": [
-        "ubuntu.17.04",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.17.04-x64": {
       "#import": [
         "ubuntu.17.04",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.17.04-x64-corert": {
-      "#import": [
-        "ubuntu.17.04-corert",
-        "ubuntu.17.04-x64",
-        "ubuntu.17.04",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.17.04-x86": {
       "#import": [
         "ubuntu.17.04",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.17.04-x86-corert": {
-      "#import": [
-        "ubuntu.17.04-corert",
-        "ubuntu.17.04-x86",
-        "ubuntu.17.04",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.17.10": {
       "#import": [
         "ubuntu"
@@ -2725,62 +1225,24 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.17.10-arm-corert": {
-      "#import": [
-        "ubuntu.17.10-corert",
-        "ubuntu.17.10-arm",
-        "ubuntu.17.10",
-        "ubuntu-arm-corert"
-      ]
-    },
     "ubuntu.17.10-arm64": {
       "#import": [
         "ubuntu.17.10",
         "ubuntu-arm64"
       ]
     },
-    "ubuntu.17.10-arm64-corert": {
-      "#import": [
-        "ubuntu.17.10-corert",
-        "ubuntu.17.10-arm64",
-        "ubuntu.17.10",
-        "ubuntu-arm64-corert"
-      ]
-    },
-    "ubuntu.17.10-corert": {
-      "#import": [
-        "ubuntu.17.10",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.17.10-x64": {
       "#import": [
         "ubuntu.17.10",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.17.10-x64-corert": {
-      "#import": [
-        "ubuntu.17.10-corert",
-        "ubuntu.17.10-x64",
-        "ubuntu.17.10",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.17.10-x86": {
       "#import": [
         "ubuntu.17.10",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.17.10-x86-corert": {
-      "#import": [
-        "ubuntu.17.10-corert",
-        "ubuntu.17.10-x86",
-        "ubuntu.17.10",
-        "ubuntu-x86-corert"
-      ]
-    },
     "ubuntu.18.04": {
       "#import": [
         "ubuntu"
@@ -2792,62 +1254,24 @@
         "ubuntu-arm"
       ]
     },
-    "ubuntu.18.04-arm-corert": {
-      "#import": [
-        "ubuntu.18.04-corert",
-        "ubuntu.18.04-arm",
-        "ubuntu.18.04",
-        "ubuntu-arm-corert"
-      ]
-    },
     "ubuntu.18.04-arm64": {
       "#import": [
         "ubuntu.18.04",
         "ubuntu-arm64"
       ]
     },
-    "ubuntu.18.04-arm64-corert": {
-      "#import": [
-        "ubuntu.18.04-corert",
-        "ubuntu.18.04-arm64",
-        "ubuntu.18.04",
-        "ubuntu-arm64-corert"
-      ]
-    },
-    "ubuntu.18.04-corert": {
-      "#import": [
-        "ubuntu.18.04",
-        "ubuntu-corert"
-      ]
-    },
     "ubuntu.18.04-x64": {
       "#import": [
         "ubuntu.18.04",
         "ubuntu-x64"
       ]
     },
-    "ubuntu.18.04-x64-corert": {
-      "#import": [
-        "ubuntu.18.04-corert",
-        "ubuntu.18.04-x64",
-        "ubuntu.18.04",
-        "ubuntu-x64-corert"
-      ]
-    },
     "ubuntu.18.04-x86": {
       "#import": [
         "ubuntu.18.04",
         "ubuntu-x86"
       ]
     },
-    "ubuntu.18.04-x86-corert": {
-      "#import": [
-        "ubuntu.18.04-corert",
-        "ubuntu.18.04-x86",
-        "ubuntu.18.04",
-        "ubuntu-x86-corert"
-      ]
-    },
     "unix": {
       "#import": [
         "any"
@@ -2858,62 +1282,26 @@
         "unix"
       ]
     },
-    "unix-arm-corert": {
-      "#import": [
-        "unix-corert",
-        "unix-arm"
-      ]
-    },
     "unix-arm64": {
       "#import": [
         "unix"
       ]
     },
-    "unix-arm64-corert": {
-      "#import": [
-        "unix-corert",
-        "unix-arm64"
-      ]
-    },
     "unix-armel": {
       "#import": [
         "unix"
       ]
     },
-    "unix-armel-corert": {
-      "#import": [
-        "unix-corert",
-        "unix-armel"
-      ]
-    },
-    "unix-corert": {
-      "#import": [
-        "unix",
-        "corert"
-      ]
-    },
     "unix-x64": {
       "#import": [
         "unix"
       ]
     },
-    "unix-x64-corert": {
-      "#import": [
-        "unix-corert",
-        "unix-x64"
-      ]
-    },
     "unix-x86": {
       "#import": [
         "unix"
       ]
     },
-    "unix-x86-corert": {
-      "#import": [
-        "unix-corert",
-        "unix-x86"
-      ]
-    },
     "win": {
       "#import": [
         "any"
@@ -2936,12 +1324,6 @@
         "win-arm"
       ]
     },
-    "win-arm-corert": {
-      "#import": [
-        "win-corert",
-        "win-arm"
-      ]
-    },
     "win-arm64": {
       "#import": [
         "win"
@@ -2953,18 +1335,6 @@
         "win-arm64"
       ]
     },
-    "win-arm64-corert": {
-      "#import": [
-        "win-corert",
-        "win-arm64"
-      ]
-    },
-    "win-corert": {
-      "#import": [
-        "win",
-        "corert"
-      ]
-    },
     "win-x64": {
       "#import": [
         "win"
@@ -2976,12 +1346,6 @@
         "win-x64"
       ]
     },
-    "win-x64-corert": {
-      "#import": [
-        "win-corert",
-        "win-x64"
-      ]
-    },
     "win-x86": {
       "#import": [
         "win"
@@ -2993,12 +1357,6 @@
         "win-x86"
       ]
     },
-    "win-x86-corert": {
-      "#import": [
-        "win-corert",
-        "win-x86"
-      ]
-    },
     "win10": {
       "#import": [
         "win81"
@@ -3024,14 +1382,6 @@
         "win81-arm-aot"
       ]
     },
-    "win10-arm-corert": {
-      "#import": [
-        "win10-corert",
-        "win10-arm",
-        "win10",
-        "win81-arm-corert"
-      ]
-    },
     "win10-arm64": {
       "#import": [
         "win10",
@@ -3046,20 +1396,6 @@
         "win81-arm64-aot"
       ]
     },
-    "win10-arm64-corert": {
-      "#import": [
-        "win10-corert",
-        "win10-arm64",
-        "win10",
-        "win81-arm64-corert"
-      ]
-    },
-    "win10-corert": {
-      "#import": [
-        "win10",
-        "win81-corert"
-      ]
-    },
     "win10-x64": {
       "#import": [
         "win10",
@@ -3074,14 +1410,6 @@
         "win81-x64-aot"
       ]
     },
-    "win10-x64-corert": {
-      "#import": [
-        "win10-corert",
-        "win10-x64",
-        "win10",
-        "win81-x64-corert"
-      ]
-    },
     "win10-x86": {
       "#import": [
         "win10",
@@ -3096,14 +1424,6 @@
         "win81-x86-aot"
       ]
     },
-    "win10-x86-corert": {
-      "#import": [
-        "win10-corert",
-        "win10-x86",
-        "win10",
-        "win81-x86-corert"
-      ]
-    },
     "win7": {
       "#import": [
         "win"
@@ -3129,14 +1449,6 @@
         "win-arm-aot"
       ]
     },
-    "win7-arm-corert": {
-      "#import": [
-        "win7-corert",
-        "win7-arm",
-        "win7",
-        "win-arm-corert"
-      ]
-    },
     "win7-arm64": {
       "#import": [
         "win7",
@@ -3151,20 +1463,6 @@
         "win-arm64-aot"
       ]
     },
-    "win7-arm64-corert": {
-      "#import": [
-        "win7-corert",
-        "win7-arm64",
-        "win7",
-        "win-arm64-corert"
-      ]
-    },
-    "win7-corert": {
-      "#import": [
-        "win7",
-        "win-corert"
-      ]
-    },
     "win7-x64": {
       "#import": [
         "win7",
@@ -3179,14 +1477,6 @@
         "win-x64-aot"
       ]
     },
-    "win7-x64-corert": {
-      "#import": [
-        "win7-corert",
-        "win7-x64",
-        "win7",
-        "win-x64-corert"
-      ]
-    },
     "win7-x86": {
       "#import": [
         "win7",
@@ -3201,14 +1491,6 @@
         "win-x86-aot"
       ]
     },
-    "win7-x86-corert": {
-      "#import": [
-        "win7-corert",
-        "win7-x86",
-        "win7",
-        "win-x86-corert"
-      ]
-    },
     "win8": {
       "#import": [
         "win7"
@@ -3234,14 +1516,6 @@
         "win7-arm-aot"
       ]
     },
-    "win8-arm-corert": {
-      "#import": [
-        "win8-corert",
-        "win8-arm",
-        "win8",
-        "win7-arm-corert"
-      ]
-    },
     "win8-arm64": {
       "#import": [
         "win8",
@@ -3256,20 +1530,6 @@
         "win7-arm64-aot"
       ]
     },
-    "win8-arm64-corert": {
-      "#import": [
-        "win8-corert",
-        "win8-arm64",
-        "win8",
-        "win7-arm64-corert"
-      ]
-    },
-    "win8-corert": {
-      "#import": [
-        "win8",
-        "win7-corert"
-      ]
-    },
     "win8-x64": {
       "#import": [
         "win8",
@@ -3284,14 +1544,6 @@
         "win7-x64-aot"
       ]
     },
-    "win8-x64-corert": {
-      "#import": [
-        "win8-corert",
-        "win8-x64",
-        "win8",
-        "win7-x64-corert"
-      ]
-    },
     "win8-x86": {
       "#import": [
         "win8",
@@ -3306,14 +1558,6 @@
         "win7-x86-aot"
       ]
     },
-    "win8-x86-corert": {
-      "#import": [
-        "win8-corert",
-        "win8-x86",
-        "win8",
-        "win7-x86-corert"
-      ]
-    },
     "win81": {
       "#import": [
         "win8"
@@ -3339,14 +1583,6 @@
         "win8-arm-aot"
       ]
     },
-    "win81-arm-corert": {
-      "#import": [
-        "win81-corert",
-        "win81-arm",
-        "win81",
-        "win8-arm-corert"
-      ]
-    },
     "win81-arm64": {
       "#import": [
         "win81",
@@ -3361,20 +1597,6 @@
         "win8-arm64-aot"
       ]
     },
-    "win81-arm64-corert": {
-      "#import": [
-        "win81-corert",
-        "win81-arm64",
-        "win81",
-        "win8-arm64-corert"
-      ]
-    },
-    "win81-corert": {
-      "#import": [
-        "win81",
-        "win8-corert"
-      ]
-    },
     "win81-x64": {
       "#import": [
         "win81",
@@ -3389,14 +1611,6 @@
         "win8-x64-aot"
       ]
     },
-    "win81-x64-corert": {
-      "#import": [
-        "win81-corert",
-        "win81-x64",
-        "win81",
-        "win8-x64-corert"
-      ]
-    },
     "win81-x86": {
       "#import": [
         "win81",
@@ -3410,14 +1624,6 @@
         "win81",
         "win8-x86-aot"
       ]
-    },
-    "win81-x86-corert": {
-      "#import": [
-        "win81-corert",
-        "win81-x86",
-        "win81",
-        "win8-x86-corert"
-      ]
     }
   }
 }
\ No newline at end of file

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index be71ab8..a795c69 100644 (file)
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -141,11 +141,8 @@
       <Architectures>x64;x86;arm;arm64</Architectures>
       <Versions>7;8;81;10</Versions>
     </RuntimeGroup>
-
     <!-- add corert to all RIDs -->
-    <RuntimeGroupWithQualifiers Include="@(RuntimeGroup)">
-      <AdditionalQualifiers>%(AdditionalQualifiers);corert</AdditionalQualifiers>
-    </RuntimeGroupWithQualifiers>
+    <RuntimeGroupWithQualifiers Include="@(RuntimeGroup)" />
 
     <!-- root RIDs -->
     <RuntimeGroupWithQualifiers Include="base" />
@@ -157,9 +154,6 @@
     <RuntimeGroupWithQualifiers Include="aot">
       <Parent>any</Parent>
     </RuntimeGroupWithQualifiers>
-    <RuntimeGroupWithQualifiers Include="corert">
-      <Parent>any</Parent>
-    </RuntimeGroupWithQualifiers>
   </ItemGroup>
 
   <Target Name="GenerateRuntimeJson" BeforeTargets="CreatePackage">

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
index 2845c11..20b9b95 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
+      netcoreappaot;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
index c0daa56..87cbb58 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
@@ -4,9 +4,9 @@
 
   <ItemGroup>
     <!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
-    <Project Include="$(MSBuildProjectName).pkgproj" />
+    <Project Include="$(MSBuildProjectName).pkgproj"  Condition="'$(TargetGroup)'=='netcoreapp'" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
index b3ae4bd..8164249 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -9,6 +9,7 @@
 
     <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
     <LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir>
+    <LibBinDir Condition="$(PackageTargetRuntime.EndsWith('-aot'))">$(NETCoreAppAotPackageRuntimePath)</LibBinDir>
 
     <IsFrameworkPackage>true</IsFrameworkPackage>
 
@@ -20,6 +21,7 @@
     <IgnoredReference Include="System.Private.CoreLib" />
     <IgnoredReference Include="Windows" />
 
+    <IgnoredReference Condition="$(PackageTargetRuntime.EndsWith('-aot'))" Include="System.Private.Interop" />
     <!-- Exclude shims from the closure verification -->
     <ExcludeFromClosure Include="mscorlib" />
     <ExcludeFromClosure Include="System" />

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 520c72a..4df2061 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
@@ -21,6 +21,7 @@
     <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

diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index eb89b85..56405fe 100644 (file)
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -18,13 +18,13 @@
     <ApiCompatImplementationDirs>$(RefPath),$(GenFacadesOutputPath)</ApiCompatImplementationDirs>
     <!-- If we are targeting uap or uapaot run ApiCompat against the implementation assemblies instead since they don't match the reference assemblies -->
     <!-- also include $(RefPath) last to pick up windows.winmd dependency, which we don't place in RuntimePath -->
-    <ApiCompatImplementationDirs Condition="$(TargetGroup.StartsWith('uap'))">$(RuntimePath),$(GenFacadesOutputPath),$(RefPath)</ApiCompatImplementationDirs>
+    <ApiCompatImplementationDirs Condition="$(TargetGroup.StartsWith('uap')) or '$(TargetsAOT)' == 'true'">$(RuntimePath),$(GenFacadesOutputPath),$(RefPath)</ApiCompatImplementationDirs>
     <!-- Set to true to build this project -->
     <!-- Separate property otherwise /p:BaselineApiCompat=true would force it to run even for non-UAP -->
     <BaselineApiCompat Condition="'$(BaselineApiCompat)' == ''">false</BaselineApiCompat>
     <_RunApiCompat>true</_RunApiCompat>
     <!-- Disable running apicompat for uap scenarios because the RuntimePath is not correctly setup in BuildAllConfigurations mode -->
-    <_RunApiCompat Condition="'$(BuildAllConfigurations)' == 'true' and $(TargetGroup.StartsWith('uap'))">false</_RunApiCompat>
+    <_RunApiCompat Condition="'$(BuildAllConfigurations)' == 'true' and ($(TargetGroup.StartsWith('uap')) or '$(TargetsAOT)' == 'true')">false</_RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20.txt b/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20.txt
new file mode 100644 (file)
index 0000000..6cd9337
--- /dev/null
+++ b/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20.txt
@@ -0,0 +1,94 @@
+Compat issues with assembly mscorlib:
+TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Diagnostics.SymbolStore.ISymbolDocumentWriter' does not exist in the implementation but it does exist in the contract.
+TypeCannotChangeClassification : Type 'System.IO.FileAttributes' is a 'class' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.FlowControl' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCode' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodes' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodeType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OperandType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.PackingSize' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.StackBehaviour' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
+Compat issues with assembly netstandard:
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Diagnostics.SymbolStore.ISymbolDocumentWriter' does not exist in the implementation but it does exist in the contract.
+TypeCannotChangeClassification : Type 'System.IO.FileAttributes' is a 'class' in the implementation but is a 'struct' in the contract.
+TypeCannotChangeClassification : Type 'System.IO.HandleInheritability' is a 'class' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.FlowControl' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCode' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodes' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodeType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OperandType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.PackingSize' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.StackBehaviour' does not exist in the implementation but it does exist in the contract.
+Compat issues with assembly System.Core:
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.IO.HandleInheritability' is a 'class' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.ECParameters' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.ECPoint' does not exist in the implementation but it does exist in the contract.
+Compat issues with assembly System.IO.FileSystem.Primitives:
+TypeCannotChangeClassification : Type 'System.IO.FileAttributes' is a 'class' in the implementation but is a 'struct' in the contract.
+Compat issues with assembly System.Reflection.Primitives:
+TypesMustExist : Type 'System.Reflection.Emit.FlowControl' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCode' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodes' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodeType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OperandType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.PackingSize' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.StackBehaviour' does not exist in the implementation but it does exist in the contract.
+Compat issues with assembly System.Runtime:
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+TypeCannotChangeClassification : Type 'System.Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>' is a 'class' in the implementation but is a 'delegate' in the contract.
+Compat issues with assembly System.Runtime.Handles:
+TypeCannotChangeClassification : Type 'System.IO.HandleInheritability' is a 'class' in the implementation but is a 'struct' in the contract.
+Total Issues: 86
\ No newline at end of file

diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20Only.txt b/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20Only.txt
new file mode 100644 (file)
index 0000000..69b0b8d
--- /dev/null
+++ b/src/libraries/shims/ApiCompatBaseline.netcoreappaot.netstandard20Only.txt
@@ -0,0 +1,12 @@
+Compat issues with assembly netstandard:
+TypeCannotChangeClassification : Type 'System.RuntimeArgumentHandle' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypeCannotChangeClassification : Type 'System.TypedReference' is a 'ref struct' in the implementation but is a 'struct' in the contract.
+TypesMustExist : Type 'System.Diagnostics.SymbolStore.ISymbolDocumentWriter' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.FlowControl' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCode' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodes' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OpCodeType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.OperandType' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.PackingSize' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Reflection.Emit.StackBehaviour' does not exist in the implementation but it does exist in the contract.
+Total Issues: 10
\ No newline at end of file

diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props
index 80a06e9..d1f75d3 100644 (file)
--- a/src/libraries/shims/manual/Directory.Build.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -7,6 +7,7 @@
     <BuildConfigurations>
       $(PackageConfigurations);
       netcoreapp;
+      netcoreappaot;
       uap;
     </BuildConfigurations>
     <IsNETCoreApp>true</IsNETCoreApp>
@@ -15,7 +16,7 @@
   <!-- need to by-pass the Directory.Build.props in the shims directory for this project -->
   <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
-    <_RuntimePath Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap'">$(RuntimePath)</_RuntimePath>
+    <_RuntimePath Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'netcoreappaot'">$(RuntimePath)</_RuntimePath>
     <_RuntimePath Condition="'$(TargetGroup)' == 'netcoreapp2.0'">$(ShimsTargetRuntimeRoot)netcoreapp2.0/</_RuntimePath>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>

diff --git a/tools-local/targetgroups.props b/tools-local/targetgroups.props
index b8a78bd..a0525fd 100644 (file)
--- a/tools-local/targetgroups.props
+++ b/tools-local/targetgroups.props
@@ -164,9 +164,19 @@
       <NuGetTargetMoniker>.NETCoreApp,Version=v1.2</NuGetTargetMoniker>
       <NuGetTargetMonikerShort>netcoreapp1.2</NuGetTargetMonikerShort>
     </TargetGroups>
-    <TargetGroups Include="netcoreapp1.2corert">
-      <NuGetTargetMoniker>.NETCoreApp,Version=v1.2</NuGetTargetMoniker>
-      <NuGetTargetMonikerShort>netcoreapp1.2</NuGetTargetMonikerShort>
+    <TargetGroups Include="netcoreapp2.1aot">
+      <PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
+      <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
+      <NuGetTargetMonikerShort>netcoreapp2.1</NuGetTargetMonikerShort>
+      <Imports>netcoreapp;netcoreapp2.1</Imports>
+      <CompatibleWith>netstandard</CompatibleWith>
+    </TargetGroups>
+    <TargetGroups Include="netcoreappaot">
+      <PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
+      <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
+      <NuGetTargetMonikerShort>netcoreapp2.1</NuGetTargetMonikerShort>
+      <Imports>netcoreapp;netcoreapp2.1</Imports>
+      <CompatibleWith>netstandard</CompatibleWith>
     </TargetGroups>
     <TargetGroups Include="net45">
       <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5</TargetingPackNugetPackageId>