diff options
author | Wes Haggard <weshaggard@users.noreply.github.com> | 2017-06-08 04:14:13 +0300 |
---|---|---|
committer | Dan Moseley <danmose@microsoft.com> | 2017-06-08 04:14:13 +0300 |
commit | ca49bfbfd64351fddba56f2141b90841b8561eb7 (patch) | |
tree | e73821a0d7bc98ba1a8467d909ef29c0e0a020ca /src/System.Private.Uri | |
parent | 271ea583e8419c86ba5e14680f6dd83383919918 (diff) |
Manually build mscorlib shim to allow for internal type forwards & Adding TypeForwardFrom to serialiazable types (#20697)
* Manually build mscorlib shim to allow for internal type forwards
* prepare tests for netfx->core deserialization changes
* update netfx serialized data
* change hash updater so it doesn't use hard-coded path
* Code cleanup for binary serialization
* Changed ListT to ArrayList in CookieCoolection for cross serialization
* Merge
* Changed observablecollection typeforwards that already had typeforwards on netfx
* Adding ValueTuple blobs for netfx471
* Add internal types which need to be forwarded
* Pull mscorlib shim in along with windows.winmd
To build UAP refs and libs we need an mscorlib shim. So for the build
we pull one in from packages and it will get overwritten when we build
the final one as part of our shim builds
* Removed not needed typeforward and added description
* Remved typeforwards from nested types
* Fixed generic type syntax
* Updated coreclr version, ifdefed imports for netcoreapp
* disable netfx serialization for now
* Merge error fixed
* Update blobs after coreclr changes
* Adding ValueTuple manual typeforwards
* Renamed serialization variables for SortedSet
* Disabling TreeSet<,> serialization support (for now)
* Exception internal data storage typeforward added
* Fix type conflict for mscorlib shim in uapaot configuration
* Split the runtime and ref mscorlib shim
We need to build the ref mscorlib shim only against the reference
assemblies so we still build in shims.proj. However the runtime
mscorlib shim needs to have access to internals so we build it against
the runtime implementation using a manual project.
Diffstat (limited to 'src/System.Private.Uri')
-rw-r--r-- | src/System.Private.Uri/src/System/Uri.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/System.Private.Uri/src/System/Uri.cs b/src/System.Private.Uri/src/System/Uri.cs index b71a57b629..69934bc546 100644 --- a/src/System.Private.Uri/src/System/Uri.cs +++ b/src/System.Private.Uri/src/System/Uri.cs @@ -12,6 +12,7 @@ using System.Diagnostics.CodeAnalysis; namespace System { [Serializable] + [System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public partial class Uri : ISerializable { public static readonly string UriSchemeFile = UriParser.FileUri.SchemeName; |