diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
index 1dc0c2e0db8..e3426bf8703 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
@@ -82,7 +82,7 @@
18.165.29912-buildid11693003
1.0.422
0.2.0
- 5.0.7-beta.20159.1
+ 5.1.0-beta.21356.1
16.6.1
1.0.0-preview.2
16.9.1050
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
index cc66fbca32b..737ec7a2924 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
@@ -8,6 +8,7 @@
EnableNgenOptimization Set to true to enable NGEN optimization (partial or full).
EnableNgenOptimizationLogDetails Set to true to enable NGEN method logging output
ApplyNgenOptimization Set to 'partial' or 'full' in a project to embed partial/full NGEN optimization data to the built binary.
+ IgnoreIbcMergeErrors Set to true to ignore certain errors encountered while running ibcmerge, those problematic IBC files will be ignored.
Items:
OptimizeAssembly Set of assemblies to apply Partial NGEN optimization data to.
@@ -117,6 +118,8 @@
<_PartialNgenArg/>
<_PartialNgenArg Condition="'$(ApplyNgenOptimization)' == 'partial'">-partialNGEN
+ <_IgnoreMvidMismatchArg/>
+ <_IgnoreMvidMismatchArg Condition="'$(IgnoreIbcMergeErrors)' == 'true'">-ignoremvidmismatch
@@ -127,7 +130,7 @@
- -q -f $(_PartialNgenArg) -minify -delete -mo "%(_AssemblyWithRawIbcData.PreviousAssemblyCopyPath)" "$([MSBuild]::ValueOrDefault('%(_AssemblyWithRawIbcData.IbcFiles)', '').Replace(';', '" "'))"
+ -q -f $(_PartialNgenArg) $(_IgnoreMvidMismatchArg) -minify -delete -mo "%(_AssemblyWithRawIbcData.PreviousAssemblyCopyPath)" "$([MSBuild]::ValueOrDefault('%(_AssemblyWithRawIbcData.IbcFiles)', '').Replace(';', '" "'))"
<_IbcMergeInvocation Include="%(_AssemblyWithRawIbcData.AssemblyFileName) [MergePreviousToCurrent]">