Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono-tools.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2016-08-22 18:41:02 +0300
committerMarek Safar <marek.safar@gmail.com>2016-08-22 18:41:19 +0300
commit78a492495a387c804f41e8ca619e2239138163b9 (patch)
tree1cfe4a402da45353a35d5cf266de850e45419b49
parent4da0ade94499c81e819fde93e10141e5502d103b (diff)
Update gui-compare
-rw-r--r--gui-compare/InfoManager.cs6
-rw-r--r--gui-compare/Makefile.am2
-rw-r--r--gui-compare/MasterMetadata.cs3
3 files changed, 9 insertions, 2 deletions
diff --git a/gui-compare/InfoManager.cs b/gui-compare/InfoManager.cs
index 246b2cd2..373ef5b4 100644
--- a/gui-compare/InfoManager.cs
+++ b/gui-compare/InfoManager.cs
@@ -545,6 +545,10 @@ namespace GuiCompare
u = GetMasterInfoUri ("masterinfos-4.5.tar.gz");
break;
+ case "4.6.2":
+ u = GetMasterInfoUri ("masterinfos-4.6.2.tar.gz");
+ break;
+
case "SL2":
u = GetMasterInfoUri ("masterinfos-SL2.tar.gz");
break;
@@ -861,6 +865,8 @@ namespace GuiCompare
Populate (sub, "API 3.5 sp1", GetVersionPath ("2.0", "net_2_0"), "3.5", api_3_5);
Populate (sub, "API 4.0", GetVersionPath ("4.0", "net_4_0"), "4.0", api_4_0);
Populate (sub, "API 4.5", GetVersionPath ("4.5", "net_4_5"), "4.5", api_4_5);
+ Populate (sub, "API 4.6.2", GetVersionPath ("4.5", "net_4_x"), "4.6.2", api_4_5);
+
// Populate (sub, "Silverlight 2.0", GetVersionPath ("2.1", "net_2_1"), "SL2", api_sl2);
// Populate (sub, "Silverlight 3.0", GetVersionPath ("2.1", "net_2_1"), "SL3", api_sl2);
Populate (sub, "Silverlight 4.0", GetVersionPath ("2.1", "net_2_1"), "SL4", api_sl4);
diff --git a/gui-compare/Makefile.am b/gui-compare/Makefile.am
index 59829b2a..cc7cd800 100644
--- a/gui-compare/Makefile.am
+++ b/gui-compare/Makefile.am
@@ -56,4 +56,4 @@ assemblies = -r:System -r:System.Core -r:Mono.Posix -r:System.Xml
ress= $(foreach res,$(gui_compare_resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources)
- $(DMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies)
+ $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies)
diff --git a/gui-compare/MasterMetadata.cs b/gui-compare/MasterMetadata.cs
index 189b42c8..dde85236 100644
--- a/gui-compare/MasterMetadata.cs
+++ b/gui-compare/MasterMetadata.cs
@@ -161,6 +161,7 @@ namespace GuiCompare {
case "System.Runtime.InteropServices.ComVisibleAttribute":
case "System.Runtime.AssemblyTargetedPatchBandAttribute":
case "System.Diagnostics.DebuggableAttribute":
+ case "System.Runtime.CompilerServices.IteratorStateMachineAttribute":
return true;
}
@@ -778,7 +779,7 @@ namespace GuiCompare {
this.parameters = parameters;
this.genericParameters = genericParameters;
// we don't care about the Assembly (internal) part
- this.methodAccess = methodAccess.Replace ("FamORAssem", "Family");
+ this.methodAccess = methodAccess.Replace ("FamORAssem", "Family"). Replace ("ReuseSlot", "CompilerControlled");
this.attributes = attributes;
}