diff options
| author | Marek Safar <marek.safar@gmail.com> | 2019-08-07 20:37:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 20:37:19 +0300 |
| commit | b3344fa0b27fef81e76a3f5d4633782bda160613 (patch) | |
| tree | c1e05987e43ef48131d5efb208562e01062944f1 /mcs/tools | |
| parent | 4780486237dfc9feab14317239593b90cd5b3d18 (diff) | |
Bump linker (#16014)
* Bump linker
* Bump api-doc-tools and add NEW_CECIL define to mdoc
* Bump linker
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/corcompare/mono-api-info.cs | 4 | ||||
| -rw-r--r-- | mcs/tools/linker/monolinker.csproj | 1 | ||||
| -rw-r--r-- | mcs/tools/linker/monolinker.exe.sources | 1 | ||||
| -rw-r--r-- | mcs/tools/mdoc/Makefile | 2 | ||||
| -rw-r--r-- | mcs/tools/mdoc/mdoc.csproj | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/mcs/tools/corcompare/mono-api-info.cs b/mcs/tools/corcompare/mono-api-info.cs index ac0674730bf..df7fb4e6bb0 100644 --- a/mcs/tools/corcompare/mono-api-info.cs +++ b/mcs/tools/corcompare/mono-api-info.cs @@ -586,9 +586,9 @@ namespace Mono.ApiTools { writer.WriteStartElement ("generic-parameter-constraints"); - foreach (TypeReference constraint in constraints) { + foreach (GenericParameterConstraint constraint in constraints) { writer.WriteStartElement ("generic-parameter-constraint"); - writer.WriteAttributeString ("name", Utils.CleanupTypeName (constraint)); + writer.WriteAttributeString ("name", Utils.CleanupTypeName (constraint.ConstraintType)); writer.WriteEndElement (); // generic-parameter-constraint } diff --git a/mcs/tools/linker/monolinker.csproj b/mcs/tools/linker/monolinker.csproj index 4ad6ae9f229..deecaee30d2 100644 --- a/mcs/tools/linker/monolinker.csproj +++ b/mcs/tools/linker/monolinker.csproj @@ -54,6 +54,7 @@ <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\BaseStep.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\BlacklistStep.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\CleanStep.cs" /> + <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\ClearInitLocals.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\CodeRewriterStep.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\IStep.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker.Steps\LoadI18nAssemblies.cs" /> diff --git a/mcs/tools/linker/monolinker.exe.sources b/mcs/tools/linker/monolinker.exe.sources index 8581d0e2e5f..e436b3e03ed 100644 --- a/mcs/tools/linker/monolinker.exe.sources +++ b/mcs/tools/linker/monolinker.exe.sources @@ -29,6 +29,7 @@ ../../../external/linker/src/linker/Linker/TypeReferenceExtensions.cs ../../../external/linker/src/linker/Linker/XApiReader.cs ../../../external/linker/src/linker/Linker.Steps/BaseStep.cs +../../../external/linker/src/linker/Linker.Steps/ClearInitLocals.cs ../../../external/linker/src/linker/Linker.Steps/LoadReferencesStep.cs ../../../external/linker/src/linker/Linker.Steps/LoadI18nAssemblies.cs ../../../external/linker/src/linker/Linker.Steps/ResolveFromXmlStep.cs diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile index 33249801eca..e3c5a321d1a 100644 --- a/mcs/tools/mdoc/Makefile +++ b/mcs/tools/mdoc/Makefile @@ -21,7 +21,7 @@ MONODOC_RESOURCES_COMMAND = $(foreach file,$(MONODOC_RESOURCES),/resource:../../ LIB_REFS = monodoc System System.Xml System.Core Mono.Cecil ICSharpCode.SharpZipLib System.Xml.Linq System.Web -LOCAL_MCS_FLAGS = $(MDOC_RESOURCES_COMMAND) $(MONODOC_RESOURCES_COMMAND) +LOCAL_MCS_FLAGS = $(MDOC_RESOURCES_COMMAND) $(MONODOC_RESOURCES_COMMAND) -define:NEW_CECIL PROGRAM = $(topdir)/class/lib/$(PROFILE)/mdoc.exe PROGRAM_DEPS = $(topdir)/class/lib/$(PROFILE)/monodoc.dll MSCORLIB = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll diff --git a/mcs/tools/mdoc/mdoc.csproj b/mcs/tools/mdoc/mdoc.csproj index 99465448091..d3ba6232daa 100644 --- a/mcs/tools/mdoc/mdoc.csproj +++ b/mcs/tools/mdoc/mdoc.csproj @@ -26,12 +26,12 @@ <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' "> <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath> <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath> - <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants> + <DefineConstants>NEW_CECIL;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' "> <OutputPath>./../../class/lib/monodroid_tools</OutputPath> <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid_tools</IntermediateOutputPath> - <DefineConstants>NET_4_6;MONO;MONODROID_TOOLS;WIN_PLATFORM</DefineConstants> + <DefineConstants>NEW_CECIL;NET_4_6;MONO;MONODROID_TOOLS;WIN_PLATFORM</DefineConstants> </PropertyGroup> <!-- @ALL_PROFILE_PROPERTIES@ --> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |