Skip to content

Commit e45987b

Browse files
pjcollinspjcollins
committed
[ci] Build and pack updates, bump to .NET 5.0.201
1 parent d21a42c commit e45987b

File tree

9 files changed

+64
-84
lines changed

9 files changed

+64
-84
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ variables:
3939
InstallerArtifactName: installers-unsigned
4040
TestAssembliesArtifactName: test-assemblies
4141
DotNetCoreVersion: 3.1.405
42-
DotNet5Version: 5.0.100
42+
DotNet5Version: 5.0.201
4343
HostedMacImage: macOS-10.15
4444
GitHub.Token: $(github--pat--vs-mobiletools-engineering-service2)
4545
NUnit.NumberOfTestWorkers: 4

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

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variables:
2727
EXTRA_MSBUILD_ARGS: /p:AutoProvision=True /p:AutoProvisionUsesSudo=True /p:IgnoreMaxMonoVersion=False
2828
PREPARE_FLAGS: PREPARE_CI=1 PREPARE_CI_PR=1
2929
DotNetCoreVersion: 3.1.405
30-
DotNet5Version: 5.0.100
30+
DotNet5Version: 5.0.201
3131
GitHub.Token: $(github--pat--vs-mobiletools-engineering-service2)
3232

3333
stages:
@@ -110,17 +110,11 @@ stages:
110110
displayName: make jenkins
111111
112112
- script: >
113-
echo "make create-pkg create-vsix V=1 CONFIGURATION=$(XA.Build.Configuration)" &&
114-
make create-pkg create-vsix V=1 CONFIGURATION=$(XA.Build.Configuration)
113+
echo "make create-installers V=1 CONFIGURATION=$(XA.Build.Configuration)" &&
114+
make create-installers V=1 CONFIGURATION=$(XA.Build.Configuration)
115115
workingDirectory: $(Build.SourcesDirectory)
116116
displayName: create installers
117117
118-
- script: >
119-
echo "make package-oss CONFIGURATION=$(XA.Build.Configuration) V=1" &&
120-
make package-oss CONFIGURATION=$(XA.Build.Configuration) V=1
121-
workingDirectory: $(Build.SourcesDirectory)
122-
displayName: package oss
123-
124118
- script: >
125119
mkdir -p bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
126120
cp bin/Build$(XA.Build.Configuration)/*.vsix bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
@@ -134,6 +128,12 @@ stages:
134128
artifactName: $(InstallerArtifactName) - macOS and Windows
135129
targetPath: $(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
136130

131+
- task: PublishPipelineArtifact@1
132+
displayName: upload nupkgs
133+
inputs:
134+
artifactName: $(NuGetArtifactName) - macOS
135+
targetPath: $(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)/$(NuGetArtifactName)
136+
137137
- script: >
138138
echo "all-tests CONFIGURATION=$(XA.Build.Configuration) V=1" &&
139139
make all-tests CONFIGURATION=$(XA.Build.Configuration) V=1
@@ -146,19 +146,6 @@ stages:
146146
workingDirectory: $(Build.SourcesDirectory)
147147
displayName: package build status
148148
149-
- task: MSBuild@1
150-
displayName: pack all nupkgs
151-
inputs:
152-
solution: $(Build.SourcesDirectory)/build-tools/create-packs/Microsoft.Android.Sdk.proj
153-
configuration: $(XA.Build.Configuration)
154-
msbuildArguments: /t:CreateAllPacks /restore /bl:$(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
155-
156-
- task: PublishPipelineArtifact@1
157-
displayName: upload nupkgs
158-
inputs:
159-
artifactName: $(NuGetArtifactName) - macOS
160-
targetPath: $(Build.SourcesDirectory)/bin/Build$(XA.Build.Configuration)/$(NuGetArtifactName)
161-
162149
- script: >
163150
echo "make run-performance-tests CONFIGURATION=$(XA.Build.Configuration) V=1" &&
164151
make run-performance-tests CONFIGURATION=$(XA.Build.Configuration) V=1
@@ -186,6 +173,15 @@ stages:
186173
- checkout: self
187174
submodules: recursive
188175

176+
- template: yaml-templates/use-dot-net.yaml
177+
parameters:
178+
version: $(DotNet5Version)
179+
remove_dotnet: true
180+
181+
- template: yaml-templates/use-dot-net.yaml
182+
parameters:
183+
version: $(DotNetCoreVersion)
184+
189185
- task: NuGetToolInstaller@1
190186
displayName: 'Use NuGet 5.x'
191187
inputs:
@@ -214,16 +210,12 @@ stages:
214210
- script: make jenkins V=1 PREPARE_CI_PR=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
215211
displayName: make jenkins
216212

213+
- script: make create-nupkgs V=1 CONFIGURATION=$(XA.Build.Configuration)
214+
displayName: make create-nupkgs
215+
217216
- script: make package-deb V=1 CONFIGURATION=$(XA.Build.Configuration)
218217
displayName: make package-deb
219218

220-
- task: MSBuild@1
221-
displayName: pack all nupkgs
222-
inputs:
223-
solution: $(System.DefaultWorkingDirectory)/build-tools/create-packs/Microsoft.Android.Sdk.proj
224-
configuration: $(XA.Build.Configuration)
225-
msbuildArguments: /t:CreateAllPacks /restore /bl:$(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
226-
227219
- script: >
228220
mkdir -p $(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/linux-artifacts &&
229221
cp $(System.DefaultWorkingDirectory)/*xamarin.android*.tar.bz2 $(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/linux-artifacts &&

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ variables:
5454
TestAssembliesArtifactName: test-assemblies
5555
NUnitConsoleVersion: 3.11.1
5656
DotNetCoreVersion: 3.1.405
57-
DotNet5Version: 5.0.103
57+
DotNet5Version: 5.0.201
5858
HostedMacImage: macOS-10.15
5959
HostedWinVS2019: Hosted Windows 2019 with VS2019
6060
VSEngWinVS2019: Xamarin-Android-Win2019
@@ -158,7 +158,7 @@ stages:
158158
- template: yaml-templates/upload-results.yaml
159159
parameters:
160160
solution: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
161-
artifactName: Build Results - Nightly macOS
161+
artifactName: Build Results - macOS
162162

163163
- script: mono $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=DetermineApplicableTests --no-emoji --run-mode=CI
164164
displayName: determine which test stages to run
@@ -357,11 +357,12 @@ stages:
357357
projects: Xamarin.Android.sln
358358
arguments: '-c $(XA.Build.Configuration) -target:Prepare -m:1 -p:AutoProvision=true -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build-prepare.binlog'
359359

360+
# Build, pack .nupkgs, and extract workload packs to dotnet preview test directory
360361
- task: DotNetCoreCLI@2
361362
displayName: Build Solution
362363
inputs:
363364
projects: Xamarin.Android.sln
364-
arguments: '-c $(XA.Build.Configuration) -m:1 -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog'
365+
arguments: '-t:PackDotNet -c $(XA.Build.Configuration) -m:1 -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog'
365366

366367
- task: MSBuild@1
367368
displayName: msbuild create-vsix
@@ -370,14 +371,6 @@ stages:
370371
configuration: $(XA.Build.Configuration)
371372
msbuildArguments: /p:CreateVsixContainer=True /p:ZipPackageCompressionLevel=Normal /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-create-vsix.binlog
372373

373-
# Pack .nupkgs and extract workload packs to dotnet preview test directory
374-
- task: MSBuild@1
375-
displayName: PackDotNet
376-
inputs:
377-
solution: Xamarin.Android.sln
378-
configuration: $(XA.Build.Configuration)
379-
msbuildArguments: /t:PackDotNet /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-packdotnet.binlog
380-
381374
- task: MSBuild@1
382375
displayName: msbuild xabuild
383376
inputs:
@@ -414,15 +407,13 @@ stages:
414407
displayName: install apkdiff dotnet tool
415408
continueOnError: true
416409

417-
# Limit the amount of worker threads used to run these tests in parallel to half of what is currently available (8) on the Windows pool.
418-
# Using all available cores seems to occasionally bog down our machines and cause parallel test execution to slow down dramatically.
419-
# Only run a subset of the Xamarin.Android.Build.Tests against the local Windows build tree.
420410
- template: yaml-templates\run-nunit-tests.yaml
421411
parameters:
412+
useDotNet: true
422413
testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build
423-
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\net472\Xamarin.Android.Build.Tests.dll
414+
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\netcoreapp3.1\Xamarin.Android.Build.Tests.dll
424415
testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuildTree-$(XA.Build.Configuration).xml
425-
nunitConsoleExtraArgs: --where "cat == SmokeTests"
416+
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
426417

427418
- template: yaml-templates\upload-results.yaml
428419
parameters:
@@ -489,15 +480,13 @@ stages:
489480
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
490481
displayName: make jenkins
491482

492-
- task: MSBuild@1
493-
displayName: pack all nupkgs
483+
- task: DotNetCoreCLI@2
484+
displayName: extract workload packs
494485
inputs:
495-
solution: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/create-packs/Microsoft.Android.Sdk.proj
496-
configuration: $(XA.Build.Configuration)
497-
msbuildArguments: >-
498-
/t:CreateAllPacks,ExtractWorkloadPacks /restore
499-
/p:NuGetLicense=$(System.DefaultWorkingDirectory)/xamarin-android/external/monodroid/tools/scripts/License.txt
500-
/bl:$(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
486+
projects: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/create-packs/Microsoft.Android.Sdk.proj
487+
arguments: >-
488+
-t:CreateAllPacks,ExtractWorkloadPacks -c $(XA.Build.Configuration)
489+
-bl:$(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
501490
502491
- script: >
503492
mkdir -p $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux &&

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,16 @@ steps:
8686
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
8787
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-pkg-content.binlog
8888
89-
# Create and upload .nupkgs
90-
- task: MSBuild@1
91-
displayName: pack all nupkgs
92-
inputs:
93-
solution: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
94-
configuration: $(XA.Build.Configuration)
95-
msbuildArguments: >-
96-
/t:CreateAllPacks
97-
/restore
98-
/p:NuGetLicense=${{ parameters.xaSourcePath }}/external/monodroid/tools/scripts/License.txt
99-
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
89+
- script: make create-installers V=1 CONFIGURATION=$(XA.Build.Configuration)
90+
workingDirectory: ${{ parameters.xaSourcePath }}
91+
displayName: make create-installers
10092

10193
- task: PublishPipelineArtifact@1
10294
displayName: upload nupkgs
10395
inputs:
10496
artifactName: $(NuGetArtifactName)
10597
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/$(NuGetArtifactName)
10698

107-
- script: make create-installers V=1 CONFIGURATION=$(XA.Build.Configuration)
108-
workingDirectory: ${{ parameters.xaSourcePath }}
109-
displayName: make create-installers
110-
11199
- script: >
112100
mkdir -p bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
113101
cp bin/Build$(XA.Build.Configuration)/*.vsix bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
<!-- LICENSE setup -->
1919
<PropertyGroup>
20+
<NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
2021
<NuGetLicense Condition=" '$(NuGetLicense)' == '' ">$(XamarinAndroidSourcePath)LICENSE</NuGetLicense>
2122
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2223
</PropertyGroup>
@@ -71,23 +72,23 @@
7172
</Target>
7273

7374
<Target Name="BuildILLinkCustomStep">
74-
<Exec Command="$(DotNetPreviewTool) build -p:Configuration=$(Configuration) &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Sdk.ILLink\Microsoft.Android.Sdk.ILLink.csproj&quot;" />
75+
<Exec Command="dotnet build -p:Configuration=$(Configuration) &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Sdk.ILLink\Microsoft.Android.Sdk.ILLink.csproj&quot;" />
7576
</Target>
7677

7778
<Target Name="CreateAllPacks"
7879
DependsOnTargets="BuildILLinkCustomStep;DeleteExtractedWorkloadPacks;_SetGlobalProperties">
7980
<RemoveDir Directories="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned" />
80-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm -p:AndroidABI=armeabi-v7a-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
81-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 -p:AndroidABI=arm64-v8a-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
82-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86 -p:AndroidABI=x86-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
83-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64 -p:AndroidABI=x86_64-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
84-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
85-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
86-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
87-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
88-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.BundleTool.proj&quot;" />
89-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Workload.Android.proj&quot;" />
90-
<Exec Command="$(DotNetPreviewTool) pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
81+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm -p:AndroidABI=armeabi-v7a-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
82+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 -p:AndroidABI=arm64-v8a-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
83+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86 -p:AndroidABI=x86-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
84+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64 -p:AndroidABI=x86_64-net6 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
85+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
86+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
87+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
88+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
89+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.BundleTool.proj&quot;" />
90+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Workload.Android.proj&quot;" />
91+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
9192
</Target>
9293

9394
<Target Name="ExtractWorkloadPacks"

‎build-tools/create-packs/Microsoft.Android.Sdk.proj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ core workload sdk packs imported by Microsoft.NET.Workload.Android.
5959
<_PackageFiles Include="$(ToolsSourceDir)**" PackagePath="tools" />
6060
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)generator.dll" PackagePath="tools" />
6161
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)generator.runtimeconfig.json" PackagePath="tools" />
62-
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)Java.Interop.Tools.Generator.dll" PackagePath="tools" />
6362
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)javadoc-to-mdoc.dll" PackagePath="tools" />
6463
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)javadoc-to-mdoc.runtimeconfig.json" PackagePath="tools" />
6564
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\Version*" PackagePath="tools" />

‎build-tools/scripts/Packaging.mk‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ USE_COMMERCIAL_INSTALLER_NAME=true
55
EXPERIMENTAL=false
66
endif
77

8-
create-installers: create-pkg create-vsix
8+
create-installers: create-nupkgs create-pkg create-vsix
9+
10+
create-nupkgs:
11+
$(call DOTNET_BINLOG,create-all-packs) -t:CreateAllPacks $(topdir)/build-tools/create-packs/Microsoft.Android.Sdk.proj
912

1013
create-pkg:
1114
MONO_IOMAP=all MONO_OPTIONS="$(MONO_OPTIONS)" $(call MSBUILD_BINLOG,create-pkg) /p:Configuration=$(CONFIGURATION) /t:CreatePkg \

‎build-tools/scripts/msbuild.mk‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
# $(MSBUILD_FLAGS): Additional MSBuild flags; contains $(CONFIGURATION), $(V), $(MSBUILD_ARGS).
2424

2525
MSBUILD = msbuild
26+
DOTNET_TOOL = dotnet
27+
DOTNET_VERB = build
2628
MSBUILD_FLAGS = /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)
2729

2830
ifeq ($(OS_NAME),Darwin)
@@ -43,6 +45,12 @@ define MSBUILD_BINLOG
4345
/binaryLogger:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/$(if $(3),$(3),Build)$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog"
4446
endef
4547

48+
# $(call DOTNET_BINLOG,name,dotnet=$(DOTNET_TOOL)) build=$(DOTNET_VERB)
49+
define DOTNET_BINLOG
50+
$(if $(2),$(2),$(DOTNET_TOOL)) $(DOTNET_VERB) -c $(CONFIGURATION) -v:n \
51+
-bl:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/Build$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog"
52+
endef
53+
4654
else # $(MSBUILD) != 1
4755
_CSC_EMITS_PDB := $(shell if $(_PKG_CONFIG) --atleast-version=4.9 mono ; then echo Pdb; fi )
4856
ifeq ($(_CSC_EMITS_PDB),Pdb)

‎src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Configuration.props" />
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<DefineConstants>NET5_LINKER</DefineConstants>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<OutputPath>$(XAInstallPrefix)xbuild\Xamarin\Android\</OutputPath>

0 commit comments

Comments
 (0)