Skip to content

Clean up Android and iOS samples #44293

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

Merged
stephentoub merged 2 commits into from
Nov 8, 2020
Merged

Clean up Android and iOS samples #44293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65190e1
Clean up the samples
EgorBo Nov 5, 2020
ccb2f2b
Merge branch 'master' of github.com:dotnet/runtime into fix-aot-samples
EgorBo Nov 6, 2020
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
7 changes: 2 additions & 5 deletions src/mono/netcore/sample/Android/AndroidSampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@
<OutputType>Exe</OutputType>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<TargetArchitecture Condition="'$(TargetArchitecture)'==''">x64</TargetArchitecture>
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
<RuntimeIdentifier>android-$(TargetArchitecture)</RuntimeIdentifier>
<PublishTrimmed Condition="'$(Configuration)' == 'Release'">true</PublishTrimmed>
<_TrimmerDefaultAction Condition="'$(Configuration)' == 'Release'">link</_TrimmerDefaultAction>
<Optimized Condition="'$(Configuration)' == 'Release'">True</Optimized>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>Link</TrimMode>
<MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\runtimes\android-$(TargetArchitecture)\</MicrosoftNetCoreAppRuntimePackDir>
<NoWarn>$(NoWarn),CA1050</NoWarn>
</PropertyGroup>

<!-- Redirect 'dotnet publish' to in-tree runtime pack -->
Expand Down
6 changes: 2 additions & 4 deletions src/mono/netcore/sample/iOS/Program.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
<RuntimeIdentifier>ios-$(TargetArchitecture)</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<_TrimmerDefaultAction>link</_TrimmerDefaultAction>
<Optimized Condition="'$(Configuration)' == 'Release'">True</Optimized>
<InvariantGlobalization>true</InvariantGlobalization> <!-- workaround for https://github.com/dotnet/runtime/issues/41866 -->
<RunAnalyzers>false</RunAnalyzers>
<TrimMode>Link</TrimMode>
</PropertyGroup>

<!-- Redirect 'dotnet publish' to in-tree runtime pack -->
Expand All @@ -36,6 +33,7 @@
<PropertyGroup>
<AppDir>$(MSBuildThisFileDirectory)$(PublishDir)\app</AppDir>
<IosSimulator Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">iPhone 11</IosSimulator>
<Optimized Condition="'$(Configuration)' == 'Release'">True</Optimized>
</PropertyGroup>

<RemoveDir Directories="$(AppDir)" />
Expand Down