mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.Windows.Forms/System.Resources/ResXFileRef.cs
View File

@ -68,6 +68,10 @@ namespace System.Resources {
if (parts.Length == 1)
throw new ArgumentException ("value");
string filename = parts [0];
if (Path.DirectorySeparatorChar == '/')
filename = filename.Replace ("\\", "/");
Type type = Type.GetType (parts [1]);
if (type == typeof(string)) {
Encoding encoding;
@ -77,12 +81,12 @@ namespace System.Resources {
encoding = Encoding.Default;
}
using (TextReader reader = new StreamReader(parts [0], encoding)) {
using (TextReader reader = new StreamReader(filename, encoding)) {
return reader.ReadToEnd();
}
}
using (FileStream file = new FileStream (parts [0], FileMode.Open, FileAccess.Read, FileShare.Read)) {
using (FileStream file = new FileStream (filename, FileMode.Open, FileAccess.Read, FileShare.Read)) {
buffer = new byte [file.Length];
file.Read(buffer, 0, (int) file.Length);
}
@ -90,7 +94,7 @@ namespace System.Resources {
if (type == typeof(System.Byte[]))
return buffer;
if (type == typeof (Bitmap) && Path.GetExtension (parts [0]) == ".ico") {
if (type == typeof (Bitmap) && Path.GetExtension (filename) == ".ico") {
MemoryStream ms = new MemoryStream (buffer);
return new Icon (ms).ToBitmap ();
}