Skip to content

Commit

Permalink
Fix building apps (it now finds the native libs)
Browse files Browse the repository at this point in the history 
Credits to @filipnavara

filipnavara@8325f8d
  • Loading branch information
Sebastien Pouliot committed Apr 16, 2021
1 parent 0ac9320 commit 106defd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<!-- Don't include default Compile items for binding projects, because that would pick up ApiDefinition.cs and StructsAndEnums.cs -->
<EnableDefaultCompileItems Condition=" '$(IsBindingProject)' == 'true' ">false</EnableDefaultCompileItems>

<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' ">true</UseMonoRuntime>
<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_XamarinRuntime)' != 'CoreCLR' ">true</UseMonoRuntime>
<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_XamarinRuntime)' == 'CoreCLR' ">false</UseMonoRuntime>
</PropertyGroup>

<!-- Architecture -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@

<Target Name="_ComputeFrameworkVariables" DependsOnTargets="ResolveRuntimePackAssets">
<PropertyGroup>
<_PackageIdInfix Condition="'$(_XamarinRuntime)' != 'CoreCLR' And '$(_PlatformName)' == 'macOS'">Mono.</_PackageIdInfix>
<_PackageIdInfix Condition="'$(UseMonoRuntime)' == 'true'">Mono.</_PackageIdInfix>

<_MonoNugetPackageId>Microsoft.NETCore.App.Runtime.$(_PackageIdInfix)$(RuntimeIdentifier)</_MonoNugetPackageId>
</PropertyGroup>
Expand Down

1 comment on commit 106defd

@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.

❌ Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

Packages generated

View packages

Test results

12 tests failed, 170 tests passed.

Failed tests

  • monotouch-test/Mac [dotnet]/Debug [dotnet]: Failed (Test run crashed (exit code: 134).
    No test log file was produced)
  • monotouch-test/iOS Unified 64-bits - simulator/Debug [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations) [dotnet]: TimedOut
  • [NUnit] Mono CorlibTests/watchOS 32-bits - simulator/Debug: Failed
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 5.0): LaunchFailure

Pipeline on Agent XAMBOT-1036
Fix building apps (it now finds the native libs)

Please sign in to comment.