[System.ServiceModel.Activation] Move ServiceHostFactory.cs where it'…

…s used (#7044)
mono · Feb 14, 2018 · 62bf8bd · 62bf8bd
1 parent 8ad191d
commit 62bf8bd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources
@@ -3,4 +3,4 @@
 Assembly/AssemblyInfo.cs
 
 System.ServiceModel/ServiceHostingEnvironment.cs
-../System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
+System.ServiceModel.Activation/ServiceHostFactory.cs
diff --git a/...iceModel.Activation/ServiceHostFactory.cs → ...iceModel.Activation/ServiceHostFactory.cs b/...iceModel.Activation/ServiceHostFactory.cs → ...iceModel.Activation/ServiceHostFactory.cs
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !HAS_ACTIVATION
-
 namespace System.ServiceModel.Activation
 {
 	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblySystemServiceModel_3_0)]
@@ -48,5 +46,3 @@ public class ServiceHostFactory : ServiceHostFactoryBase
 		}
 	}
 }
-
-#endif