Skip to content

Commit

Permalink
Re-enable multimodule testing (dotnet#75590)
Browse files Browse the repository at this point in the history
Resolves dotnet#66191.

I no longer see the warning or the link.exe failure. This likely was a link.exe bug like I suspected in the issue based on available evidence.

Of course we also regressed multimodule mode so I'm fixing that too.
  • Loading branch information
MichalStrehovsky authored Sep 14, 2022
1 parent 9d8be44 commit 0ff1f89
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The .NET Foundation licenses this file to you under the MIT license.

<!-- Set defaults for unspecified properties -->
<PropertyGroup>
<NativeLib Condition="'$(OutputType)' == 'Library' and '$(NativeLib)' == ''">Shared</NativeLib>
<NativeLib Condition="'$(OutputType)' == 'Library' and '$(NativeLib)' == '' and '$(IlcMultiModule)' != 'true'">Shared</NativeLib>
<NativeIntermediateOutputPath Condition="'$(NativeIntermediateOutputPath)' == ''">$(IntermediateOutputPath)native\</NativeIntermediateOutputPath>
<NativeOutputPath Condition="'$(NativeOutputPath)' == ''">$(OutputPath)native\</NativeOutputPath>
<NativeCompilationDuringPublish Condition="'$(NativeCompilationDuringPublish)' == ''">true</NativeCompilationDuringPublish>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/nativeaot/SmokeTests/MultiModule/MultiModule.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<!-- This test always runs as multimodule. It's not supported if we don't have framework object files. -->
<CLRTestTargetUnsupported Condition="'$(BuildNativeAotFrameworkObjects)' != 'true'">true</CLRTestTargetUnsupported>
<IlcMultiModule>true</IlcMultiModule>

<!-- https://github.com/dotnet/runtime/issues/66191 -->
<CLRTestTargetUnsupported>true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="MultiModule.cs" />
Expand Down

0 comments on commit 0ff1f89

Please sign in to comment.