Skip to content

Dllimport generator build and test fixes #59658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 32 commits into from
Oct 6, 2021
Merged

Dllimport generator build and test fixes #59658

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ea54b1f
Enable DllImportGenerator in more tests.
jkoritzinsky Sep 27, 2021
6f40531
Keep some of the P/Invokes using GeneratedDllImport for various reaso…
jkoritzinsky Sep 27, 2021
dbc141d
Use TargetFrameworks so the TargetFramework.Sdk sdk kicks in and auto…
jkoritzinsky Sep 27, 2021
2a65756
Disable DllImportGenerator runtime tests that depend on DNNE on mobil…
jkoritzinsky Sep 27, 2021
a24525e
Undo GeneratedDllImport on GetLongPathNameW for the same reason as Ge…
jkoritzinsky Sep 27, 2021
7a3148f
Make sure that the DllImportGeneratorSample can build.
jkoritzinsky Sep 28, 2021
fe101e4
Fix function pointer usage bug in tests. Disable one SetLastError tes…
jkoritzinsky Sep 28, 2021
ed44881
Merge branch 'feature/use-dllimport-generator' of github.com:dotnet/r…
jkoritzinsky Sep 28, 2021
e05c631
Pass the OutputRid property as the RuntimeIdentifier for NativeExport…
jkoritzinsky Sep 28, 2021
e5652ae
Disable DllImportGenerator.Tests on Mono wholesale due to a bug in ho…
jkoritzinsky Sep 29, 2021
986e9a5
Add MSBuild and CMake in NativeExports.csproj to enable correctly dis…
jkoritzinsky Sep 29, 2021
102a95d
Resolve nethost for NativeExports in a manner that will work with the…
jkoritzinsky Sep 30, 2021
4644434
Update issue reference for why DllImportGenerator.Tests don't run on …
jkoritzinsky Sep 30, 2021
ac37572
Fix handling custom user compilation/link flags correctly between CMa…
jkoritzinsky Sep 30, 2021
027ad10
Merge branch 'feature/use-dllimport-generator' of https://github.com/…
jkoritzinsky Sep 30, 2021
d5e66f1
Update DNNE so we can cross-build NativeExports.
jkoritzinsky Sep 30, 2021
f77cd70
Merge remote-tracking branch 'dotnet/feature/use-dllimport-generator'…
jkoritzinsky Oct 2, 2021
cf6e22b
Remove release runtime check since we now use a DNNE version that han…
jkoritzinsky Oct 2, 2021
a3efde9
Windows cross builds don't need to use the CMake info to set up the t…
jkoritzinsky Oct 3, 2021
c8fcd84
Move changes for toolchain.cmake to output-toolchain-info.cmake to av…
jkoritzinsky Oct 3, 2021
e77b7f0
Refactor NativeExports custom targets.
jkoritzinsky Oct 3, 2021
e320cbd
Add resolution step for target triplets for Apple platforms (OSX and …
jkoritzinsky Oct 3, 2021
d4aff51
Exclude tests for FreeBSD and (in a way that works) Mono on Desktop.
jkoritzinsky Oct 3, 2021
392ee65
Update DNNE
jkoritzinsky Oct 4, 2021
d633dc8
Merge branch 'feature/use-dllimport-generator' of https://github.com/…
jkoritzinsky Oct 4, 2021
6107024
Use TargetOS instead of TargetsX properties.
jkoritzinsky Oct 4, 2021
ff049ab
Fix macOS target triple calculations.
jkoritzinsky Oct 4, 2021
50c189e
Disable DllImportGenerator tests on Win-arm as it's not officially su…
jkoritzinsky Oct 4, 2021
6646f12
Set the nethost dir for all builds, not just for non-Apple Unix-like …
jkoritzinsky Oct 4, 2021
4d55f3a
Use xcrun to find the compiler and sysroot for Apple builds.
jkoritzinsky Oct 5, 2021
2c94662
Fix elinor's feedback for merging this PR.
jkoritzinsky Oct 6, 2021
00726aa
Merge branch 'feature/use-dllimport-generator' of https://github.com/…
jkoritzinsky Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Disable DllImportGenerator.Tests on Mono wholesale due to a bug in ho… 
…w Mono loads (or more acurately doesn't) the native library component of these tests.
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Sep 29, 2021
commit e5652aeb69ab0f6e6a80cb4f2bc3794961eb08ac
5 changes: 5 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
<!-- Issue: https://github.com/dotnet/runtime/issues/59766 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Windows' and '$(RuntimeFlavor)' == 'Mono' and '$(RunDisabledMonoTestsOnWindows)' != 'true'">
<!-- Issue: https://github.com/dotnet/runtime/issues/53281 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.WebSockets.Client\tests\System.Net.WebSockets.Client.Tests.csproj" />
Expand Down