[v4.7.1] Remove System.ServiceModel.Internals.dll

It's only used for a few typeforwards in System.Runtime.DurableInstancing.dll
and doesn't exist in the .NET reference assemblies so keeping it
isn't worth the complication.

4 files changed, 36 insertions, 61 deletions

diff --git a/src/v4.7.1/System.Runtime.DurableInstancing.cs b/src/v4.7.1/System.Runtime.DurableInstancing.cs
index 23da982..94f3ac8 100644
--- a/src/v4.7.1/System.Runtime.DurableInstancing.cs
+++ b/src/v4.7.1/System.Runtime.DurableInstancing.cs
@@ -25,23 +25,53 @@
 [assembly:System.Security.SecurityRulesAttribute((System.Security.SecurityRuleSet)(2), SkipVerificationInFullTrust=true)]
 [assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, Execution=true)]
 [assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
+#if false // these are forwarded to System.ServiceModel.Internals.dll but this assembly doesn't actually exist in the .NET 4.7.1 reference assemblies ...
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ActionItem))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.AsyncResult))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.AsyncResult.AsyncCompletion))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.BufferedOutputStream))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompletedAsyncResult))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.DiagnosticsEventProvider))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.DiagnosticsEventProvider.WriteEventErrorCode))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.EtwProvider))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.EventLogger))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.StringTraceRecord))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Diagnostics.TraceRecord))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ExceptionTrace))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.ExceptionHandler))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.BlockingAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.BlocksUsing))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.CacheAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.CacheAttrition))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.ExternalResourceAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.FriendAccessAllowedAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.GuaranteeNonBlockingAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.InheritThrowsAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.KnownXamlExternalAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.Location))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.NonThrowingAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.QueueAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.SecurityNoteAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.Strings))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.SynchronizationKind))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.SynchronizationObjectAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.SynchronizationPrimitiveAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.ThrottleAction))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.ThrottleAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.ThrottleMetric))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.Throws))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.Throws.TimeoutAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.ThrowsAttribute))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Fx.Tag.XamlVisibleAttribute))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.IOThreadScheduler))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.PartialTrustHelpers))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.SynchronizedPool<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.SynchronizedPool))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.TraceEventLevel))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.TracePayload))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.TypeHelper))]
+#endif
 namespace System.Runtime.DurableInstancing
 {
     [System.SerializableAttribute]
diff --git a/src/v4.7.1/System.ServiceModel.Internals.cs b/src/v4.7.1/System.ServiceModel.Internals.cs
deleted file mode 100644
index af35131..0000000
--- a/src/v4.7.1/System.ServiceModel.Internals.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-[assembly:System.Reflection.AssemblyVersionAttribute("0.0.0.0")]
-[assembly:System.CLSCompliantAttribute(true)]
-[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))]
-[assembly:System.Reflection.AssemblyDefaultAliasAttribute("System.ServiceModel.dll")]
-[assembly:System.Reflection.AssemblyDescriptionAttribute("Contains share code for some System.ServiceModel libraries")]
-[assembly:System.Reflection.AssemblyFileVersionAttribute("4.7.2046.0")]
-[assembly:System.Reflection.AssemblyInformationalVersionAttribute("4.7.2046.0")]
-[assembly:System.Reflection.AssemblyTitleAttribute("System.ServiceModel.Internals.dll")]
-[assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")]
-[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)]
-[assembly:System.Runtime.CompilerServices.ReferenceAssemblyAttribute]
-[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
-[assembly:System.Runtime.InteropServices.ComCompatibleVersionAttribute(1, 0, 3300, 0)]
-[assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
-[assembly:System.Runtime.InteropServices.GuidAttribute("a9b8c4b5-b4a9-4800-8268-e8ec3b93d9ac")]
-[assembly:System.Security.AllowPartiallyTrustedCallersAttribute]
-[assembly:System.Security.SecurityCriticalAttribute((System.Security.SecurityCriticalScope)(0))]
-[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
diff --git a/src/v4.7.1/System.ServiceModel.Internals.extra.cs b/src/v4.7.1/System.ServiceModel.Internals.extra.cs
deleted file mode 100644
index c935fb1..0000000
--- a/src/v4.7.1/System.ServiceModel.Internals.extra.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("System.Runtime.DurableInstancing, PublicKey=00000000000000000400000000000000")]
-[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("System.Runtime.DurableInstancing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("System.ServiceModel.Web, PublicKey=00000000000000000400000000000000")]
-[assembly:System.Runtime.CompilerServices.InternalsVisibleToAttribute("System.ServiceModel.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-
-namespace System.Runtime
-{
-    internal abstract partial class ActionItem { }
-    internal abstract partial class AsyncResult { }
-    internal partial class BufferedOutputStream { }
-    internal partial class CompletedAsyncResult { }
-    internal partial class ExceptionTrace { }
-    internal static partial class Fx { }
-    internal partial class IOThreadScheduler { }
-    internal static partial class PartialTrustHelpers { }
-    internal partial class SynchronizedPool<T> { }
-    internal enum TraceEventLevel { }
-    internal partial struct TracePayload { }
-    internal static partial class TypeHelper { }
-}
-namespace System.Runtime.Diagnostics
-{
-    internal abstract partial class DiagnosticsEventProvider { }
-    internal sealed partial class EtwProvider { }
-    internal sealed partial class EventLogger { }
-    internal partial class StringTraceRecord { }
-    internal partial class TraceRecord { }
-}
diff --git a/v4.7.1/Makefile b/v4.7.1/Makefile
index e9b558d..64bad25 100644
--- a/v4.7.1/Makefile
+++ b/v4.7.1/Makefile
@@ -20,7 +20,7 @@ ASSEMBLIES := Accessibility CustomMarshalers	\
 	System.Reactive.PlatformServices System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Windows.Forms	\
 	System.Reactive.Windows.Threading System.Runtime.Caching System.Runtime.DurableInstancing System.Runtime.Remoting	\
 	System.Runtime.Serialization.Formatters.Soap System.Runtime.Serialization System.Security System.ServiceModel.Activation	\
-	System.ServiceModel.Discovery System.ServiceModel.Internals System.ServiceModel.Routing System.ServiceModel.Web	\
+	System.ServiceModel.Discovery System.ServiceModel.Routing System.ServiceModel.Web	\
 	System.ServiceModel System.ServiceProcess System.Threading.Tasks.Dataflow System.Transactions System.Web.Abstractions	\
 	System.Web.ApplicationServices System.Web.DynamicData System.Web.Extensions.Design System.Web.Extensions	\
 	System.Web.Http.SelfHost System.Web.Http.WebHost System.Web.Http System.Web.Mvc System.Web.Razor System.Web.Routing	\
@@ -81,7 +81,7 @@ Microsoft.CSharp_REFS := mscorlib System System.Core
 Microsoft.VisualBasic_REFS := mscorlib System System.Windows.Forms System.Drawing
 Microsoft.VisualC_REFS := mscorlib
 Microsoft.Web.Infrastructure_REFS := mscorlib System System.Web
-SMDiagnostics_REFS := mscorlib System.Configuration System System.Xml System.ServiceModel.Internals
+SMDiagnostics_REFS := mscorlib System.Configuration System System.Xml
 System.ComponentModel.Composition_REFS := mscorlib System System.Core
 System.ComponentModel.DataAnnotations_REFS := mscorlib System System.Core
 System.Configuration.Install_REFS := mscorlib System
@@ -131,14 +131,13 @@ System.Reactive.Windows.Threading_REFS := mscorlib System System.Reactive.Core S
 System.Reflection.Context_REFS := mscorlib
 System.Reflection.Metadata_REFS := System.Runtime System.Resources.ResourceManager System.Collections.Immutable System.Reflection.Primitives System.Diagnostics.Debug System.Collections System.IO System.IO.Compression System.Text.Encoding System.Runtime.InteropServices System.Linq System.Reflection System.Threading System.Runtime.Extensions System.Text.Encoding.Extensions System.Reflection.Extensions
 System.Runtime.Caching_REFS := mscorlib System System.Data System.Configuration
-System.Runtime.DurableInstancing_REFS := mscorlib System.Xml.Linq System.ServiceModel.Internals System.Transactions System.Core System.Runtime.Serialization System
+System.Runtime.DurableInstancing_REFS := mscorlib System.Xml.Linq System.Transactions System.Core System.Runtime.Serialization System
 System.Runtime.Remoting_REFS := mscorlib System System.Web System.Xml System.Runtime.Serialization.Formatters.Soap
 System.Runtime.Serialization.Formatters.Soap_REFS := mscorlib System.Xml
-System.Runtime.Serialization_REFS := mscorlib System.Xml System.ServiceModel.Internals System System.Configuration System.Core
+System.Runtime.Serialization_REFS := mscorlib System.Xml System System.Configuration System.Core
 System.Security_REFS := mscorlib System System.Xml
 System.ServiceModel.Activation_REFS := mscorlib System.ServiceModel System System.Web
 System.ServiceModel.Discovery_REFS := mscorlib System.ServiceModel System System.Xml System.Xml.Linq System.Runtime.Serialization System.Configuration System.Core
-System.ServiceModel.Internals_REFS := mscorlib System System.Xml
 System.ServiceModel.Routing_REFS := mscorlib System.ServiceModel System.Configuration System System.Runtime.Serialization
 System.ServiceModel.Web_REFS := mscorlib System.ServiceModel System System.Runtime.Serialization System.Xml System.Xml.Linq System.Configuration System.ServiceModel.Activation System.Core System.Web.Extensions
 System.ServiceModel_REFS := mscorlib System.Xml System.Xml.Linq System.Xaml System System.EnterpriseServices System.Transactions System.IdentityModel System.Runtime.Serialization System.Runtime.DurableInstancing System.Security System.Web.ApplicationServices System.Messaging System.Net.Http System.IdentityModel.Selectors System.Web.Services System.Configuration System.Web System.Core bare/System.ServiceModel.Activation
@@ -303,7 +302,7 @@ MSFINAL_KEY := ../../../mcs/class/msfinal.pub   # Public Key Token: b03f5f7f11d5
 ECMA_KEY_ASSEMBLIES := SMDiagnostics System.ComponentModel.Composition System.Core System.Data.DataSetExtensions	\
 	System.Data.Entity System.Data.Linq System.Data.OracleClient System.Data.Services.Client System.Data.Services	\
 	System.Data System.IO.Compression.FileSystem System.IO.Compression System.IdentityModel.Selectors System.IdentityModel	\
-	System.Numerics System.Reflection.Context System.Runtime.Remoting System.Runtime.Serialization System.ServiceModel.Internals	\
+	System.Numerics System.Reflection.Context System.Runtime.Remoting System.Runtime.Serialization	\
 	System.ServiceModel System.Threading.Tasks.Dataflow System.Transactions System.Windows.Forms System.Xaml	\
 	System.Xml.Linq System.Xml.Serialization System.Xml System mscorlib bare/System bare/System.Xml