Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/sdk #9395

Draft
wants to merge 52 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
1890caa
Update dependencies from https://github.com/dotnet/sdk build 20241010.13
dotnet-maestro[bot] Oct 14, 2024
28b45d4
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Oct 16, 2024
55f32de
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport
jonathanpeppers Oct 16, 2024
9b0be6d
darc update-dependencies --coherency-only
jonathanpeppers Oct 16, 2024
ce4e82c
Update Versions.props
jonathanpeppers Oct 16, 2024
aa8af85
dotnet10 feed
jonathanpeppers Oct 17, 2024
59111e4
Update dependencies from https://github.com/dotnet/sdk build 20241024.9
dotnet-maestro[bot] Oct 24, 2024
2692aff
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Oct 28, 2024
9a449d8
darc update-dependencies --id 243767
jonathanpeppers Oct 29, 2024
fe288c0
Took a pass, moving .NET 9 -> .NET 10
jonathanpeppers Oct 29, 2024
f78614c
Temporarily remove net9 manifests
jonathanpeppers Oct 29, 2024
b27003d
[build] install .NET on Linux
jonathanpeppers Oct 29, 2024
5a445d8
Rename file to net10.0
jonathanpeppers Oct 29, 2024
bf6c921
Temporarily remove microsoft-net-runtime-android-net9
jonathanpeppers Oct 29, 2024
219fc89
Update dependencies from https://github.com/dotnet/sdk build 20241103.6
dotnet-maestro[bot] Nov 4, 2024
08c02bc
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Nov 8, 2024
64fd781
Update AutoImport.props
jonathanpeppers Nov 8, 2024
8fa7de3
Update dependencies from https://github.com/dotnet/sdk build 20241110.6
dotnet-maestro[bot] Nov 11, 2024
cabc9ae
Update dependencies from https://github.com/dotnet/sdk build 20241118.3
dotnet-maestro[bot] Nov 18, 2024
b639227
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Nov 20, 2024
0c94dae
Include all `darc-pub-` feeds
jonathanpeppers Nov 20, 2024
9dcde99
Fix `BindPackLibrary()` test
jonathanpeppers Nov 20, 2024
b85c83c
.NET 9 is GA now
jonathanpeppers Nov 21, 2024
ac07c16
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Nov 22, 2024
9378298
Update dependencies from https://github.com/dotnet/sdk build 20241123.1
dotnet-maestro[bot] Nov 25, 2024
8843e9a
Update dependencies from https://github.com/dotnet/sdk build 20241205.38
dotnet-maestro[bot] Dec 6, 2024
13a2cfc
Revert "Rename file to net10.0"
jonathanpeppers Dec 6, 2024
b722fab
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Dec 6, 2024
7464778
Reapply "Rename file to net10.0"
jonathanpeppers Dec 6, 2024
6e4b66f
Update dependencies from https://github.com/dotnet/sdk build 20241209.2
dotnet-maestro[bot] Dec 9, 2024
5beb1e9
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Dec 9, 2024
1d49919
Update dependencies from https://github.com/dotnet/sdk build 20241209.4
dotnet-maestro[bot] Dec 10, 2024
79c704d
Update dependencies from https://github.com/dotnet/sdk build 20241212.16
dotnet-maestro[bot] Dec 12, 2024
02d0ea1
Update dependencies from https://github.com/dotnet/sdk build 20241216.1
dotnet-maestro[bot] Dec 16, 2024
50242b9
Update dependencies from https://github.com/dotnet/sdk build 20241220.1
dotnet-maestro[bot] Dec 20, 2024
61325c0
Update dependencies from https://github.com/dotnet/sdk build 20241220.2
dotnet-maestro[bot] Dec 20, 2024
fc99420
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Dec 20, 2024
cc11abd
Revert "Temporarily remove net9 manifests"
jonathanpeppers Dec 20, 2024
6ced2a3
Revert "Temporarily remove microsoft-net-runtime-android-net9"
jonathanpeppers Dec 20, 2024
2d55ef2
Android 35.0.24 shipped
jonathanpeppers Dec 20, 2024
0d52223
Update workload-dependencies.csproj
jonathanpeppers Dec 20, 2024
1da8c97
[main] Update dependencies from dotnet/sdk (#9644)
dotnet-maestro[bot] Jan 6, 2025
5bbab28
darc update-dependencies --coherency-only
jonathanpeppers Jan 6, 2025
8e2b335
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Jan 6, 2025
7e1be48
Replace `@DOTNET_TARGET_FRAMEWORK_VERSION@`
jonathanpeppers Jan 6, 2025
d01b2a7
`darc update-dependencies --id 251080`
jonathanpeppers Jan 6, 2025
d11a0ef
`darc update-dependencies --id 251060`
jonathanpeppers Jan 6, 2025
fa0d03d
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Jan 6, 2025
2960637
Fix tests
jonathanpeppers Jan 6, 2025
4333dfe
Fix MissingProjectReference
jonathanpeppers Jan 6, 2025
12e0100
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers Jan 9, 2025
3d339c3
Remove `( )` from `CheckSignApk()` test folder
jonathanpeppers Jan 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
<DotNetTargetFrameworkVersion>9.0</DotNetTargetFrameworkVersion>
<DotNetTargetFrameworkVersion>10.0</DotNetTargetFrameworkVersion>
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
Expand Down
5 changes: 2 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<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" />
<!-- End: Package sources from dotnet-android -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- ensure only the sources defined below are used -->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<!-- This is for packages needed by debugger-libs -->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ variables:
- name: TeamName
value: XamarinAndroid
- name: DotNetTargetFramework
value: net9.0
value: net10.0
- name: DotNetStableTargetFramework
value: net9.0
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/DotNet.targets
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
Query="/Project/ItemGroup/PackageDownload[contains(@Include,'Microsoft.NET.Sdk.Android.Manifest-')]/@Include" />
<XmlPeek
XmlInputPath="$(_Root)NuGet.config"
Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-dotnet-android-')]">
Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-')]">
<Output TaskParameter="Result" ItemName="_DotNetAndroidFeeds" />
</XmlPeek>
<XmlPeek
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected override async Task<bool> Execute (Context context)
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests");

// Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj
var dotnets = new [] { "net6", "net7", "net8", "current" };
var dotnets = new [] { "net6", "net7", "net8", "net9", "current" };
foreach (var dotnet in dotnets) {
var destination = Path.Combine (sdk_manifests,
context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand),
Expand Down
2 changes: 2 additions & 0 deletions build-tools/xaprepare/xaprepare/package-download.proj
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net9.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Current.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net8.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net9.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
</ItemGroup>

</Project>
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24512.1">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25056.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5b9d9d4677ea31d954533e9de2f95a3ea638135d</Sha>
<Sha>a93a592ce99414d94dafbd0ef0a6f51b6fbcdaf4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25056.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
<Sha>4b02c51f7158ca9abc68b331ac5ad64d716a0e2a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25056.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
<Sha>4b02c51f7158ca9abc68b331ac5ad64d716a0e2a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rtm.24469.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<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">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>8e660ff41e91879977e3a9d837e068bd72234c26</Sha>
<Sha>953fd74cd26884432eee21244ff4b031ebbdde32</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24480.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>9c9443396f8deacceb8edb169890e52aac25f311</Sha>
<Sha>9e8bd520939ddfee686261267a1646c1b113d9e1</Sha>
</Dependency>
<!-- Previous .NET Android version -->
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.147">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.24">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>a8cd27e430e55df3e3c1e3a43d35c11d9512a2db</Sha>
<Sha>4b20432d95ea8965a41cc73997e459d7fa561233</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>9.0.100-rtm.24512.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25056.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25056.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25056.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rtm.24469.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.24628.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24480.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.147</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>35.0.24</MicrosoftAndroidSdkWindowsPackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftAndroidSdkWindowsPackageVersion)</AndroidNetPreviousVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidBinding1</RootNamespace>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
<Nullable>enable</Nullable>
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/Microsoft.Android.Sdk/Sdk/AutoImport.props
/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BundledVersions.targets
/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.SupportedPlatforms.targets
/Xamarin.Android.Common.props
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/
-->
<Project>

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

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

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

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

<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) ">
<AndroidPackagingOptionsExclude Include="DebugProbesKt.bin" />
<AndroidPackagingOptionsExclude Include="$([MSBuild]::Escape('*.kotlin*'))" />
<AndroidPackagingOptionsInclude Include="$([MSBuild]::Escape('*.kotlin_builtins'))" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"android": {
"description": ".NET SDK Workload for building Android applications.",
"packs": [
"Microsoft.Android.Sdk.net10",
"Microsoft.Android.Sdk.net9",
"Microsoft.Android.Sdk.net8",
"Microsoft.Android.Ref.35",
"Microsoft.Android.Runtime.Mono.35.android-arm",
"Microsoft.Android.Runtime.Mono.35.android-arm64",
Expand All @@ -15,8 +15,8 @@
],
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],
"extends" : [
"microsoft-net-runtime-android-net8",
"microsoft-net-runtime-android-aot-net8",
"microsoft-net-runtime-android-net9",
"microsoft-net-runtime-android-aot-net9",
"microsoft-net-runtime-android",
"microsoft-net-runtime-android-aot"
]
Expand All @@ -35,7 +35,7 @@
}
},
"packs": {
"Microsoft.Android.Sdk.net9": {
"Microsoft.Android.Sdk.net10": {
"kind": "sdk",
"version": "@WORKLOAD_VERSION@",
"alias-to": {
Expand All @@ -48,7 +48,7 @@
"linux-arm64": "Microsoft.Android.Sdk.Linux"
}
},
"Microsoft.Android.Sdk.net8": {
"Microsoft.Android.Sdk.net9": {
"kind": "sdk",
"version": "@NET_PREVIOUS_VERSION@",
"alias-to": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project>
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net10"
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) " />
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net9"
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) " />
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net8"
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) " />
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net9"
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) or $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net10"
Condition=" $([MSBuild]::VersionLessThanOrEquals($(TargetFrameworkVersion), '8.0')) " />
</ImportGroup>

<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<KnownFrameworkReference
Update="Microsoft.Android"
LatestRuntimeFrameworkVersion="@NET_PREVIOUS_VERSION@"
TargetingPackVersion="@NET_PREVIOUS_VERSION@"
/>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')) ">
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="android" DisplayName="Android" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void BindLibrary (bool bind, string configuration, bool refOutputs)
[Test]
public void BindPackLibrary ([Values (false, true)] bool packGradleRef)
{
var dotnetVersion = "net9.0";
var dotnetVersion = "net10.0";
var apiLevel = XABuildConfig.AndroidDefaultTargetDotnetApiLevel;
var gradleProject = AndroidGradleProject.CreateDefault (GradleTestProjectDir);
var moduleName = gradleProject.Modules.First ().Name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ public void MissingProjectReference ()

// Build app before library is built
Assert.IsFalse (appBuilder.Build (app), "app build should have failed.");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project '{reference.Replace ('\\', Path.DirectorySeparatorChar)}' does not exist."));
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "warning MSB9008"), "Should receive MSB9008");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Warning(s)"), "Should receive 1 Warning");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "error CS0246"), "Should receive CS0246");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Error(s)"), "Should receive 1 Error");
Expand Down
Loading
Loading