Skip to content

Commit ff7f467

Browse files
pjcollinspjcollins
authored
[build] Use local .NET preview to build Xamarin.Android.sln (#7022)
Removes the need to have a .NET 7 preview installed globally to build. A .NET 6 install is required to build and run xaprepare, which will provision a .NET 7 preview build used for further building and testing. Instructions to build on macOS remain unchanged: make prepare make all or make jenkins Instructions to build on Windows have been updated: dotnet msbuild -t:Prepare Xamarin.Android.sln dotnet-local.cmd -t:PackDotNet Xamarin.Android.sln -m:1 The `dotnet msbuild` command is recommended as it will not attempt a restore. This will allow the `Prepare` target to run against a .NET 6 install, even though `Xamarin.Android.sln` contains projects that target net7.0. Otherwise, attempts to dotnet build any target belonging to `Xamarin.Android.sln` with .NET 6 will fail during restore: Project "C:\Users\Peter\source\pj\xamarin-android\Xamarin.Android.sln" on node 1 (Restore target(s)). ValidateSolutionConfiguration: Building solution configuration "Debug|AnyCPU". _GetAllRestoreProjectPathItems: Determining projects to restore... Project "C:\Users\Peter\source\pj\xamarin-android\Xamarin.Android.sln" (1) is building "C:\Users\Peter\source\pj\xamarin-android\src\Microsoft.Android.Sdk.ILLink\Microsoft.Android.Sdk.ILLink.csproj" (11:4) on node 1 (_GenerateRestoreGraphProjectEntry target(s)). C:\Program Files\dotnet\sdk\6.0.300\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.TargetFrameworkInference.targets(144,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 7.0. Either target .NET 6.0 or lower, or use a version of the .NET SDK that supports .NET 7.0.
1 parent a7217cb commit ff7f467

File tree

11 files changed

+48
-47
lines changed

11 files changed

+48
-47
lines changed

‎Documentation/building/unix/instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ but this is only part of the story. Your local
9393
local Android "workload" in `Microsoft.Android.Sdk.$(HostOS)` matching
9494
your operating system.
9595

96-
Create a new project with `dotnet new android`:
96+
Create a new project with `./dotnet-local.sh new android`:
9797

9898
```xml
9999
<Project Sdk="Microsoft.NET.Sdk">

‎Documentation/building/windows/instructions.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ MSBuild version 15 or later is required.
2020

2121
5. In a [Developer Command Prompt][developer-prompt], prepare the project:
2222

23-
msbuild Xamarin.Android.sln /t:Prepare
23+
dotnet msbuild Xamarin.Android.sln -t:Prepare
2424

2525
This will ensure that the build dependencies are installed, perform
2626
`git submodule update`, download NuGet dependencies, and other
2727
"preparatory" and pre-build tasks that need to be performed.
2828

2929
6. Build the project:
3030

31-
msbuild Xamarin.Android.sln
31+
dotnet-local.cmd build Xamarin.Android.sln -m:1
3232

3333
7. In order to use the in-tree Xamarin.Android, build xabuild:
3434

@@ -38,7 +38,7 @@ MSBuild version 15 or later is required.
3838
Prompt][developer-prompt], build external proprietary git
3939
dependencies:
4040

41-
msbuild Xamarin.Android.sln /t:BuildExternal
41+
dotnet-local.cmd build Xamarin.Android.sln -t:BuildExternal
4242

4343
This will clone and build external proprietary components such as `monodroid`.
4444

@@ -99,15 +99,15 @@ of .NET 6 to `bin\$(Configuration)\dotnet`.
9999
Once `msbuild Xamarin.Android.sln /t:Build` is complete, you can build
100100
the .NET 6 packages with:
101101

102-
msbuild Xamarin.Android.sln /t:PackDotNet
102+
dotnet-local.cmd build Xamarin.Android.sln -t:PackDotNet -m:1
103103

104104
Several `.nupkg` files will be output in `.\bin\BuildDebug\nuget-unsigned`,
105105
but this is only part of the story. Your local
106106
`bin\$(Configuration)\dotnet\packs` directory will be
107107
populated with a local Android "workload" in
108108
`Microsoft.Android.Sdk.$(HostOS)` matching your operating system.
109109

110-
Create a new project with `dotnet new android`:
110+
Create a new project with `dotnet-local.cmd new android`:
111111

112112
```xml
113113
<Project Sdk="Microsoft.NET.Sdk">

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ include build-tools/scripts/runtime-helpers.mk
181181

182182
.PHONY: prepare
183183
prepare:
184-
$(call DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
185-
$(call DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
184+
$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
185+
$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
186186

187187
.PHONY: prepare-help
188188
prepare-help:
189-
$(call DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
189+
$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
190190

191191
.PHONY: shutdown-compiler-server
192192
shutdown-compiler-server:
@@ -208,11 +208,11 @@ shutdown-compiler-server:
208208

209209
.PHONY: prepare-update-mono
210210
prepare-update-mono: shutdown-compiler-server
211-
$(call DOTNET_BINLOG,prepare-update-mono,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) \
211+
$(call SYSTEM_DOTNET_BINLOG,prepare-update-mono,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) \
212212
-- -s:UpdateMono $(_PREPARE_ARGS)
213213

214214
prepare-external-git-dependencies:
215-
$(call DOTNET_BINLOG,prepare-external-git-dependencies,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) \
215+
$(call SYSTEM_DOTNET_BINLOG,prepare-external-git-dependencies,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) \
216216
-- -s:PrepareExternalGitDependencies $(_PREPARE_ARGS)
217217

218218
APK_SIZES_REFERENCE_DIR=tests/apk-sizes-reference

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,17 @@ stages:
201201
displayName: Prepare Solution
202202
inputs:
203203
projects: Xamarin.Android.sln
204-
arguments: '-c $(XA.Build.Configuration) -target:Prepare -m:1 -p:AutoProvision=true -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build-prepare.binlog'
204+
arguments: '-c $(XA.Build.Configuration) -t:Prepare --no-restore -m:1 -p:AutoProvision=true -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build-prepare.binlog'
205205

206206
# Build, pack .nupkgs, and extract workload packs to dotnet preview test directory
207-
- task: DotNetCoreCLI@2
208-
displayName: Build Solution
209-
inputs:
210-
projects: Xamarin.Android.sln
211-
arguments: '-t:PackDotNet -c $(XA.Build.Configuration) -m:1 -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog'
207+
- template: yaml-templates\run-dotnet-preview.yaml
208+
parameters:
209+
project: Xamarin.Android.sln
210+
arguments: >-
211+
-t:PackDotNet -c $(XA.Build.Configuration) -m:1 -v:n
212+
-bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog
213+
displayName: Build Solution
214+
continueOnError: false
212215

213216
- task: MSBuild@1
214217
displayName: msbuild create-vsix
@@ -236,7 +239,6 @@ stages:
236239
solution: Xamarin.Android.sln
237240
configuration: $(XA.Build.Configuration)
238241
msbuildArguments: >-
239-
/restore
240242
/t:RunJavaInteropTests
241243
/p:SkipJSUTests=true
242244
/p:TestAssembly="bin\Test$(XA.Build.Configuration)\generator-Tests.dll;bin\Test$(XA.Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(XA.Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(XA.Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(XA.Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll"

‎build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,10 @@ jobs:
2626

2727
- template: clean.yaml
2828

29-
# Install a stable verison of .NET for classic tests
30-
- template: use-dot-net.yaml
31-
parameters:
32-
version: 6.0.202
33-
remove_dotnet: true
34-
3529
- template: setup-test-environment.yaml
3630
parameters:
3731
provisionatorChannel: ${{ parameters.provisionatorChannel }}
32+
remove_dotnet: true
3833

3934
- task: DownloadPipelineArtifact@1
4035
inputs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ steps:
6363
displayName: restore NUnit.Console
6464
inputs:
6565
command: restore
66-
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj
67-
restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.Android.Build.Tests.binlog
66+
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
67+
restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.ProjectTools.binlog
6868
nugetConfigPath: ${{ parameters.xaSourcePath }}/NuGet.config
6969
feedsToUse: config
7070

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
- name: NUnit.NumberOfTestWorkers
1919
value: 4
2020
- name: DotNetSdkVersion
21-
value: 7.0.100-preview.2.22153.17
21+
value: 6.0.300
2222
- name: GitHub.Token
2323
value: $(github--pat--vs-mobiletools-engineering-service2)
2424
- name: HostedMacImage

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,30 @@
5858

5959
<Target Name="_CreateDefaultRefPack"
6060
Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidDefaultTargetDotnetApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidDefaultTargetDotnetApiLevel)\Mono.Android.dll') ">
61-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
61+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
6262
</Target>
6363

6464
<Target Name="_CreatePreviewPacks"
6565
Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidLatestUnstableApiLevel)\Mono.Android.dll') ">
66-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
67-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
68-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x86 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
69-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
70-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
66+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
67+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
68+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x86 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
69+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
70+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
7171
</Target>
7272

7373
<Target Name="CreateAllPacks"
7474
DependsOnTargets="DeleteExtractedWorkloadPacks;_SetGlobalProperties;GetXAVersionInfo;_CleanNuGetDirectory;_CreatePreviewPacks;_CreateDefaultRefPack">
75-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
76-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
77-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
78-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
79-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
80-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
81-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
82-
<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 -->
83-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
84-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
75+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
76+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
77+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
78+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
79+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
80+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Linux &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
81+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
82+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
83+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
84+
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
8585
<ReplaceFileContents
8686
SourceFile="vs-workload.in.props"
8787
DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"

‎build-tools/scripts/Packaging.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ create-installers: create-nupkgs create-pkg create-vsix
1010
create-nupkgs:
1111
@echo Disk usage before create-nupkgs
1212
-df -h
13-
$(call DOTNET_BINLOG,create-all-packs) -t:CreateAllPacks $(topdir)/build-tools/create-packs/Microsoft.Android.Sdk.proj
13+
$(call SYSTEM_DOTNET_BINLOG,create-all-packs) -t:CreateAllPacks $(topdir)/build-tools/create-packs/Microsoft.Android.Sdk.proj
1414

1515
create-pkg:
16-
$(call DOTNET_BINLOG,create-pkg) /t:CreatePkg \
16+
$(call SYSTEM_DOTNET_BINLOG,create-pkg) /t:CreatePkg \
1717
build-tools/create-pkg/create-pkg.csproj \
1818
$(if $(PACKAGE_VERSION),/p:ProductVersion="$(PACKAGE_VERSION)") \
1919
$(if $(PACKAGE_VERSION_REV),/p:XAVersionCommitCount="$(PACKAGE_VERSION_REV)") \

‎build-tools/scripts/PrepareWindows.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@
3434
/>
3535
<Exec Command="$(ManagedToolInvocationRuntime)$(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
3636
<MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
37-
<MSBuild Projects="$(_TopDir)\Xamarin.Android.sln" Targets="Restore" />
3837
</Target>
3938
</Project>

0 commit comments

Comments
 (0)