Skip to content
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.

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

Remove unnecessary reference to iOS workload pack in the Mono workload #53425

Merged
merged 2 commits into from
May 29, 2021

Conversation

steveisok
Copy link
Member

@steveisok steveisok commented May 28, 2021

The pack no longer exists and will cause an error when trying to import.

@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@steveisok
Copy link
Member Author

/backport to release/6.0-preview5

@github-actions
Copy link
Contributor

Started backporting to release/6.0-preview5: https://github.com/dotnet/runtime/actions/runs/885736064

@spouliot
Copy link
Contributor

@steveisok what are the difference between

<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-x64" /> and
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator" />

Is the later an arm64 version for the tvOS simulator (on M1) ?
If so why is it named this way ?

@steveisok
Copy link
Member Author

steveisok commented May 28, 2021

@steveisok what are the difference between

<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-x64" /> and
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator" />

Is the later an arm64 version for the tvOS simulator (on M1) ?
If so why is it named this way ?

I think x64 is another unnecessary reference.

As for tvossimulator, it will import the right pack depending on if you're targeting arm64 or x64. The alias is intended to make the installer smart about what packs to include.

"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator": {
      "kind": "Sdk",
      "version": "${PackageVersion}",
      "alias-to": {
        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
      }
    },

The naming of the aot compiler packs follow the format of Microsoft.NETCore.App.Runtime.AOT.<host_os-arch>.Cross.<target_os-arch>. Since there's a supported rid for iOS/tvOS and iOS/tvOSSimulator, we generate the appropriate aot compiler packs.

Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

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

I'm tempted to add a check that we aren't trying to load missing aliases. We can dot e2e install tests other places but we'd need a non abstract definition here.

@steveisok steveisok merged commit f881cf3 into dotnet:main May 29, 2021
@steveisok steveisok deleted the fix-ios-workload branch May 29, 2021 16:16
thaystg added a commit to thaystg/runtime that referenced this pull request Jun 1, 2021
…asm_debugger_and_use_debugger_agent

* upstream/main: (597 commits)
  Fix42292 (dotnet#52463)
  [mono] Remove some obsolete emscripten flags. (dotnet#53486)
  Fixed path to projects (dotnet#53435)
  support ServerCertificateContext in quic (dotnet#53175)
  Socket: delete unix local endpoint filename on Close (dotnet#52103)
  [mono] Fix sgen_gc_info.memory_load_bytes (dotnet#53364)
  Refactor MsQuic's native IP address types. (dotnet#53461)
  Re-enabled optimizations for gtFoldExprConst (dotnet#53347)
  Add diagnostic support into sample app and AppBuilders on Mono. (dotnet#53361)
  Fix issues with virtuals and mdarrays (dotnet#53400)
  Split Variant marshalling tests (dotnet#53035)
  Update clrjit.natvis to cover GT_SIMD and GT_HWINTRINSIC (dotnet#53470)
  remove WSL checks in tests (dotnet#53475)
  Always spawn message loop thread for SystemEvents (dotnet#53467)
  add AcceptAsync cancellation overloads (dotnet#53340)
  Remove unnecessary reference to iOS workload pack in the Mono workload (dotnet#53425)
  Add CookieContainer.GetAllCookies (dotnet#53441)
  Remove DynamicallyAccessedMembers on JsonSerializer  (dotnet#53235)
  [wasm] Re-enable Wasm.Build.Tests (dotnet#53433)
  [libraries] Move library tests Feature Switches defaults to Functional tests (dotnet#53253)
  ...
@ghost ghost locked as resolved and limited conversation to collaborators Jun 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants