diff options
| -rw-r--r-- | Directory.Build.props | 5 | ||||
| -rw-r--r-- | eng/Versions.props | 6 | ||||
| -rw-r--r-- | external/Mono.Cecil.overrides | 5 | ||||
| m--------- | external/cecil | 0 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 4f3900653..920bc6e1c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -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> diff --git a/eng/Versions.props b/eng/Versions.props index 604cc91f8..9ca1d8be9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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> diff --git a/external/Mono.Cecil.overrides b/external/Mono.Cecil.overrides index e4819f27c..5c41e8cfa 100644 --- a/external/Mono.Cecil.overrides +++ b/external/Mono.Cecil.overrides @@ -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)' == ''"> diff --git a/external/cecil b/external/cecil -Subproject c600e6b9eb66dc45f13a6099079edc99091e795 +Subproject 8cf97c125748b0a2832f0420728c8fac2ae2234 |