Update to new package names

Thanks @pjcollins for the heads up #11175 (comment)
xamarin · Apr 15, 2021 · ed3ac89 · ed3ac89 · vs-mobiletools-engineering-service2 · Apr 15, 2021
1 parent 56bb3d7
commit ed3ac89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/builds/package-download/download-packages.proj b/builds/package-download/download-packages.proj
@@ -7,13 +7,8 @@
     <!-- Download any runtime packs as specified using the PackageRuntimeIdentifiers property -->
     <PackageRuntimeIdentifiers Include="$(PackageRuntimeIdentifiers.Split(' '))" />
 
-    <!-- Download the mono osx pack as well -->
-    <!-- I wasn't able to figure out how to only do this if 'osx-x64'/'osx-arm64' is already included -->
-    <PackageRuntimeIdentifiers Include="Mono.osx-x64" />
-    <PackageRuntimeIdentifiers Include="Mono.osx-arm64" />
-
     <!-- download the runtime packs -->
-    <PackageDownload Include="@(PackageRuntimeIdentifiers -> 'Microsoft.NETCore.App.Runtime.%(Identity)')" Version="[$(BundledNETCorePlatformsPackageVersion)]" />
+    <PackageDownload Include="@(PackageRuntimeIdentifiers -> 'Microsoft.NETCore.App.Runtime.Mono.%(Identity)')" Version="[$(BundledNETCorePlatformsPackageVersion)]" />
 
     <!-- download the reference assemblies -->
     <PackageDownload Include="microsoft.netcore.app.ref" Version="[$(BundledNETCorePlatformsPackageVersion)]" />

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
@@ -18,6 +18,8 @@
 
     <!-- Don't include default Compile items for binding projects, because that would pick up ApiDefinition.cs and StructsAndEnums.cs -->
     <EnableDefaultCompileItems Condition=" '$(IsBindingProject)' == 'true' ">false</EnableDefaultCompileItems>
+
+    <UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' ">true</UseMonoRuntime>
   </PropertyGroup>
 
   <!-- Architecture -->