Skip to content

Bump cecil version #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2020
Merged

Bump cecil version #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52fd372
Bump cecil version
marek-safar Sep 26, 2020
a7c8f6a
Build against Cecil submodule (#1477)
sbomer Sep 9, 2020
a1def13
Fix formatting
vitek-karas Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
<IsPackable>false</IsPackable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<_ToolsProjectTargets>$(ArtifactsToolsetDir)Common\Tools.proj.nuget.g.targets</_ToolsProjectTargets>
<!-- Set this to false to build against the submodule. Convenient for experimenting locally. -->
<UseCecilPackage Condition="'$(MonoBuild)' != '' And '$(UseCecilPackage)' == ''">false</UseCecilPackage>
<UseCecilPackage Condition="'$(UseCecilPackage)' == ''">true</UseCecilPackage>
<!-- Set this to true to build against the package instead of the submodule. -->
<UseCecilPackage Condition="'$(UseCecilPackage)' == ''">false</UseCecilPackage>
<!-- No symbols are produced for ref assemblies, but some parts of the SDK still expect pdbs, so we explicitly tell it there are none. -->
<!-- Must be set after importing Arcade to override its defaults. -->
<DebugType Condition=" '$(IsReferenceAssembly)' == 'true' ">none</DebugType>
Expand Down
6 changes: 4 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
<MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20506.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20471.1</MicrosoftDotNetCodeAnalysisVersion>
<!-- We depend on (and redistribute) the official Mono.Cecil NuGet package built from https://github.com/jbevain/cecil -->
<MonoCecilVersion>0.11.2</MonoCecilVersion>
<!-- This controls the version of the cecil package, or the version of cecil in the project graph
when we build the cecil submodule. The reference assembly package will depend on this version of cecil.
Keep this in sync with ProjectInfo.cs in the submodule. -->
<MonoCecilVersion>0.11.3</MonoCecilVersion>
<UseVSTestRunner>true</UseVSTestRunner>
</PropertyGroup>
</Project>
5 changes: 5 additions & 0 deletions external/Mono.Cecil.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
<!-- Cecil sets PublicSign on windows, but we always want to
PublicSign. -->
<PublicSign>true</PublicSign>
<!-- When we build the cecil submodule, use the same version number
as the package dependency. This way the linker ref assembly package
will depend on the publicly available package. Note that we can't set
just set Version here because Arcade will override it. -->
<PackageVersion>$(MonoCecilVersion)</PackageVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(MonoBuild)' == ''">
Expand Down
2 changes: 1 addition & 1 deletion external/cecil
Open in desktop
Submodule cecil updated from c600e6 to 8cf97c
2 changes: 1 addition & 1 deletion src/linker/Linker.Steps/MarkStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2942,7 +2942,7 @@ protected virtual void MarkInterfaceImplementation (InterfaceImplementation ifac
//
// Extension point for reflection logic handling customization
//
internal protected virtual bool ProcessReflectionDependency (MethodBody body, Instruction instruction)
protected internal virtual bool ProcessReflectionDependency (MethodBody body, Instruction instruction)
{
return false;
}
Expand Down