Skip to content

Commit

Permalink
[6.0.4xx] [msbuild] Use _TrimmerDefaultAction if TrimmerDefaultAction…
Browse files Browse the repository at this point in the history 
… isn't set. (#16126)

The .NET 7 linker targets will set _TrimmerDefaultAction instead of
TrimmerDefaultAction, so if TrimmerDefaultAction isn't set (which it will be
for .NET 6), then use _TrimmerDefaultAction (which should be set for .NET 7).

Unfortunately for .NET 8 it seems I've misplaced my crystal ball, so we'll
have to wait a bit to see what happens then.

Ref: #16125.

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1621047.
  • Loading branch information
@rolfbjarne
rolfbjarne committed Sep 27, 2022
1 parent 1534bfa commit ad955c0
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
<PropertyGroup>
<!-- We need to use netX.Y because when building from VS it sets MSBuildRuntimeType to Core and will pick net472 (which doesn't contain the illink assembly) -->
<_RemoteILLinkPath>$(ILLinkTasksAssembly.Replace('$(NetCoreRoot)', '$(_DotNetRootRemoteDirectory)').Replace('net472', 'net$(BundledNETCoreAppTargetFrameworkVersion)').Replace('$([System.IO.Path]::GetFileName('$(ILLinkTasksAssembly)'))', 'illink.dll'))</_RemoteILLinkPath>

<!-- The .NET 7 linker sets _TrimmerDefaultAction instead of TrimmerDefaultAction, so copy that value if it's set (and TrimmerDefaultAction is not set) -->
<TrimmerDefaultAction Condition="'$(TrimmerDefaultAction)' == ''">$(_TrimmerDefaultAction)</TrimmerDefaultAction>
</PropertyGroup>

<!-- Include Debug symbols as input so those are copied to the server -->
Expand Down

5 comments on commit ad955c0

@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] API Diff 📋

API Current PR diff

✅ API Diff (from PR only) (no change)

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

API diff

✅ API Diff from stable

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

Generator diff

✅ Generator Diff (no change)

Pipeline on Agent XAMMINI-052.Monterey'
Hash: ad955c0d4f7c1e680fddae23707c94faf3cb2802

@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 Mac Catalina (10.15) passed 💻

✅ All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: ad955c0d4f7c1e680fddae23707c94faf3cb2802

@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 Big Sur (11.5) failed ❌

Failed tests are:

  • introspection
  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: ad955c0d4f7c1e680fddae23707c94faf3cb2802

@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 failed on VSTS: simulator tests iOS ❌

Tests failed on VSTS: simulator tests iOS.

Test results

1 tests failed, 233 tests passed.

Failed tests

  • mmptest/macOS/Debug: Failed (Execution failed with exit code 2)

Pipeline on Agent XAMMINI-013.Monterey'
[6.0.4xx] [msbuild] Use _TrimmerDefaultAction if TrimmerDefaultAction isn't set. (#16126)

Please sign in to comment.