Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@ -16,6 +16,8 @@ using System.Text;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Resources
{
[TestFixture]
@ -356,11 +358,11 @@ namespace MonoTests.System.Resources
stream.Write (buff, 0, buff.Length);
stream.Position = 0;
ResourceWriter rw = new ResourceWriter ("Test/resources/AddResource_Stream.resources");
ResourceWriter rw = new ResourceWriter (TestResourceHelper.GetFullPathOfResource ("Test/resources/AddResource_Stream.resources"));
rw.AddResource ("Name", (object)stream);
rw.Close ();
ResourceReader rr = new ResourceReader ("Test/resources/AddResource_Stream.resources");
ResourceReader rr = new ResourceReader (TestResourceHelper.GetFullPathOfResource ("Test/resources/AddResource_Stream.resources"));
IDictionaryEnumerator enumerator = rr.GetEnumerator ();
// Get the first element
@ -587,7 +589,7 @@ namespace MonoTests.System.Resources
{
MemoryStream ms = new MemoryStream ();
using (ResourceReader xr = new ResourceReader (
"Test/resources/bug81759.resources")) {
TestResourceHelper.GetFullPathOfResource ("Test/resources/bug81759.resources"))) {
ResourceWriter rw = new ResourceWriter (ms);
foreach (DictionaryEntry de in xr)
rw.AddResource ((string) de.Key, de.Value);