[master] Update dependencies from 4 repositories (dotnet/corefx#41216)

* Update global.json

* Disable DependentUpon convention for resources

* Update dependencies from https://github.com/dotnet/core-setup build 20190920.7

- Microsoft.NETCore.App - 5.0.0-alpha1.19470.7
- Microsoft.NETCore.DotNetHostPolicy - 5.0.0-alpha1.19470.7
- Microsoft.NETCore.DotNetHost - 5.0.0-alpha1.19470.7

* Update dependencies from https://github.com/dotnet/corefx build 20190921.2

- runtime.native.System.IO.Ports - 5.0.0-alpha1.19471.2
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19471.2

* Cleanup netcoreapp targeting pack restore

For .NETCore2x the SDK implictily references the targeting pack via
a PackageReference so to binplace the assemblies we just need to reset
the PrivateAssets and IsImplicitlyDefined attributes.

For .NETCore >= 3 we don't need to reset any attributes on the
FrameworkReference.

We default to the version that is bundled within the SDK in the
Microsoft.NETCoreSdk.BundledVersions.props file.

* Update dependencies from https://github.com/dotnet/standard build 20190922.1

- NETStandard.Library - 2.2.0-prerelease.19472.1

* Update SDK to 3.0.100 stable

* Simplify code in netcoreapp.depproj

* Update packageIndex inbox matrix for S.R.Emit

* Manual darc update from build '20190923.5'

Commit migrated from https://github.com/dotnet/corefx/commit/90f7cc01418c059f496528beeca77c5f5549e6fc

diff --git a/eng/restore/netcoreapp/netcoreapp.depproj b/eng/restore/netcoreapp/netcoreapp.depproj
index a53afb8..af7d025 100644 (file)
--- a/eng/restore/netcoreapp/netcoreapp.depproj
+++ b/eng/restore/netcoreapp/netcoreapp.depproj
@@ -3,32 +3,17 @@
        With this, we are able to compile assemblies against shipped, stable versions of .NET Core. -->
   <PropertyGroup>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NETCoreAppPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.7</NETCoreAppPackageVersion>
-    <NETCoreAppPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp2.1'">2.1.3</NETCoreAppPackageVersion>
-    <!-- These needs to be replaced once we have a RTM -->      
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp3.0'">3.0.0-preview7-27912-14</RuntimeFrameworkVersion>
-    <DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' == 'netcoreapp3.0'">false</DisableImplicitFrameworkReferences>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
     <BinPlaceRef>true</BinPlaceRef>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.NETCore.App">
-      <Version>$(NETCoreAppPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <KnownFrameworkReference Update="Microsoft.NETCore.App"
-                            TargetingPackVersion="$(RuntimeFrameworkVersion)"
-                            />
+  <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.'))">
+    <PackageReference Update="Microsoft.NETCore.App" IsImplicitlyDefined="false" PrivateAssets="None" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- for all configurations this project provides refs for that configuration -->
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
-    </BinPlaceConfiguration>
-
+    <BinPlaceConfiguration Include="$(Configuration)" RefPath="$(RefPath)" />
     <FileToExclude Include="System.ComponentModel.Composition" />
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
index 2186707..c2f62c3 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
@@ -2,7 +2,7 @@
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
     <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Composition.Registration.csproj">
-      <SupportedFramework>netcoreapp3.0;net45</SupportedFramework>
+      <SupportedFramework>netcoreapp3.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.Composition.Registration.csproj" />
     <InboxOnTargetFramework Include="net45">

diff --git a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
index ae5220b..3aa0faf 100644 (file)
--- a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
+++ b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
@@ -2,15 +2,15 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Emit.csproj">
-      <SupportedFramework>netcoreapp2.1;uap10.0.16299</SupportedFramework>
+      <SupportedFramework>netcoreapp2.1;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.Emit.csproj" />
     <HarvestIncludePaths Include="ref/netstandard1.1" >
-      <SupportedFramework>net45;netcoreapp1.0;netcore45;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net45;netcoreapp1.0;netcore45;wpa81</SupportedFramework>
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="lib/netcore50" />
     <HarvestIncludePaths Include="lib/netstandard1.3" />
-    <InboxOnTargetFramework Include="monoandroid10;xamarinmac20" />
+    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
     <InboxOnTargetFramework Include="netcoreapp2.0" />
     <InboxOnTargetFramework Include="netstandard2.1" />
     <InboxOnTargetFramework Include="net45" />

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index bd963ea..2b77eb7 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -3462,7 +3462,11 @@
         "net45": "4.0.0.0",
         "netstandard2.1": "4.0.0.0",
         "monoandroid10": "Any",
-        "xamarinmac20": "Any"
+        "monotouch10": "Any",
+        "xamarinmac20": "Any",
+        "xamarinios10": "Any",
+        "xamarintvos10": "Any",
+        "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",