diff --git a/eng/Subsets.props b/eng/Subsets.props index bf6b25bffc731..9d955e99196a9 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -39,6 +39,9 @@ Mono Mono CoreCLR + + + true diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index da9407c5090d0..59b6c8c96e645 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -15,15 +15,22 @@ + + diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index 95298969cf61a..7f8ccaba79441 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -10,6 +10,7 @@ {RepositoryEngineeringDir} {NetCoreAppCurrent} {RuntimeIdentifier} + {UseMonoRuntime} {TargetingPackDir} {NetCoreAppMaximumVersion} {MicrosoftNETCoreAppVersion} diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index 0473cfcd03636..f43dbee3b4e1f 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -74,6 +74,7 @@ .Replace('{NetCoreAppMaximumVersion}', '$(NetCoreAppMaximumVersion)') .Replace('{TargetingPackDir}','$(MicrosoftNetCoreAppRefPackDir)') .Replace('{RuntimeIdentifier}','%(TestConsoleApps.TestRuntimeIdentifier)') + .Replace('{UseMonoRuntime}','$(UseMonoRuntime)') .Replace('{MicrosoftNETILLinkTasksVersion}', '$(MicrosoftNETILLinkTasksVersion)') .Replace('{ExtraTrimmerArgs}', '%(TestConsoleApps.ExtraTrimmerArgs)') .Replace('{AdditionalProjectReferences}', '$(_additionalProjectReferencesString)') diff --git a/src/mono/sample/Android/AndroidSampleApp.csproj b/src/mono/sample/Android/AndroidSampleApp.csproj index f9ea822e0e1e6..7dced61883747 100644 --- a/src/mono/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/sample/Android/AndroidSampleApp.csproj @@ -10,16 +10,6 @@ false - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) - - - - -