Merge branch 'master' into config-checks-ipv6
[mono.git] / mcs / class / System / common.sources
index a12bf86ba802a274eefe671fe3186342cc27d98e..b4cb1317ba5f99a609e07911604acdd364614a43 100644 (file)
@@ -680,7 +680,6 @@ ReferenceSources/Win32Exception.cs
 ../referencesource/System/net/System/GenericUriParser.cs
 ../referencesource/System/net/System/IriHelper.cs
 ../referencesource/System/net/System/URI.cs
-../referencesource/System/net/System/uribuilder.cs
 ../referencesource/System/net/System/UriEnumTypes.cs
 ../referencesource/System/net/System/UriExt.cs
 ../referencesource/System/net/System/URIFormatException.cs
@@ -977,4 +976,6 @@ corefx/SR.cs
 
 ../../../external/corefx/src/System.Net.HttpListener/src/System/Net/WebSockets/HttpListenerWebSocketContext.cs
 
+../../../external/corefx/src/System.Private.Uri/src/System/UriBuilder.cs
+
 ../../../external/corefx/src/System.Runtime.Extensions/src/System/CodeDom/Compiler/IndentedTextWriter.cs