Skip to content

Commit dc08972

Browse files
pjcollinspjcollins
authored
[build] Use SharedFramework.Sdk to create workload packs (#10000)
Our workload packaging logic has been updated to use more of the [Microsoft.DotNet.SharedFramework.Sdk][0] MSBuild SDK included in the dotnet/arcade repo. This SDK allows us to easily exclude the symbols files that we've been shipping directly in all of our workload packs, and instead move them into `*.symbols.nupkg` packages that can be archived and uploaded to a symbol server separately. Note: the `_GenerateFrameworkList` target is in [sharedfx.targets][1]. [0]: https://github.com/dotnet/arcade/tree/21f46f494265f11e124c47ee868fac199768a35b/src/Microsoft.DotNet.SharedFramework.Sdk [1]: https://github.com/dotnet/arcade/blob/2b1931c05dd6ceb89120131a8b39eaa81735179a/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets#L398-L429
1 parent 787a2a6 commit dc08972

18 files changed

+176
-136
lines changed

‎Configuration.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<NativeRuntimeOutputRootDir>$(BuildOutputDirectory)lib\runtimes\</NativeRuntimeOutputRootDir>
6767
<MicrosoftAndroidRefPackDir>$(MicrosoftAndroidPacksRootDir)Microsoft.Android.Ref.$(AndroidApiLevel)\$(AndroidPackVersion)\ref\$(DotNetTargetFramework)\</MicrosoftAndroidRefPackDir>
6868
<MicrosoftAndroidSdkPackDir>$(MicrosoftAndroidPacksRootDir)$(MicrosoftAndroidSdkPackName)\$(AndroidPackVersion)\</MicrosoftAndroidSdkPackDir>
69-
<MicrosoftAndroidSdkOutDir>$(MicrosoftAndroidSdkPackDir)\tools\</MicrosoftAndroidSdkOutDir>
69+
<MicrosoftAndroidSdkOutDir>$(MicrosoftAndroidSdkPackDir)tools\</MicrosoftAndroidSdkOutDir>
7070
<MicrosoftAndroidSdkAnalysisOutDir>$(MicrosoftAndroidPacksRootDir)Microsoft.Android.Ref.$(AndroidLatestStableApiLevel)\$(AndroidPackVersion)\analyzers\dotnet\cs\</MicrosoftAndroidSdkAnalysisOutDir>
7171
<MakeConcurrency Condition=" '$(MakeConcurrency)' == '' And '$(HostCpuCount)' != '' ">-j$(HostCpuCount)</MakeConcurrency>
7272
<ManagedRuntime Condition=" '$(ManagedRuntime)' == '' And '$(OS)' != 'Windows_NT' ">mono</ManagedRuntime>

‎build-tools/automation/azure-pipelines.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,16 @@ extends:
359359
artifactName: $(WindowsToolchainPdbArtifactName)
360360
downloadPath: $(Build.StagingDirectory)\symbols
361361

362+
- task: DownloadPipelineArtifact@2
363+
inputs:
364+
artifactName: nuget-unsigned-symbols
365+
downloadPath: $(Build.StagingDirectory)\symbols
366+
367+
- task: DownloadPipelineArtifact@2
368+
inputs:
369+
artifactName: nuget-linux-unsigned-symbols
370+
downloadPath: $(Build.StagingDirectory)\symbols
371+
362372
- task: DownloadPipelineArtifact@2
363373
inputs:
364374
artifactName: DropMetadata-shipping-nugets

‎build-tools/automation/yaml-templates/build-linux.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ stages:
4141
displayName: upload linux sdk
4242
artifactName: ${{ parameters.nugetArtifactName }}
4343
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux
44+
- output: pipelineArtifact
45+
displayName: upload linux sdk symbols
46+
artifactName: ${{ parameters.nugetArtifactName }}-symbols
47+
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux-symbols
4448
steps:
4549
- template: sdk-unified/steps/checkout/v1.yml@yaml-templates
4650
parameters:
@@ -86,6 +90,19 @@ stages:
8690
workingDirectory: ${{ parameters.xaSourcePath }}
8791
displayName: make create-nupkgs
8892

93+
- task: CopyFiles@2
94+
inputs:
95+
SourceFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
96+
Contents: |
97+
**/Microsoft.Android.Sdk.Linux*.symbols.nupkg
98+
**/SignList.xml
99+
TargetFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux-symbols
100+
101+
- task: DeleteFiles@1
102+
inputs:
103+
SourceFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
104+
Contents: '*.symbols.nupkg'
105+
89106
- script: >
90107
df -h &&
91108
mkdir -p ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux &&
@@ -103,6 +120,12 @@ stages:
103120
artifactName: ${{ parameters.nugetArtifactName }}
104121
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux
105122

123+
- task: PublishPipelineArtifact@1
124+
displayName: upload linux sdk symbols
125+
inputs:
126+
artifactName: ${{ parameters.nugetArtifactName }}-symbols
127+
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-linux-symbols
128+
106129
- template: /build-tools/automation/yaml-templates/upload-results.yaml
107130
parameters:
108131
xaSourcePath: ${{ parameters.xaSourcePath }}

‎build-tools/automation/yaml-templates/build-macos.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ stages:
4949
displayName: upload nupkgs
5050
artifactName: ${{ parameters.nugetArtifactName }}
5151
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
52+
- output: pipelineArtifact
53+
displayName: upload symbols nupkgs
54+
artifactName: ${{ parameters.nugetArtifactName }}-symbols
55+
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned-symbols
5256
- output: pipelineArtifact
5357
displayName: upload Windows toolchain pdb files
5458
artifactName: ${{ parameters.windowsToolchainPdbArtifactName }}

‎build-tools/automation/yaml-templates/commercial-build.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,32 @@ steps:
6969
workingDirectory: ${{ parameters.xaSourcePath }}
7070
displayName: zip Windows toolchain pdb files
7171

72+
- task: CopyFiles@2
73+
inputs:
74+
SourceFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
75+
Contents: |
76+
**/*.symbols.nupkg
77+
**/SignList.xml
78+
TargetFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned-symbols
79+
80+
- task: DeleteFiles@1
81+
inputs:
82+
SourceFolder: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
83+
Contents: '*.symbols.nupkg'
84+
7285
- ${{ if ne(parameters.use1ESTemplate, true) }}:
7386
- task: PublishPipelineArtifact@1
7487
displayName: upload nupkgs
7588
inputs:
7689
artifactName: ${{ parameters.nugetArtifactName }}
7790
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
7891

92+
- task: PublishPipelineArtifact@1
93+
displayName: upload symbols nupkgs
94+
inputs:
95+
artifactName: ${{ parameters.nugetArtifactName }}
96+
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned-symbols
97+
7998
- task: PublishPipelineArtifact@1
8099
displayName: upload test assemblies
81100
inputs:

‎build-tools/automation/yaml-templates/setup-test-environment.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ steps:
7272
downloadPath: ${{ parameters.xaSourcePath }}/bin/Build${{ parameters.configuration }}/nuget-unsigned
7373
condition: and(succeeded(), eq(variables['agent.os'], 'Linux'))
7474

75-
- task: DotNetCoreCLI@2
76-
displayName: extract workload packs
77-
inputs:
78-
projects: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
75+
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
76+
parameters:
77+
displayName: extract workload packs
78+
project: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
7979
arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog
8080

8181
- ${{ if eq(parameters.installApkDiff, true) }}:

‎build-tools/create-packs/ConfigureLocalWorkload.targets

+2-10
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,13 @@
2323
DependsOnTargets="_CreateLocalRuntimeListsInputs"
2424
Inputs="$(MSBuildAllProjects);@(_RuntimeListInputs)"
2525
Outputs="@(_RuntimeListOutputs)">
26-
<MSBuild
27-
Projects="$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj"
28-
Properties="FrameworkListFile=%(_RuntimeListOutputs.Identity);AndroidRID=%(_RuntimeListOutputs.AndroidRID);AndroidRuntime=%(_RuntimeListOutputs.AndroidRuntime)"
29-
Targets="_GetRuntimePackItems;_GenerateFrameworkListFile"
30-
/>
26+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build -t:_GenerateFrameworkList -p:IntermediateOutputPath=%(_RuntimeListOutputs.RelativeDir) -p:AndroidRID=%(_RuntimeListOutputs.AndroidRID) -p:AndroidRuntime=%(_RuntimeListOutputs.AndroidRuntime) -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
3127
</Target>
3228

3329
<Target Name="CreateLocalFrameworkLists"
3430
Inputs="$(MSBuildAllProjects);@(_FrameworkListInputs)"
3531
Outputs="@(_FrameworkListOutputs)">
36-
<MSBuild
37-
Projects="$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj"
38-
Properties="FrameworkListFile=%(_FrameworkListOutputs.Identity)"
39-
Targets="_GetTargetingPackItems;_GenerateFrameworkListFile"
40-
/>
32+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build -t:_GenerateFrameworkList -p:IntermediateOutputPath=%(_FrameworkListOutputs.RelativeDir) -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
4133
</Target>
4234

4335
<Target Name="PackLocalTemplates"

‎build-tools/create-packs/Directory.Build.props

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
<Import Project="..\..\Directory.Build.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
66
<PackageType>DotnetPlatform</PackageType>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
99
<OutputPath>$(BootstrapOutputDirectory)nuget-unsigned\</OutputPath>
10+
<SharedFrameworkName>Microsoft.Android</SharedFrameworkName>
11+
<SharedFrameworkFriendlyName>.NET $(DotNetTargetFrameworkVersion) - $(SharedFrameworkName)</SharedFrameworkFriendlyName>
12+
<SkipInstallerBuild>true</SkipInstallerBuild>
13+
<SkipValidatePackage>true</SkipValidatePackage>
14+
<PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
1015
<GenerateDependencyFile>false</GenerateDependencyFile>
1116
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1217
<!-- Remove the `<group targetFramework=".NETStandard2.0" />` entry from the .nuspec. -->

‎build-tools/create-packs/Directory.Build.targets

+8-36
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,14 @@
11
<Project>
22
<ItemGroup>
33
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" />
4-
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" />
54
<PackageReference Include="Microsoft.DotNet.Arcade.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" GeneratePathProperty="true" />
65
</ItemGroup>
76

87
<Import Project="License.targets" />
98
<Import Project="..\..\build-tools\installers\create-installers.targets" />
10-
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
119

12-
<UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetSharedFrameworkTaskFile)"/>
1310
<UsingTask TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" AssemblyFile="$(PrepTasksAssembly)" />
1411

15-
<!-- https://github.com/dotnet/runtime/blob/0647ec314948904319da5eb15e9931f7c85ed1e2/src/installer/pkg/projects/Directory.Build.targets#L281 -->
16-
<!-- TODO: Generate PlatformManifest.txt files? -->
17-
<Target Name="_GenerateFrameworkListFile" >
18-
<!-- Hardcode framework attributes -->
19-
<ItemGroup>
20-
<FrameworkListRootAttributes Include="Name" Value=".NET $(DotNetTargetFrameworkVersion) - Android" />
21-
<FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value=".NETCoreApp" />
22-
<FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(DotNetTargetFrameworkVersion)" />
23-
<FrameworkListRootAttributes Include="FrameworkName" Value="Microsoft.Android" />
24-
</ItemGroup>
25-
26-
<!-- https://github.com/dotnet/arcade/blob/5824baf1c9a900ee00c167f96201c750bba6a574/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs -->
27-
<CreateFrameworkListFile
28-
Files="@(_PackageFiles)"
29-
FileClassifications="@(FrameworkListFileClass)"
30-
TargetFile="$(FrameworkListFile)"
31-
TargetFilePrefixes="ref;runtimes;analyzers"
32-
RootAttributes="@(FrameworkListRootAttributes)"
33-
/>
34-
<ItemGroup>
35-
<_PackageFiles Include="$(FrameworkListFile)" PackagePath="data" />
36-
</ItemGroup>
37-
</Target>
38-
3912
<Target Name="_GetDefaultPackageVersion"
4013
DependsOnTargets="GetXAVersionInfo" >
4114
<PropertyGroup>
@@ -46,7 +19,6 @@
4619
<Target Name="_SetGlobalProperties">
4720
<ItemGroup>
4821
<_GlobalProperties Include="-p:Configuration=$(Configuration)" />
49-
<_GlobalProperties Include="-p:IncludeSymbols=False" />
5022
</ItemGroup>
5123
<PropertyGroup>
5224
<_BinlogPrefix>-bl:$(XamarinAndroidSourcePath)bin/Build$(Configuration)/msbuild-$([System.DateTime]::Now.ToString('yyyyMMddThhmmss'))-</_BinlogPrefix>
@@ -66,23 +38,23 @@
6638

6739
<Target Name="_CreateDefaultRefPack"
6840
Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidDefaultTargetDotnetApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidDefaultTargetDotnetApiLevel)\Mono.Android.dll') ">
69-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidDefaultTargetDotnetApiLevel).binlog&quot; -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
41+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidDefaultTargetDotnetApiLevel).binlog&quot; -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
7042
</Target>
7143

7244
<Target Name="_CreatePreviewPacks"
7345
DependsOnTargets="_CreateItemGroups"
7446
Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidLatestUnstableApiLevel)\Mono.Android.dll') ">
75-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Runtime.%(_AndroidRIDs.Runtime).$(AndroidLatestUnstableApiLevel).%(_AndroidRIDs.Identity).binlog&quot; -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
76-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).binlog&quot; -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
47+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Runtime.%(_AndroidRIDs.Runtime).$(AndroidLatestUnstableApiLevel).%(_AndroidRIDs.Identity).binlog&quot; -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
48+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).binlog&quot; -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
7749
</Target>
7850

7951
<Target Name="CreateAllPacks"
8052
DependsOnTargets="DeleteExtractedWorkloadPacks;_SetGlobalProperties;GetXAVersionInfo;_CleanNuGetDirectory;_CreateItemGroups;_CreatePreviewPacks;_CreateDefaultRefPack">
81-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Runtime.%(_AndroidRIDs.Runtime).$(AndroidLatestStableApiLevel).%(_AndroidRIDs.Identity).binlog&quot; -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
82-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidLatestStableApiLevel).binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
83-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Linux.binlog&quot; -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
84-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Darwin.binlog&quot; -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
85-
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Windows.binlog&quot; -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
53+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Runtime.%(_AndroidRIDs.Runtime).$(AndroidLatestStableApiLevel).%(_AndroidRIDs.Identity).binlog&quot; -p:AndroidRID=%(_AndroidRIDs.Identity) -p:AndroidRuntime=%(_AndroidRIDs.Runtime) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
54+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Ref.$(AndroidLatestStableApiLevel).binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
55+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Linux.binlog&quot; -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
56+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Darwin.binlog&quot; -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
57+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Windows.binlog&quot; -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
8658
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.NET.Sdk.Android.binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
8759
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Templates.binlog&quot; &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
8860
<ReplaceFileContents

‎build-tools/create-packs/License.targets

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
DestinationFiles="$(IntermediateOutputPath)$(PackageLicenseFile)"
2020
SkipUnchangedFiles="true"
2121
/>
22+
<!-- Update the LicenseFile path defined in .nuget/packages/microsoft.dotnet.sharedframework.sdk/10.0.0-beta.24476.2/targets/sharedfx.props -->
23+
<PropertyGroup>
24+
<LicenseFile>$(IntermediateOutputPath)$(PackageLicenseFile)</LicenseFile>
25+
</PropertyGroup>
2226
<ItemGroup>
23-
<_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" />
27+
<_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" Condition=" '$(PlatformPackageType)' == '' "/>
2428
<_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" />
2529
<_PackageFiles Include="$(MSBuildThisFileDirectory)Icon.png" PackagePath="\" />
2630
</ItemGroup>

0 commit comments

Comments
 (0)