Skip to content

Commit

Permalink
[build] Update stable .NET to 9. (#9543)
Browse files Browse the repository at this point in the history
In order to bump the stable version of .NET used in `Java.Interop` to
.NET 9 we need to bump it here first.

Originally this was going to be done with the bump to targeting .NET
10, however that [PR][0] is
waiting on fix(es) from other team(s) so we'll do this bump separately
to unblock `Java.Interop`.

[0]: #9395
  • Loading branch information
jpobst authored Nov 22, 2024
1 parent 7009522 commit 8c72ba3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
<DotNetStableTargetFramework>net8.0</DotNetStableTargetFramework>
<DotNetStableTargetFramework>net9.0</DotNetStableTargetFramework>
<TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUNTIME := $(shell which mono64 2> /dev/null && echo mono64 || echo mono)
SOLUTION = Xamarin.Android.sln
TEST_TARGETS = build-tools/scripts/RunTests.targets
API_LEVEL ?=
PREPARE_NET_FX = net8.0
PREPARE_NET_FX = net9.0
PREPARE_ARGS =
PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj
PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS)
Expand Down
4 changes: 4 additions & 0 deletions build-tools/automation/yaml-templates/build-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ stages:
# https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
- checkout: maui

- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
parameters:
remove_dotnet: true

- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}:
- checkout: android-platform-support
clean: true
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ variables:
- name: NUnit.NumberOfTestWorkers
value: 4
- name: DotNetSdkVersion
value: 8.0
value: 9.0
- name: DotNetSdkQuality
value: GA
- name: GitHub.Token
Expand All @@ -50,7 +50,7 @@ variables:
- name: DotNetTargetFramework
value: net9.0
- name: DotNetStableTargetFramework
value: net8.0
value: net9.0
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
- name: _WriteTelemetryProperties
value: false
Expand Down

0 comments on commit 8c72ba3

Please sign in to comment.