Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -6,7 +6,7 @@
//
// Copyright 2007 Marcos Cobena (http://www.youcannoteatbits.org/)
//
#if !MOBILE && !XAMMAC_4_5
using System;
using System.Collections.Generic;
using System.ServiceModel;
@ -210,3 +210,4 @@ namespace MonoTests.System.ServiceModel.PeerResolvers
}
}
}
#endif

View File

@ -25,7 +25,7 @@
// 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 !MOBILE && !XAMMAC_4_5
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@ -100,3 +100,5 @@ public class PeerNodeAddress
*/
}
#endif