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.

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

[dotnet] Tell .NET to not generate files we don't need. Fixes #9687. #11693

Merged
merged 2 commits into from
May 31, 2021
Merged

[dotnet] Tell .NET to not generate files we don't need. Fixes #9687. #11693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aaa7a3
[dotnet] Tell .NET to not generate files we don't need. Fixes #9687.
rolfbjarne May 25, 2021
a351a01
Keep the *.runtimeconfig.json for now.
rolfbjarne May 31, 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
6 changes: 6 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,11 @@
<_XamarinSdkRoot Condition="'$(_XamarinSdkRoot)' == ''">$(_XamarinSdkRootDirectory)</_XamarinSdkRoot>
<!-- _XamarinSdkRootOnMac this should be passed to tasks that need to access the Xamarin Sdk dir on the Mac, this value will be overriden from Windows -->
<_XamarinSdkRootOnMac>$(_XamarinSdkRoot)</_XamarinSdkRootOnMac>

<!-- We don't need any runtime configuration files -->
<GenerateRuntimeConfigurationFiles Condition="'$(GenerateRuntimeConfigurationFiles)' ==''">false</GenerateRuntimeConfigurationFiles>
Copy link
Member

Choose a reason for hiding this comment

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

You will actually need it at some point. There's a Mono task that converts the JSON into binary blob and that can be passed to the Mono runtime. I recently implemented it in AppleAppBuilder on the dotnet/runtime side.

Copy link
Member

Choose a reason for hiding this comment

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

PR (for example usage): dotnet/runtime#53172
Tracking issue: dotnet/runtime#49237

It's necessary for features like EnableUnsafeUTF7Encoding and EnableUnsafeBinaryFormatterSerialization.

Copy link
Member Author

Choose a reason for hiding this comment

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

So I guess we'll have to:

  • Keep generating *.runtimeconfig.json file
  • Use Mono's task to convert the json to a binary blob.
  • Bundle the blob in the .app
  • Don't bundle the json in the app.

Is that correct?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've filed #11745 to track this.

Copy link
Member

Choose a reason for hiding this comment

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

Sounds correct to me.


<!-- We don't need any dependency files -->
<GenerateDependencyFile Condition="'$(GenerateDependencyFile)' == ''">false</GenerateDependencyFile>
</PropertyGroup>
</Project>
3 changes: 3 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
<UseNativeHttpHandler Condition="'$(_PlatformName)' != 'macOS' And '$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>

<!-- We don't need to generate reference assemblies for apps or app extensions -->
<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' And ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true')">false</ProduceReferenceAssembly>
Copy link
Contributor

Choose a reason for hiding this comment

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

hmm... iirc we're using .dll for the main assembly for net6 so that would never work (except for app extensions)

Copy link
Member Author

Choose a reason for hiding this comment

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

We use OutputType=Exe:

https://github.com/xamarin/xamarin-macios/blob/9d97d43f74c28fa4e0c1cc9fa70a0983f24b7ad9/tests/dotnet/MySingleView/MySingleView.csproj#L6

We also depend on this elsewhere in this exact file:

https://github.com/xamarin/xamarin-macios/blob/2aaa7a31b2313dc7bcd50af04c85b4db6d2c4ab0/dotnet/targets/Xamarin.Shared.Sdk.targets#L15-L35

Copy link
Contributor

Choose a reason for hiding this comment

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

hmm... is that recent ?

because size comparison shows MySingleView.dll for .net

or maybe the issue is elsewhere... <OutputType> not doing what seems logical ?

Copy link
Member Author

Choose a reason for hiding this comment

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

hmm... is that recent ?

No, it's not recent, it's always been this way.

because size comparison shows MySingleView.dll for .net

or maybe the issue is elsewhere... <OutputType> not doing what seems logical ?

Yes, OutputType is doing something different now. I'm not quite sure what, but I believe it doesn't affect the extension for the output assembly anymore.

</PropertyGroup>

<PropertyGroup>
Expand Down