Skip to content

Commit 94fc064

Browse files
authored
Merge pull request #57865 from dotnet/merges/main-to-main-vs-deps
Merge main to main-vs-deps
2 parents f3dadd3 + 837e83d commit 94fc064

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<TargetFramework>net472</TargetFramework>
88
<UseWpf>true</UseWpf>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<ApplyNgenOptimization>full</ApplyNgenOptimization>
10+
<!--Temporarily bypass ibcmerge due to an error
11+
https://github.com/dotnet/roslyn/issues/57863 -->
12+
<ApplyNgenOptimization></ApplyNgenOptimization>
1113

1214
<!-- NuGet -->
1315
<IsPackable>true</IsPackable>
@@ -73,4 +75,4 @@
7375
<ItemGroup>
7476
<EmbeddedResource Update="EditorFeaturesWpfResources.resx" GenerateSource="true" />
7577
</ItemGroup>
76-
</Project>
78+
</Project>

0 commit comments

Comments
 (0)