Imported Upstream version 6.12.0.122

Former-commit-id: d3ff4118f95cc6907059c6001e5157df8832a115
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2021-02-22 16:53:32 +00:00
parent bb7877ea56
commit a0d6f2d6ec
61 changed files with 896 additions and 752 deletions

View File

@@ -1 +1 @@
f89ffeb1a7ba045965e3ab9bec7d658f8c860058
137a70b84639d06bb44687c02b93243af2c384e8

File diff suppressed because it is too large Load Diff

View File

@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
hostname = az-ubuntu-generalac2250
hostname = az-ubuntu-general4246e0
uname -m = x86_64
uname -r = 4.15.0-1100-azure
uname -r = 4.15.0-1106-azure
uname -s = Linux
uname -v = #111~16.04.1-Ubuntu SMP Thu Nov 19 06:49:21 UTC 2020
uname -v = #118~16.04.1-Ubuntu SMP Tue Jan 19 16:13:06 UTC 2021
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
on az-ubuntu-generalac2250
on az-ubuntu-general4246e0
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
401d5fbf5847eb552c3c59a37e0ac5e57cfc53cf
3e1939eeef08305ca794bdfdd07dde24bc106151

View File

@@ -71,6 +71,7 @@ namespace Mono.Linker.Steps
void ProcessAssembly (AssemblyDefinition assembly, XPathNodeIterator iterator)
{
ProcessTypes (assembly, iterator.Current.SelectChildren ("type", ""));
ProcessResources (assembly, iterator.Current.SelectChildren ("resource", ""));
}
void ProcessTypes (AssemblyDefinition assembly, XPathNodeIterator iterator)
@@ -184,6 +185,21 @@ namespace Mono.Linker.Steps
}
}
void ProcessResources (AssemblyDefinition assembly, XPathNodeIterator iterator)
{
while (iterator.MoveNext ()) {
XPathNavigator nav = iterator.Current;
string name = GetAttribute (nav, "name");
if (String.IsNullOrEmpty (name)) {
Context.LogMessage (MessageImportance.High, $"Invalid value for 'name' attribute: '{name}'.");
return;
}
Context.Annotations.AddResourceToRemove (assembly, name);
}
}
static bool TryConvertValue (string value, TypeReference target, out object result)
{
switch (target.MetadataType) {