Skip to content

Commit

Permalink
[release/9.0.1xx-preview7] Link with swift (#20954)
Browse files Browse the repository at this point in the history
The runtime now requires Swift so let's link with it by default

dotnet/runtime@2c70e36

Fixes:
https://dev.azure.com/xamarin/public/_build/results?buildId=120547&view=logs&j=71979588-66ac-5e95-831a-69c8cd9b2cd2&t=acd19e4c-afbd-5efc-2769-76bfa657ccbb&l=2196

```
/Users/builder/azdo/_work/1/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk.net9.0_17.5/17.5.9217-net9-p7/targets/Xamarin.Shared.Sdk.targets(1634,3): error : clang++ exited with code 1: [/Users/builder/azdo/_work/1/s/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst]
/Users/builder/azdo/_work/1/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk.net9.0_17.5/17.5.9217-net9-p7/targets/Xamarin.Shared.Sdk.targets(1634,3): error : Undefined symbols for architecture x86_64: [/Users/builder/azdo/_work/1/s/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst]
/Users/builder/azdo/_work/1/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk.net9.0_17.5/17.5.9217-net9-p7/targets/Xamarin.Shared.Sdk.targets(1634,3): error :   "_$sSqMa", referenced from: [/Users/builder/azdo/_work/1/s/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst]
/Users/builder/azdo/_work/1/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk.net9.0_17.5/17.5.9217-net9-p7/targets/Xamarin.Shared.Sdk.targets(1634,3): error :       _$s17pal_swiftbindings7encrypt_3key9nonceData9plaintext10cipherText3tag3aadyxm_SRys5UInt8VGA2KSryAJGAlKtKAA22AEADSymmetricAlgorithmRzlF in libSystem.Security.Cryptography.Native.Apple.a(pal_swiftbindings.o) [/Users/builder/azdo/_work/1/s/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst]
/Users/builder/azdo/_work/1/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk.net9.0_17.5/17.5.9217-net9-p7/targets/Xamarin.Shared.Sdk.targets(1634,3): error :   "_$ss5ErrorMp", referenced from: [/Users/builder/azdo/_work/1/s/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst]
```
  • Loading branch information
dalexsoto authored Jul 30, 2024
1 parent 89556af commit 4b65c79
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1507,6 +1507,8 @@
<PropertyGroup>
<_ExportedSymbolsFile Condition="'$(_ExportedSymbolsFile)' == '' and '$(_MtouchSymbolsList)' == ''">/dev/null</_ExportedSymbolsFile> <!-- nothing to export -->
<_ExportedSymbolsFile Condition="'$(_ExportedSymbolsFile)' == ''">$(_MtouchSymbolsList)</_ExportedSymbolsFile>
<!-- Runtime now requires swift https://github.com/dotnet/runtime/commit/2c70e36356e8dfb50e6b32c8b7c9ce1a8e9f1331 -->
<LinkWithSwiftSystemLibraries>true</LinkWithSwiftSystemLibraries>
</PropertyGroup>
<ItemGroup>
<_XamarinMainLibraries Include="$(_XamarinNativeLibraryDirectory)/$(_LibXamarinName)" />
Expand Down

7 comments on commit 4b65c79

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ API diff for current PR / commit

NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

.NET (No breaking changes)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💻 [CI Build] Windows Integration Tests passed 💻

All Windows Integration Tests passed.

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 100 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 1 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 40 tests passed. Html Report (VSDrops) Download
⚠️ mac-binding-project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
✅ monotouch (iOS): All 7 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 7 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 4b65c7941ded4ee3695ad3fc4805859df62f0b6b [CI build]

Please sign in to comment.