|
54 | 54 | <RemoveDir Directories="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned" /> |
55 | 55 | </Target> |
56 | 56 |
|
| 57 | + <Target Name="_CreateItemGroups"> |
| 58 | + <ItemGroup> |
| 59 | + <_AndroidRuntimeNames Include="Mono;NativeAOT" /> |
| 60 | + <_AndroidRIDs Include="android-arm;android-arm64;android-x86;android-x64" Runtime="%(_AndroidRuntimeNames.Identity)" /> |
| 61 | + </ItemGroup> |
| 62 | + </Target> |
| 63 | + |
57 | 64 | <Target Name="_CreateDefaultRefPack" |
58 | 65 | Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidDefaultTargetDotnetApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidDefaultTargetDotnetApiLevel)\Mono.Android.dll') "> |
59 | 66 | <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) "$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj"" /> |
60 | 67 | </Target> |
61 | 68 |
|
62 | 69 | <Target Name="_CreatePreviewPacks" |
| 70 | + DependsOnTargets="_CreateItemGroups" |
63 | 71 | Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidLatestUnstableApiLevel)\Mono.Android.dll') "> |
64 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
65 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm64 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
66 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x86 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
67 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x64 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
| 72 | + <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
68 | 73 | <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) "$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj"" /> |
69 | 74 | </Target> |
70 | 75 |
|
71 | 76 | <Target Name="CreateAllPacks" |
72 | | - DependsOnTargets="DeleteExtractedWorkloadPacks;_SetGlobalProperties;GetXAVersionInfo;_CleanNuGetDirectory;_CreatePreviewPacks;_CreateDefaultRefPack"> |
73 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
74 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
75 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
76 | | - <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64 "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
| 77 | + DependsOnTargets="DeleteExtractedWorkloadPacks;_SetGlobalProperties;GetXAVersionInfo;_CleanNuGetDirectory;_CreateItemGroups;_CreatePreviewPacks;_CreateDefaultRefPack"> |
| 78 | + <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) "$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"" /> |
77 | 79 | <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') "$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj"" /> |
78 | 80 | <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:HostOS=Linux "$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj"" Condition=" '$(HostOS)' == 'Linux' " /> |
79 | 81 | <Exec Command=""$(DotNetPreviewTool)" pack @(_GlobalProperties, ' ') -p:HostOS=Darwin "$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj"" Condition=" '$(HostOS)' == 'Darwin' " /> |
|
148 | 150 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\workloadsets" /> |
149 | 151 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\microsoft.net.sdk.android" /> |
150 | 152 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Ref.%(_PackApiLevels.Identity)" /> |
151 | | - <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-arm" /> |
152 | | - <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-arm64" /> |
153 | | - <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-x86" /> |
154 | | - <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-x64" /> |
| 153 | + <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.Mono.%(_PackApiLevels.Identity).android-arm" /> |
| 154 | + <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.Mono.%(_PackApiLevels.Identity).android-arm64" /> |
| 155 | + <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.Mono.%(_PackApiLevels.Identity).android-x86" /> |
| 156 | + <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.Mono.%(_PackApiLevels.Identity).android-x64" /> |
155 | 157 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Sdk.Darwin" /> |
156 | 158 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Sdk.Linux" /> |
157 | 159 | <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Sdk.Windows" /> |
|
0 commit comments