You've already forked linux-packaging-mono
Imported Upstream version 5.4.0.167
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
e49d6f06c0
commit
536cd135cc
@@ -2,7 +2,8 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\dir.props" />
|
||||
<PropertyGroup>
|
||||
<AssemblyVersion>4.0.4.0</AssemblyVersion>
|
||||
<AssemblyVersion>4.0.5.0</AssemblyVersion>
|
||||
<AssemblyKey>MSFT</AssemblyKey>
|
||||
<IsNETCoreApp>true</IsNETCoreApp>
|
||||
<IsUAP>true</IsUAP>
|
||||
<IsUAPRef>false</IsUAPRef>
|
||||
|
||||
@@ -136,48 +136,6 @@
|
||||
<data name="net_uri_BadUnicodeHostForIdn" xml:space="preserve">
|
||||
<value>An invalid Unicode character by IDN standards was specified in the host.</value>
|
||||
</data>
|
||||
<data name="DebugAssertBanner" xml:space="preserve">
|
||||
<value>---- DEBUG ASSERTION FAILED ----</value>
|
||||
</data>
|
||||
<data name="DebugAssertLongMessage" xml:space="preserve">
|
||||
<value>---- Assert Long Message ----</value>
|
||||
</data>
|
||||
<data name="DebugAssertShortMessage" xml:space="preserve">
|
||||
<value>---- Assert Short Message ----</value>
|
||||
</data>
|
||||
<data name="IO_FileNotFound" xml:space="preserve">
|
||||
<value>Unable to find the specified file.</value>
|
||||
</data>
|
||||
<data name="IO_FileNotFound_FileName" xml:space="preserve">
|
||||
<value>Could not find file '{0}'.</value>
|
||||
</data>
|
||||
<data name="IO_PathNotFound_NoPathName" xml:space="preserve">
|
||||
<value>Could not find a part of the path.</value>
|
||||
</data>
|
||||
<data name="IO_PathNotFound_Path" xml:space="preserve">
|
||||
<value>Could not find a part of the path '{0}'.</value>
|
||||
</data>
|
||||
<data name="IO_SharingViolation_File" xml:space="preserve">
|
||||
<value>The process cannot access the file '{0}' because it is being used by another process.</value>
|
||||
</data>
|
||||
<data name="IO_SharingViolation_NoFileName" xml:space="preserve">
|
||||
<value>The process cannot access the file because it is being used by another process.</value>
|
||||
</data>
|
||||
<data name="UnauthorizedAccess_IODenied_NoPathName" xml:space="preserve">
|
||||
<value>Access to the path is denied.</value>
|
||||
</data>
|
||||
<data name="UnauthorizedAccess_IODenied_Path" xml:space="preserve">
|
||||
<value>Access to the path '{0}' is denied.</value>
|
||||
</data>
|
||||
<data name="ArgumentOutOfRange_FileLengthTooBig" xml:space="preserve">
|
||||
<value>Specified file length was too large for the file system.</value>
|
||||
</data>
|
||||
<data name="IO_FileExists_Name" xml:space="preserve">
|
||||
<value>The file '{0}' already exists.</value>
|
||||
</data>
|
||||
<data name="IO_PathTooLong" xml:space="preserve">
|
||||
<value>The specified file name or path is too long, or a component of the specified path is too long.</value>
|
||||
</data>
|
||||
<data name="Argument_ExtraNotValid" xml:space="preserve">
|
||||
<value>Extra portion of URI not valid.</value>
|
||||
</data>
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
<Compile Include="$(CommonPath)\System\Diagnostics\Debug.cs" Condition="'$(TargetGroup)'!='uapaot'">
|
||||
<Link>Common\System\Diagnostics\Debug.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\System\Collections\Generic\ArrayBuilder.cs">
|
||||
<Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
|
||||
</Compile>
|
||||
@@ -48,66 +45,14 @@
|
||||
<Compile Include="System\UriScheme.cs" />
|
||||
<Compile Include="System\UriSyntax.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and ('$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap')">
|
||||
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
|
||||
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OutputDebugString.cs">
|
||||
<Link>Common\Interop\Windows\kernel32\Interop.OutputDebugString.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\System\Diagnostics\Debug.Windows.cs">
|
||||
<Link>Common\System\Diagnostics\Debug.Windows.cs</Link>
|
||||
</Compile>
|
||||
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
|
||||
<Compile Include="System\Uri.Windows.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetsUnix)' == 'true' and ('$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap')">
|
||||
<Compile Include="$(CommonPath)\System\Diagnostics\Debug.Unix.cs">
|
||||
<Link>Common\System\Diagnostics\Debug.Unix.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
|
||||
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Errors.cs">
|
||||
<Link>Common\Interop\Unix\Interop.Errors.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\Interop.IOErrors.cs">
|
||||
<Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Close.cs">
|
||||
<Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Dup.cs">
|
||||
<Link>Common\Interop\Unix\Interop.Dup.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.FileDescriptors.cs">
|
||||
<Link>Common\Interop\Unix\Interop.FileDescriptors.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.FLock.cs">
|
||||
<Link>Common\Interop\Unix\Interop.FLock.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Open.cs">
|
||||
<Link>Common\Interop\Unix\System.Native\Interop.Open.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.OpenFlags.cs">
|
||||
<Link>Common\Interop\Unix\System.Native\Interop.OpenFlags.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.SysLog.cs">
|
||||
<Link>Common\Interop\Unix\libc\Interop.SysLog.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Write.cs">
|
||||
<Link>Common\Interop\Unix\libc\Interop.Write.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Stat.cs">
|
||||
<Link>Common\Interop\Unix\Interop.Stat.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs">
|
||||
<Link>Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs</Link>
|
||||
</Compile>
|
||||
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
|
||||
<Compile Include="System\Uri.Unix.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
|
||||
<EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
|
||||
<Compile Include="System\Uri.Windows.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="System.Private.CoreLib" />
|
||||
|
||||
@@ -1 +1 @@
|
||||
b71a57b6298267629cb06d027fa18410dc8fd4f4
|
||||
49bee6ad5e4b2381f02bb718fac47fdd08ab822c
|
||||
@@ -26,9 +26,11 @@ namespace System
|
||||
|
||||
protected UriFormatException(SerializationInfo serializationInfo, StreamingContext streamingContext) : base(serializationInfo, streamingContext)
|
||||
{
|
||||
throw new PlatformNotSupportedException();
|
||||
}
|
||||
|
||||
void ISerializable.GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext) {
|
||||
void ISerializable.GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext)
|
||||
{
|
||||
base.GetObjectData(serializationInfo, streamingContext);
|
||||
}
|
||||
}; // class UriFormatException
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
<Compile Include="UriRelativeResolutionTest.cs" />
|
||||
<Compile Include="UriTests.cs" />
|
||||
<!-- Test common -->
|
||||
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
|
||||
<Link>Common\System\AssertExtensions.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonTestPath)\System\ThreadCultureChange.cs">
|
||||
<Link>Common\System\ThreadCultureChange.cs</Link>
|
||||
</Compile>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using Xunit;
|
||||
|
||||
namespace System.PrivateUri.Tests
|
||||
@@ -189,7 +190,7 @@ namespace System.PrivateUri.Tests
|
||||
var baseUri = new Uri("http://www.domain.com/");
|
||||
var relativeUri = new Uri("/path/", UriKind.Relative);
|
||||
#pragma warning disable 0618
|
||||
Assert.Throws<ArgumentNullException>("toUri", () => baseUri.MakeRelative(null)); // Uri is null
|
||||
AssertExtensions.Throws<ArgumentNullException>("toUri", () => baseUri.MakeRelative(null)); // Uri is null
|
||||
|
||||
Assert.Throws<InvalidOperationException>(() => relativeUri.MakeRelative(baseUri)); // Base uri is relative
|
||||
Assert.Throws<InvalidOperationException>(() => baseUri.MakeRelative(relativeUri)); // Uri is relative
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
<Compile Include="UriTests.cs" />
|
||||
<Compile Include="WebSocketsUriParserTest.cs" />
|
||||
<!-- Test common -->
|
||||
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
|
||||
<Link>Common\System\AssertExtensions.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="$(CommonTestPath)\System\ThreadCultureChange.cs">
|
||||
<Link>Common\System\ThreadCultureChange.cs</Link>
|
||||
</Compile>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Xunit;
|
||||
@@ -13,6 +14,7 @@ namespace System.PrivateUri.Tests
|
||||
//This test tests a case where the Core implementation of UriBuilder differs from Desktop Framework UriBuilder.
|
||||
//The Query property will not longer prepend a ? character if the string being assigned is already prepended.
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Difference in behavior")]
|
||||
public static void TestQuery()
|
||||
{
|
||||
var uriBuilder = new UriBuilder(@"http://foo/bar/baz?date=today");
|
||||
@@ -75,14 +77,14 @@ namespace System.PrivateUri.Tests
|
||||
[Fact]
|
||||
public void Ctor_String_Invalid()
|
||||
{
|
||||
Assert.Throws<ArgumentNullException>("uriString", () => new UriBuilder((string)null)); // UriString is null
|
||||
AssertExtensions.Throws<ArgumentNullException>("uriString", () => new UriBuilder((string)null)); // UriString is null
|
||||
Assert.Throws<UriFormatException>(() => new UriBuilder(@"http://host\")); // UriString is invalid
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Ctor_Uri_Null()
|
||||
{
|
||||
Assert.Throws<ArgumentNullException>("uri", () => new UriBuilder((Uri)null)); // Uri is null
|
||||
AssertExtensions.Throws<ArgumentNullException>("uri", () => new UriBuilder((Uri)null)); // Uri is null
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -289,9 +291,23 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("fragment", "#fragment")]
|
||||
[InlineData("#fragment", "#fragment")]
|
||||
[InlineData("#", "#")]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "In NET Core if the value starts with # then no other # is prepended, in Desktop we always prepend #")]
|
||||
public void Fragment_Get_Set_StartsWithPound(string value, string expected)
|
||||
{
|
||||
var uriBuilder = new UriBuilder();
|
||||
uriBuilder.Fragment = value;
|
||||
Assert.Equal(expected, uriBuilder.Fragment);
|
||||
|
||||
Uri oldUri = uriBuilder.Uri;
|
||||
uriBuilder.Fragment = value;
|
||||
Assert.NotSame(uriBuilder.Uri, oldUri); // Should generate new uri
|
||||
Assert.Equal(uriBuilder.Fragment, uriBuilder.Uri.Fragment);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("fragment", "#fragment")]
|
||||
[InlineData("", "")]
|
||||
[InlineData(null, "")]
|
||||
public void Fragment_Get_Set(string value, string expected)
|
||||
|
||||
@@ -136,6 +136,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Relative_SimplePartialPathWithUnknownScheme_Unicode_ReturnsPartialPathWithScheme()
|
||||
{
|
||||
string schemeAndRelative = "scheme:\u011E";
|
||||
@@ -146,6 +147,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Relative_SimplePartialPathWithScheme_Unicode_ReturnsPartialPathWithScheme()
|
||||
{
|
||||
string schemeAndRelative = "http:\u00C7";
|
||||
@@ -156,6 +158,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Relative_RightToLeft()
|
||||
{
|
||||
var loremIpsumArabic = "\u0643\u0644 \u0627\u0644\u0649 \u0627\u0644\u0639\u0627\u0644\u0645";
|
||||
@@ -168,6 +171,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Relative_Unicode_Glitchy()
|
||||
{
|
||||
var glitchy = "4\u0308\u0311\u031A\u030B\u0352\u034A\u030D\u036C\u036C\u036B\u0344\u0312\u0322\u0334\u0328\u0319\u0323\u0359\u0317\u0324\u0319\u032D\u0331\u0319\u031F\u0331\u0330\u0347\u0353\u0318\u032F\u032C\u03162\u0303\u0313\u031A\u0368\u036E\u0368\u0301\u0367\u0368\u0306\u0305\u0350\u036A\u036F\u0307\u0328\u035F\u0321\u0361\u0320\u032F\u032B\u034E\u0326\u033B";
|
||||
@@ -180,6 +184,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Unicode_Format_Character_Combinations_Scheme()
|
||||
{
|
||||
var combinations = CartesianProductAll(_ => CharUnicodeInfo.GetUnicodeCategory(_) == UnicodeCategory.Format && !UriHelper.IsIriDisallowedBidi(_));
|
||||
@@ -227,6 +232,7 @@ namespace System.PrivateUri.Tests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "See: dotnet/corefx #15145")]
|
||||
public void Uri_Unicode_SurrogatePairs_Scheme()
|
||||
{
|
||||
var combinations = CartesianProductAll(char.IsHighSurrogate, char.IsLowSurrogate, false);
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
<NoWarn>436</NoWarn>
|
||||
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
|
||||
</PropertyGroup>
|
||||
<!-- Help VS understand available configurations -->
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user