Merge pull request #1349 from martinjt/MachineKeyProtect

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Activation / ServiceHostFactory.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
index a34e6d401be5bd497a24fe27ce52493515779431..126221fc4a166fff89c6f09f36b6d5251e1bd9c8 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs
@@ -25,11 +25,14 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-using System.ServiceModel;
+
+#if !HAS_ACTIVATION
 
 namespace System.ServiceModel.Activation
 {
+#if NET_4_0
+       [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblySystemServiceModel_3_0)]
+#endif
        public class ServiceHostFactory : ServiceHostFactoryBase
        {
                [MonoTODO]
@@ -40,10 +43,12 @@ namespace System.ServiceModel.Activation
                }
 
                [MonoTODO ("untested")]
-               protected internal virtual ServiceHost CreateServiceHost (
+               protected virtual ServiceHost CreateServiceHost (
                        Type serviceType, Uri [] baseAddresses)
                {
                        return new ServiceHost (serviceType, baseAddresses);
                }
        }
 }
+
+#endif
\ No newline at end of file