From d229111908f4326d874978e814169a5d61f7950f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2019 01:09:05 +0200
Subject: [PATCH] [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
---
eng/restore/netcoreapp/netcoreapp.depproj | 23 ++++------------------
...ComponentModel.Composition.Registration.pkgproj | 2 +-
.../pkg/System.Reflection.Emit.pkgproj | 6 +++---
.../packageIndex.json | 6 +++++-
4 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/eng/restore/netcoreapp/netcoreapp.depproj b/eng/restore/netcoreapp/netcoreapp.depproj
index a53afb8..af7d025 100644
--- 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. -->
Reference
- 2.0.7
- 2.1.3
-
- 3.0.0-preview7-27912-14
- false
+ false
true
-
-
- $(NETCoreAppPackageVersion)
-
-
-
-
-
+
+
-
- $(RefPath)
-
-
+
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
--- 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 @@
- netcoreapp3.0;net45
+ netcoreapp3.0;net45;$(AllXamarinFrameworks)
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
--- 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 @@
- netcoreapp2.1;uap10.0.16299
+ netcoreapp2.1;uap10.0.16299;$(AllXamarinFrameworks)
- net45;netcoreapp1.0;netcore45;wpa81;$(AllXamarinFrameworks)
+ net45;netcoreapp1.0;netcore45;wpa81
-
+
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index bd963ea..2b77eb7 100644
--- 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",
--
2.7.4