[bundle] Add linkeranalyzer.exe to the bundle (dotnet#1097)

Also added bundle version property, to avoid setting it in multiple places.
brendanzagaeski · Dec 21, 2017 · eb175c5 · eb175c5
1 parent 3bfafea
commit eb175c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build-tools/bundle/bundle-path.targets b/build-tools/bundle/bundle-path.targets
@@ -35,8 +35,9 @@
   <Target Name="GetBundleFileName"
       DependsOnTargets="_GetHashes">
     <PropertyGroup>
-      <XABundleFileName Condition=" '$(HostOS)' != 'Windows' ">bundle-v19-h$(_VersionHash)-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
-      <XABundleFileName Condition=" '$(HostOS)' == 'Windows' ">bundle-v19-h$(_VersionHash)-$(Configuration)-Darwin-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleVersion>v20</XABundleVersion>
+      <XABundleFileName Condition=" '$(HostOS)' != 'Windows' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleFileName Condition=" '$(HostOS)' == 'Windows' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-Darwin-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -93,6 +93,7 @@
     />
   </ItemGroup>
   <ItemGroup>
+    <_MonoUtility  Include="linkeranalyzer.exe" />
     <_MonoUtility  Include="mono-symbolicate.exe" />
     <_MonoUtility  Include="mkbundle.exe" />
   </ItemGroup>

diff --git a/external/mono b/external/mono