Skip to content

Commit 37014d1

Browse files
dotnet-maestro[bot]jonathanpeppersjpobst
authoredJan 10, 2025··
Bump to dotnet/sdk@a93a592ce9 10.0.100-alpha.1.25056.1 (#9395)
Changes: dotnet/sdk@5b9d9d4...a93a592 % git diff --shortstat 5b9d9d4677...a93a592ce9 2336 files changed, 57809 insertions(+), 28665 deletions(-) Changes: dotnet/runtime@226c034...4b02c51 % git diff --shortstat 226c0347b9...4b02c51f71 6343 files changed, 214693 insertions(+), 177501 deletions(-) Changes: dotnet/emsdk@8e660ff...953fd74 % git diff --shortstat 8e660ff41e...953fd74cd2 44 files changed, 844 insertions(+), 521 deletions(-) Changes: dotnet/cecil@9c94433...9e8bd52 % git diff --shortstat 9c9443396f8...9e8bd520939 20 files changed, 317 insertions(+), 205 deletions(-) Changes: a8cd27e...4b20432 % git diff --shortstat a8cd27e...4b20432 1522 files changed, 302553 insertions(+), 40811 deletions(-) Context: dotnet/msbuild#11237 Context: dotnet/roslyn-analyzers#7525 Context: dotnet/maui#27040 Bump to: * .NET SDK 10.0.100-alpha.1.25056.1 * .NET Runtime 10.0.0-alpha.1.25056.1 * .NET Android 35.0.24 Note that the `Xamarin.Android-PR (MAUI Tests MAUI Integration)` lane will fail with: > Workload installation failed: Could not find workload 'microsoft-net-runtime-android-net9' > extended by workload 'android' in manifest 'microsoft.net.sdk.android' until we get dotnet/maui on .NET 10 (see e.g. dotnet/maui#27040). Regressions discovered: * MSBuild: dotnet/msbuild#11237 * Roslyn analyzers: dotnet/roslyn-analyzers#7525 I temporarily disabled tests that hit these issues, with a code comment to restore them in the future. Other changes: * Add the `dotnet10` NuGet feeds. * `$(DotNetTargetFramework)` is `net10.0` * Update project templates to say `net10.0-android`. * Update `WorkloadManifest.json` to support .NET 10 and able to build `net9.0-android` projects. * Replace the contents of `AutoImports.props`, so we shouldn't need to modify this file each year. * Various tests should target `net9.0-android` for the "previous" .NET Android version and `net10.0-android` for the current. * `workload-dependencies.csproj` needs `$(RollForward)=Major` to allow it to run on a .NET 10 runtime. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Jonathan Pobst <jonathan.pobst@microsoft.com>
·
35.99.0-preview.2.20535.99.0-preview.1.140
1 parent 1575e4c commit 37014d1

30 files changed

+85
-73
lines changed
 

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
5-
<DotNetTargetFrameworkVersion>9.0</DotNetTargetFrameworkVersion>
5+
<DotNetTargetFrameworkVersion>10.0</DotNetTargetFrameworkVersion>
66
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
77
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
88
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->

‎NuGet.config

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-android -->
7-
<add key="darc-pub-dotnet-android-a8cd27e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-a8cd27e4/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-android -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<!-- ensure only the sources defined below are used -->
1110
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
1211
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
1312
<!-- This is for packages needed by debugger-libs -->
1413
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
15-
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
16-
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1714
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
1815
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
16+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
17+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
1918
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
2019
<!-- Android binary, to support delta APK install -->
2120
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ variables:
4848
- name: TeamName
4949
value: XamarinAndroid
5050
- name: DotNetTargetFramework
51-
value: net9.0
51+
value: net10.0
5252
- name: DotNetStableTargetFramework
5353
value: net9.0
5454
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820

‎build-tools/scripts/DotNet.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
Query="/Project/ItemGroup/PackageDownload[contains(@Include,'Microsoft.NET.Sdk.Android.Manifest-')]/@Include" />
6363
<XmlPeek
6464
XmlInputPath="$(_Root)NuGet.config"
65-
Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-dotnet-android-')]">
65+
Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-')]">
6666
<Output TaskParameter="Result" ItemName="_DotNetAndroidFeeds" />
6767
</XmlPeek>
6868
<XmlPeek

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected override async Task<bool> Execute (Context context)
5454
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests");
5555

5656
// Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj
57-
var dotnets = new [] { "net6", "net7", "net8", "current" };
57+
var dotnets = new [] { "net6", "net7", "net8", "net9", "current" };
5858
foreach (var dotnet in dotnets) {
5959
var destination = Path.Combine (sdk_manifests,
6060
context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand),

‎build-tools/xaprepare/xaprepare/package-download.proj

+2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
2424
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2525
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2626
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
27+
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net9.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2728
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Current.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
2829
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
2930
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
3031
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net8.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
32+
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net9.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
3133
</ItemGroup>
3234

3335
</Project>

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24512.1">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25056.1">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>5b9d9d4677ea31d954533e9de2f95a3ea638135d</Sha>
5+
<Sha>a93a592ce99414d94dafbd0ef0a6f51b6fbcdaf4</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25056.1" CoherentParentDependency="Microsoft.NET.Sdk">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
9+
<Sha>4b02c51f7158ca9abc68b331ac5ad64d716a0e2a</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25056.1" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
13+
<Sha>4b02c51f7158ca9abc68b331ac5ad64d716a0e2a</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rtm.24469.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24628.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>8e660ff41e91879977e3a9d837e068bd72234c26</Sha>
17+
<Sha>953fd74cd26884432eee21244ff4b031ebbdde32</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24480.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>9c9443396f8deacceb8edb169890e52aac25f311</Sha>
21+
<Sha>9e8bd520939ddfee686261267a1646c1b113d9e1</Sha>
2222
</Dependency>
2323
<!-- Previous .NET Android version -->
24-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.147">
24+
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.24">
2525
<Uri>https://github.com/dotnet/android</Uri>
26-
<Sha>a8cd27e430e55df3e3c1e3a43d35c11d9512a2db</Sha>
26+
<Sha>4b20432d95ea8965a41cc73997e459d7fa561233</Sha>
2727
</Dependency>
2828
</ProductDependencies>
2929
<ToolsetDependencies>

‎eng/Versions.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>9.0.100-rtm.24512.1</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25056.1</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETILLinkTasksPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25056.1</MicrosoftNETILLinkTasksPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25056.1</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
99
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
10-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rtm.24469.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
11-
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
10+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.24628.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
11+
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1212
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
13-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24480.1</MicrosoftDotNetCecilPackageVersion>
13+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
1414
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1515
<!-- Previous .NET Android version -->
16-
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.147</MicrosoftAndroidSdkWindowsPackageVersion>
16+
<MicrosoftAndroidSdkWindowsPackageVersion>35.0.24</MicrosoftAndroidSdkWindowsPackageVersion>
1717
<AndroidNetPreviousVersion>$(MicrosoftAndroidSdkWindowsPackageVersion)</AndroidNetPreviousVersion>
1818
</PropertyGroup>
1919
<PropertyGroup>

‎src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-android</TargetFramework>
3+
<TargetFramework>net10.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidBinding1</RootNamespace>
66
<Nullable>enable</Nullable>

‎src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-android</TargetFramework>
3+
<TargetFramework>net10.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
66
<OutputType>Exe</OutputType>

‎src/Microsoft.Android.Templates/android/AndroidApp1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-android</TargetFramework>
3+
<TargetFramework>net10.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
66
<OutputType>Exe</OutputType>

‎src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-android</TargetFramework>
3+
<TargetFramework>net10.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
66
<Nullable>enable</Nullable>

‎src/Xamarin.Android.Build.Tasks/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/Microsoft.Android.Sdk/Sdk/AutoImport.props
12
/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BundledVersions.targets
23
/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.SupportedPlatforms.targets
34
/Xamarin.Android.Common.props

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props ‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.in.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/
1616
-->
1717
<Project>
1818

19-
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
19+
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
2020
<Using Include="Android.App" Platform="Android" />
2121
<Using Include="Android.Widget" Platform="Android" />
2222
<Using Include="Android.OS.Bundle" Alias="Bundle" Platform="Android" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition=" '$(MonoAndroidResourcePrefix)' != '' and
2626
'$(EnableDefaultAndroidItems)' == 'true' and
27-
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
27+
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) ">
2828
<!-- Default Resource file inclusion -->
2929
<!-- https://developer.android.com/guide/topics/resources/providing-resources -->
3030
<AndroidResource Include="$(MonoAndroidResourcePrefix)\*\*.xml" />
@@ -41,13 +41,13 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/
4141

4242
<ItemGroup Condition=" '$(MonoAndroidAssetsPrefix)' != '' and
4343
'$(EnableDefaultAndroidItems)' == 'true' and
44-
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
44+
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) ">
4545
<!-- Default Asset file inclusion -->
4646
<AndroidAsset Include="$(MonoAndroidAssetsPrefix)\**\*" Exclude="$(MonoAndroidAssetsPrefix)\**\.*\**" />
4747
</ItemGroup>
4848

4949
<ItemGroup Condition=" '$(EnableDefaultAndroidItems)' == 'true'
50-
and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
50+
and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) ">
5151
<!-- Default XPath transforms for bindings -->
5252
<TransformFile Include="Transforms*.xml" />
5353
<TransformFile Include="Transforms\**\*.xml" />
@@ -62,7 +62,7 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/
6262
<ProguardConfiguration Include="**\proguard-rules.pro" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
6363
</ItemGroup>
6464

65-
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
65+
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) ">
6666
<AndroidPackagingOptionsExclude Include="DebugProbesKt.bin" />
6767
<AndroidPackagingOptionsExclude Include="$([MSBuild]::Escape('*.kotlin*'))" />
6868
<AndroidPackagingOptionsInclude Include="$([MSBuild]::Escape('*.kotlin_builtins'))" />

‎src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"android": {
55
"description": ".NET SDK Workload for building Android applications.",
66
"packs": [
7+
"Microsoft.Android.Sdk.net10",
78
"Microsoft.Android.Sdk.net9",
8-
"Microsoft.Android.Sdk.net8",
99
"Microsoft.Android.Ref.35",
1010
"Microsoft.Android.Runtime.Mono.35.android-arm",
1111
"Microsoft.Android.Runtime.Mono.35.android-arm64",
@@ -15,8 +15,8 @@
1515
],
1616
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],
1717
"extends" : [
18-
"microsoft-net-runtime-android-net8",
19-
"microsoft-net-runtime-android-aot-net8",
18+
"microsoft-net-runtime-android-net9",
19+
"microsoft-net-runtime-android-aot-net9",
2020
"microsoft-net-runtime-android",
2121
"microsoft-net-runtime-android-aot"
2222
]
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"packs": {
38-
"Microsoft.Android.Sdk.net9": {
38+
"Microsoft.Android.Sdk.net10": {
3939
"kind": "sdk",
4040
"version": "@WORKLOAD_VERSION@",
4141
"alias-to": {
@@ -48,7 +48,7 @@
4848
"linux-arm64": "Microsoft.Android.Sdk.Linux"
4949
}
5050
},
51-
"Microsoft.Android.Sdk.net8": {
51+
"Microsoft.Android.Sdk.net9": {
5252
"kind": "sdk",
5353
"version": "@NET_PREVIOUS_VERSION@",
5454
"alias-to": {

‎src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project>
22
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
3+
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net10"
4+
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) " />
35
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net9"
46
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) " />
5-
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net8"
6-
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) " />
7-
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net9"
8-
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) or $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
7+
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net10"
8+
Condition=" $([MSBuild]::VersionLessThanOrEquals($(TargetFrameworkVersion), '8.0')) " />
99
</ImportGroup>
1010

11-
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
11+
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
1212
<KnownFrameworkReference
1313
Update="Microsoft.Android"
1414
LatestRuntimeFrameworkVersion="@NET_PREVIOUS_VERSION@"
1515
TargetingPackVersion="@NET_PREVIOUS_VERSION@"
1616
/>
1717
</ItemGroup>
1818

19-
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')) ">
19+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0')) ">
2020
<SdkSupportedTargetPlatformIdentifier Include="android" DisplayName="Android" />
2121
</ItemGroup>
2222
</Project>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void BindLibrary (bool bind, string configuration, bool refOutputs)
126126
[Test]
127127
public void BindPackLibrary ([Values (false, true)] bool packGradleRef)
128128
{
129-
var dotnetVersion = "net9.0";
129+
var dotnetVersion = "net10.0";
130130
var apiLevel = XABuildConfig.AndroidDefaultTargetDotnetApiLevel;
131131
var gradleProject = AndroidGradleProject.CreateDefault (GradleTestProjectDir);
132132
var moduleName = gradleProject.Modules.First ().Name;

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,8 @@ public interface OnFooListener
651651
[NonParallelizable]
652652
public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enableMultiDex, [Values ("", "r8")] string linkTool)
653653
{
654-
var folderName = $"BuildReleaseApp AndÜmläüts({enableMultiDex}{linkTool})";
654+
// FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters
655+
var folderName = $"BuildReleaseApp AndÜmläüts{enableMultiDex}{linkTool}";
655656
var lib = new XamarinAndroidLibraryProject {
656657
IsRelease = true,
657658
ProjectName = "Library1"

0 commit comments

Comments
 (0)
Please sign in to comment.