Merge branch 'upstream'
Former-commit-id: 92723b01c747a84bee102df15a6a2b41efbe1eeb
This commit is contained in:
commit
8a0dd401eb
@ -1 +1 @@
|
||||
50b8a3ec381dbed9a226af25917bb89e42d14807
|
||||
663a69b1e9fc550a1cfe1cf770345f958fa3b663
|
@ -1 +1 @@
|
||||
1850540ae94c01271acde0c080cf58aa4f16b8e1
|
||||
8e35a6bedd770654adeec2c3f915c34dd95bfcb3
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.240";
|
||||
public const string MonoVersion = "5.18.0.244";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -110,14 +110,6 @@ namespace System.ComponentModel.Composition.ReflectionModel
|
||||
{
|
||||
Requires.NotNull(importDefinition, "importDefinition");
|
||||
|
||||
ReflectionImportDefinition reflectionImportDefinition = importDefinition as ReflectionImportDefinition;
|
||||
if (reflectionImportDefinition == null)
|
||||
{
|
||||
throw new ArgumentException(
|
||||
string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidImportDefinition, importDefinition.GetType()),
|
||||
"importDefinition");
|
||||
}
|
||||
|
||||
return (importDefinition is IPartCreatorImportDefinition);
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
||||
d1c83d5108b7a319ce582491398374d5e40a217f
|
@ -1 +1 @@
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
||||
8b51a4ad7468c261c9266b38e8d0e3589498d176
|
@ -1 +1 @@
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
||||
d75072804a802fb9e4ab0e7c5805179ac796655c
|
Binary file not shown.
@ -1 +1 @@
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
||||
5bc3fdc1863215f98d3816490159cd2d9d2f6836
|
@ -1 +1 @@
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
||||
143d5d57cb4f9591b5946e2c3cb8ec6da38a91b5
|
@ -1 +1 @@
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
||||
54086331073c7569257a8460ff072c244db7a620
|
@ -1 +1 @@
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
||||
22cbec68d86e10ad54e70532972e26668eb6bcb6
|
@ -1 +1 @@
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
||||
d1c83d5108b7a319ce582491398374d5e40a217f
|
@ -1 +1 @@
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
||||
8b51a4ad7468c261c9266b38e8d0e3589498d176
|
@ -1 +1 @@
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
||||
d75072804a802fb9e4ab0e7c5805179ac796655c
|
Binary file not shown.
@ -1 +1 @@
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
||||
5bc3fdc1863215f98d3816490159cd2d9d2f6836
|
@ -1 +1 @@
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
||||
143d5d57cb4f9591b5946e2c3cb8ec6da38a91b5
|
@ -1 +1 @@
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
||||
54086331073c7569257a8460ff072c244db7a620
|
@ -1 +1 @@
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
||||
22cbec68d86e10ad54e70532972e26668eb6bcb6
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user