Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.IdentityModel/Makefile

@@ -26,7 +26,7 @@ EXTRA_DISTFILES = \
 	Test/Resources/test.pfx \
 	Test/Resources/test2.pfx
 
-VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.IdentityModel.dll
 NO_INSTALL = yes

mcs/class/System.IdentityModel/System.IdentityModel.Configuration/ICustomIdentityConfiguration.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.Xml;
 
@@ -36,4 +35,3 @@ namespace System.IdentityModel.Configuration
 		void LoadCustomConfiguration(XmlNodeList nodeList);
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Configuration/IdentityModelCaches.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.IdentityModel.Tokens;
 
@@ -37,4 +36,3 @@ namespace System.IdentityModel.Configuration
 		public TokenReplayCache TokenReplayCache { get; set; }
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/BinaryExchange.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 
@@ -50,4 +49,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/EndpointReference.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.Collections.ObjectModel;
@@ -61,4 +60,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/Entropy.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.IdentityModel.Tokens;
 using System.Security.Cryptography;
@@ -57,4 +56,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/Lifetime.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 
@@ -46,4 +45,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/ProtectedKey.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.IdentityModel.Tokens;
@@ -52,4 +51,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/RequestSecurityTokenResponse.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.IdentityModel.Tokens;
 
@@ -52,4 +51,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/RequestedProofToken.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.IdentityModel.Tokens;
@@ -54,4 +53,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/RequestedSecurityToken.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.IdentityModel.Tokens;
@@ -47,4 +46,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/Status.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 
@@ -42,4 +41,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/UseKey.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.IdentityModel.Tokens;
@@ -54,4 +53,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Protocols/WSTrust/WSTrustMessage.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.IdentityModel;
@@ -55,4 +54,3 @@ namespace System.IdentityModel.Protocols.WSTrust
 		public UseKey UseKey { get; set; }
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/AudienceRestriction.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.Collections.ObjectModel;
 using System.IdentityModel.Selectors;
@@ -48,4 +47,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/AuthenticationContext.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.Collections.ObjectModel;
@@ -43,4 +42,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/AuthenticationInformation.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 using System.Collections.ObjectModel;
@@ -44,4 +43,3 @@ namespace System.Security.Claims
 		public String Session { get; set; }
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 using System;
 using System.IO;
 using System.Runtime.Serialization;
@@ -114,4 +113,3 @@ namespace System.IdentityModel.Tokens {
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptingCredentials.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System;
 
@@ -47,4 +46,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/IssuerNameRegistry.cs

@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_5
 
 using System.IdentityModel.Configuration;
 using System.Xml;
@@ -52,4 +51,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif