Merge branch 'upstream'

Former-commit-id: f904ab7ba11f59bdf538610659c587881b3d0744
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-02-22 08:33:59 +00:00
commit 776e4e1507
47 changed files with 41 additions and 40 deletions

View File

@ -1 +1 @@
53ecca0a916d5199c18b953531f379fbf197d4b6
262c86fa75a3dd26eafd69386176e8cff3081c27

View File

@ -1 +1 @@
7b90edbc24c557975585b51e6d60bb43a5bf0bbb
99d427f42f44f09d6c0bf5414df245810f22a74a

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.20.0.218";
public const string MonoVersion = "5.20.0.220";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
8515153f31ef28434d2bfcc153059733675c124f
ac3b3ec49ae753e28f171895f3132773f43bd1ec

View File

@ -272,7 +272,8 @@ namespace System.Web.Configuration
{
string path = NormalizeVirtualPath (virtualPath);
foreach (VirtualDirectoryMapping mapping in map.VirtualDirectories) {
for (int j = 0; j < map.VirtualDirectories.Count; j++) {
VirtualDirectoryMapping mapping = map.VirtualDirectories.Get(j);
if (path.StartsWith (mapping.VirtualDirectory)) {
int i = mapping.VirtualDirectory.Length;
if (path.Length == i) {

View File

@ -1 +1 @@
90b722485e99ddcf014b3529bea96f0d3f348b8a
d513a46455b279bc0c9d84db00147297b935dc7b

View File

@ -1 +1 @@
a5a87987051fc8c3a86db6f61262e51f84485b7c
cc49b435ec3dd2c5f2432f9dbee55fe187cb89e7

View File

@ -1 +1 @@
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0
912f3cfb06dba16e6a033ee04f6b8144f3438a34

View File

@ -1 +1 @@
655381076049e9a1ecc571f6f8f964e5d6bec7e9
e097c20392e96179cc811ea14a908d6326671d7d

View File

@ -1 +1 @@
981bd3aadd27a0bd14b6e6c63770cef580cc2bea
fd6fc328f9faa2eec01f920b58745983b453aab4

View File

@ -1 +1 @@
e15b991bd78eca42eb48c6306d6a0582034cfedd
1bfaee4a4542edc6e8f7b0296b0524013b12703b

View File

@ -1 +1 @@
529579cdf52dd2bd45773d5499054966cd0b5615
367ef326877cb763195670d12df0e5ac1b40230e

View File

@ -1 +1 @@
90b722485e99ddcf014b3529bea96f0d3f348b8a
d513a46455b279bc0c9d84db00147297b935dc7b

View File

@ -1 +1 @@
a5a87987051fc8c3a86db6f61262e51f84485b7c
cc49b435ec3dd2c5f2432f9dbee55fe187cb89e7

View File

@ -1 +1 @@
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0
912f3cfb06dba16e6a033ee04f6b8144f3438a34

View File

@ -1 +1 @@
655381076049e9a1ecc571f6f8f964e5d6bec7e9
e097c20392e96179cc811ea14a908d6326671d7d

View File

@ -1 +1 @@
981bd3aadd27a0bd14b6e6c63770cef580cc2bea
fd6fc328f9faa2eec01f920b58745983b453aab4

View File

@ -1 +1 @@
e15b991bd78eca42eb48c6306d6a0582034cfedd
1bfaee4a4542edc6e8f7b0296b0524013b12703b

Some files were not shown because too many files have changed in this diff Show More