Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

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

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/ProofDescriptor.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.Protocols.WSTrust;
 
@@ -38,4 +37,3 @@ namespace System.IdentityModel.Tokens
 		public abstract void ApplyTo (RequestSecurityTokenResponse response);
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenDescriptor.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.Generic;
@@ -71,4 +70,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

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

@@ -0,0 +1,52 @@
+//
+// SecurityTokenExpiredException.cs
+//
+// Author:
+//   Noesis Labs (Ryan.Melena@noesislabs.com)
+//
+// Copyright (C) 2014 Noesis Labs, LLC  https://noesislabs.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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.Runtime.Serialization;
+
+namespace System.IdentityModel.Tokens
+{
+	public class SecurityTokenExpiredException : SecurityTokenValidationException
+	{
+		public SecurityTokenExpiredException()
+			: base("ID4181: The security token has expired.")
+		{ }
+
+		public SecurityTokenExpiredException(string message)
+			: base(message)
+		{ }
+
+		public SecurityTokenExpiredException(string message, Exception innerException)
+			: base(message, innerException)
+		{ }
+
+		public SecurityTokenExpiredException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{ }
+	}
+}

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenHandler.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;
@@ -120,4 +119,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenHandlerCollection.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.Generic;
@@ -194,4 +193,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenHandlerConfiguration.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.Configuration;
@@ -63,4 +62,3 @@ namespace System.IdentityModel.Tokens
 		public StoreLocation TrustedStoreLocation { get; set; }
 	}
 }
-#endif

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

@@ -0,0 +1,52 @@
+//
+// SecurityTokenNotYetValidException.cs
+//
+// Author:
+//   Noesis Labs (Ryan.Melena@noesislabs.com)
+//
+// Copyright (C) 2014 Noesis Labs, LLC  https://noesislabs.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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.Runtime.Serialization;
+
+namespace System.IdentityModel.Tokens
+{
+	public class SecurityTokenNotYetValidException : SecurityTokenValidationException
+	{
+		public SecurityTokenNotYetValidException()
+			: base("ID4182: The security token is not valid yet.")
+		{ }
+
+		public SecurityTokenNotYetValidException(string message)
+			: base(message)
+		{ }
+
+		public SecurityTokenNotYetValidException(string message, Exception innerException)
+			: base(message, innerException)
+		{ }
+
+		public SecurityTokenNotYetValidException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{ }
+	}
+}

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

@@ -0,0 +1,52 @@
+//
+// SecurityTokenReplayDetectedException.cs
+//
+// Author:
+//   Noesis Labs (Ryan.Melena@noesislabs.com)
+//
+// Copyright (C) 2014 Noesis Labs, LLC  https://noesislabs.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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.Runtime.Serialization;
+
+namespace System.IdentityModel.Tokens
+{
+	public class SecurityTokenReplayDetectedException : SecurityTokenValidationException
+	{
+		public SecurityTokenReplayDetectedException()
+			: base("ID1070: Replay has been detected for a SecurityToken.")
+		{ }
+
+		public SecurityTokenReplayDetectedException(string message)
+			: base(message)
+		{ }
+
+		public SecurityTokenReplayDetectedException(string message, Exception innerException)
+			: base(message, innerException)
+		{ }
+
+		public SecurityTokenReplayDetectedException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{ }
+	}
+}

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SessionSecurityToken.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;
@@ -106,4 +105,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SessionSecurityTokenCache.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.Generic;
@@ -48,4 +47,3 @@ namespace System.IdentityModel.Tokens
 		public abstract void RemoveAll (string endpointId, UniqueId contextId);
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SessionSecurityTokenCacheKey.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.Xml;
@@ -71,4 +70,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SessionSecurityTokenHandler.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.Generic;
@@ -145,4 +144,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/TokenReplayCache.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.Configuration;
@@ -49,4 +48,3 @@ namespace System.IdentityModel.Tokens
 		public abstract void Remove (string key);
 	}
 }
-#endif

mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SigningCredentials.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.Security.Cryptography.X509Certificates;
@@ -59,4 +58,3 @@ namespace System.IdentityModel.Tokens
 		}
 	}
 }
-#endif