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/installer #8366

Merged
merged 63 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
af77360
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 22, 2023
ba06f77
dotnet9 feed
jonathanpeppers Sep 22, 2023
1b728dd
Pin runtime workload version bands
jonathanpeppers Sep 22, 2023
dce7b50
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 25, 2023
e250a93
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 26, 2023
fcd4fd9
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 2, 2023
f44722a
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 9, 2023
2a8d7cd
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 16, 2023
273dfa8
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 18, 2023
dcf8b5b
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 23, 2023
4d389bc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 24, 2023
8d17140
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 30, 2023
6507665
Fixed emsdk dependency name
jonathanpeppers Nov 2, 2023
1d775eb
Merge branch 'main' into darc-main-583d6f71-0641-4428-9c9f-b64ebed2e33e
jonathanpeppers Nov 2, 2023
8117a16
Revert "Pin runtime workload version bands"
jonathanpeppers Nov 2, 2023
b5ae464
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Nov 6, 2023
88f1fd9
Track Microsoft.NET.ILLink
jonathanpeppers Nov 6, 2023
83a8da2
darc update-dependencies --id 200548
jonathanpeppers Nov 8, 2023
e8409a1
darc update-dependencies --id 200423
jonathanpeppers Nov 8, 2023
3eea0cb
Update NuGet.config
lewing Nov 8, 2023
80315bb
Remove dotnet8-transport feed
jonathanpeppers Nov 8, 2023
ae5925f
Merge branch 'main' into darc-main-583d6f71-0641-4428-9c9f-b64ebed2e33e
jonathanpeppers Nov 8, 2023
5ee5379
net9.0 TargetFramework
jonathanpeppers Nov 8, 2023
c3dc23f
[yaml] DotNetSdkVersion=8.0
jonathanpeppers Nov 8, 2023
f0058e8
[make] PREPARE_NET_FX = net8.0
jonathanpeppers Nov 8, 2023
02ecad0
Remove .NET 7 support, adjust .NET 8/9 settings
jonathanpeppers Nov 9, 2023
6a508aa
Remove net7.0 from tests
jonathanpeppers Nov 10, 2023
d03f0ff
Rename acceptable breakages
jonathanpeppers Nov 10, 2023
0c39b64
AndroidNet8Version -> AndroidNetPreviousVersion
jonathanpeppers Nov 10, 2023
65c459e
Revert "Track Microsoft.NET.ILLink"
jonathanpeppers Nov 10, 2023
40201d0
Update WorkloadManifest.in.targets
jonathanpeppers Nov 10, 2023
a27c0a2
Update NuGet.config
jonathanpeppers Nov 10, 2023
5c4c0a0
Update build-linux.yaml
jonathanpeppers Nov 10, 2023
e2ba46b
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Nov 13, 2023
ecae730
Update `dotnet-test-slicer` to 0.1.0-alpha6
jonathanpeppers Nov 13, 2023
7015567
Update `dotnet-test-slicer` to `0.1.0-alpha7`
jpobst Nov 13, 2023
f50444d
Update AutoImport.props
jonathanpeppers Nov 15, 2023
14f2807
Update .apkdesc files
jonathanpeppers Nov 15, 2023
2bf05c3
Update AOT profile for .NET 9
jonathanpeppers Nov 15, 2023
7fb747e
Bump to latest dotnet/installer
jonathanpeppers Nov 27, 2023
5702a63
Bump to latest dotnet/runtime
jonathanpeppers Nov 27, 2023
fa50087
Update Step_InstallDotNetPreview.cs
jonathanpeppers Nov 27, 2023
49eff7f
Update Step_InstallDotNetPreview.cs
jonathanpeppers Nov 27, 2023
db85b7d
Third attempt to fix manifests
jonathanpeppers Nov 27, 2023
b6868fc
Delete existing baseline manifests, if any
jonathanpeppers Nov 29, 2023
da3f882
Update Step_InstallDotNetPreview.cs
jonathanpeppers Nov 29, 2023
994dddd
We need to copy additional workload manifest files
jonathanpeppers Nov 29, 2023
6928073
Merge branch 'main' into darc-main-583d6f71-0641-4428-9c9f-b64ebed2e33e
jonathanpeppers Nov 29, 2023
da67a8d
DotNetSdkQuality GA
jonathanpeppers Nov 29, 2023
e9ef748
Remove $(PublishSelfContained)=false workaround
jonathanpeppers Nov 29, 2023
c4fbd07
Set $(AllowSelfContainedWithoutRuntimeIdentifier)
jonathanpeppers Nov 30, 2023
e055c4a
MSBuild.StructuredLogger 2.2.100
jonathanpeppers Nov 30, 2023
bff1804
Update xamarin-android-tools
jonathanpeppers Nov 30, 2023
050f5e0
System.Reflection.Metadata 8.0.0
jonathanpeppers Nov 30, 2023
83d6e24
System.CodeDom 8.0.0
jonathanpeppers Nov 30, 2023
95bb4fa
Merge branch 'main' into darc-main-583d6f71-0641-4428-9c9f-b64ebed2e33e
jonathanpeppers Nov 30, 2023
ed1e9c7
darc update-dependencies --id 203335
jonathanpeppers Nov 30, 2023
e33eb37
Ignore `MicrosoftIntune` test for now in .NET 9
jonathanpeppers Nov 30, 2023
a0df976
<ILStrip/> now outputs UpdatedAssemblies
jonathanpeppers Nov 30, 2023
a04effd
Fix `$(AndroidStripILAfterAOT)` feature
jonathanpeppers Dec 1, 2023
3016a5a
$(AndroidNetPreviousVersion) 34.0.56
jonathanpeppers Dec 1, 2023
17ca38e
Ignore one test for `net8.0` & `dotnet publish`
jonathanpeppers Dec 1, 2023
39a4576
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Dec 4, 2023
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 Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
<Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.95</AndroidNet7Version>
<AndroidNetPreviousVersion Condition=" '$(AndroidNetPreviousVersion)' == '' ">34.0.56</AndroidNetPreviousVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(HostOS)' == '' ">
<HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>

<PropertyGroup>
<DotNetTargetFrameworkVersion>8.0</DotNetTargetFrameworkVersion>
<DotNetTargetFrameworkVersion>9.0</DotNetTargetFrameworkVersion>
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
<DotNetStableTargetFramework>net7.0</DotNetStableTargetFramework>
<DotNetStableTargetFramework>net8.0</DotNetStableTargetFramework>
<TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- NuGet Package Versions -->
<ItemGroup>
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Update="System.CodeDom" Version="6.0.0" />
<PackageReference Update="System.CodeDom" Version="8.0.0" />
<PackageReference Update="Irony" Version="1.1.0" />
</ItemGroup>

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 = net7.0
PREPARE_NET_FX = net8.0
PREPARE_ARGS =
PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj
PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS)
Expand Down
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
<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="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/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" />
<!-- 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
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/build-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ stages:
# https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
- checkout: maui

- template: setup-ubuntu.yaml

- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}:
- checkout: monodroid
clean: true
Expand All @@ -59,8 +61,6 @@ stages:
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
displayName: make prepare-external-git-dependencies

- template: setup-ubuntu.yaml

- task: NuGetAuthenticate@0
displayName: authenticate with azure artifacts
inputs:
Expand Down
8 changes: 4 additions & 4 deletions build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ variables:
- name: ApkDiffToolVersion
value: 0.0.15
- name: TestSlicerToolVersion
value: 0.1.0-alpha5
value: 0.1.0-alpha7
- name: BootsToolVersion
value: 1.1.0.36
- name: NUnitConsoleVersion
value: 3.16.3
- name: NUnit.NumberOfTestWorkers
value: 4
- name: DotNetSdkVersion
value: 7.0
value: 8.0
- name: DotNetSdkQuality
value: GA
- name: GitHub.Token
Expand All @@ -40,9 +40,9 @@ variables:
- name: TeamName
value: XamarinAndroid
- name: DotNetTargetFramework
value: net8.0
value: net9.0
- name: DotNetStableTargetFramework
value: net7.0
value: net8.0
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
- name: _WriteTelemetryProperties
value: false
Expand Down
4 changes: 2 additions & 2 deletions build-tools/create-packs/Microsoft.NET.Sdk.Android.proj
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ about the various Microsoft.Android workloads.
<ReplaceFileContents
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.json"
DestinationFile="$(WorkloadManifestJsonPath)"
Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET7_VERSION@=$(AndroidNet7Version)">
Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
</ReplaceFileContents>
<ReplaceFileContents
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.targets"
DestinationFile="$(WorkloadManifestTargetsPath)"
Replacements="@NET7_VERSION@=$(AndroidNet7Version)">
Replacements="@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
</ReplaceFileContents>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,16 @@ 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", "current" };
var dotnets = new [] { "net6", "net7", "net8", "current" };
foreach (var dotnet in dotnets) {
var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain.{dotnet}");
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) {
Utilities.DeleteDirectory (destination, recurse: true);
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "*")) {
Utilities.CopyFileToDir (file, destination);
}
destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten.{dotnet}");
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) {
Utilities.DeleteDirectory (destination, recurse: true);
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "*")) {
Utilities.CopyFileToDir (file, destination);
}
}
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 @@ -23,9 +23,11 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<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.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)]" />
</ItemGroup>

</Project>
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23468.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23603.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e1fd7d964980ed478fa30457cf750e81105caee1</Sha>
<Sha>42ace91ba7564936408c91a264484ff79bd00539</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23577.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
<Sha>a26802aa5793060c512359c2be83e9a4c51964c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23577.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
<Sha>a26802aa5793060c512359c2be83e9a4c51964c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.2.23463.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23572.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc</Sha>
<Sha>74e4868be8423562ba8ec2aac522f94a8c2c9f37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23461.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23509.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>a112f15aa032c029b7d9c77df3427111d93cf407</Sha>
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23468.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-alpha.1.23603.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23577.7</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23577.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.2.23463.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-alpha.1.23572.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23461.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23509.2</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net9.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>net8.0-android</TargetFramework>
<TargetFramework>net9.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>net8.0-android</TargetFramework>
<TargetFramework>net9.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>net8.0-android</TargetFramework>
<TargetFramework>net9.0-android</TargetFramework>
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
<Nullable>enable</Nullable>
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), '8.0')) and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) 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), '8.0')) ">
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<!-- 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), '8.0')) ">
$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<!-- Default Asset file inclusion -->
<AndroidAsset Include="$(MonoAndroidAssetsPrefix)\**\*" Exclude="$(MonoAndroidAssetsPrefix)\**\.*\**" />
</ItemGroup>

<ItemGroup Condition=" '$(EnableDefaultAndroidItems)' == 'true'
and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<!-- Default XPath transforms for bindings -->
<TransformFile Include="Transforms*.xml" />
<TransformFile Include="Transforms\**\*.xml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,14 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
Condition=" '$(AndroidStripILAfterAOT)' == 'true' "
TrimIndividualMethods="true"
Assemblies="@(_MonoAOTCompiledAssemblies)"
IntermediateOutputPath="$(IntermediateOutputPath)"
DisableParallelStripping="$(_DisableParallelAot)">
<Output TaskParameter="TrimmedAssemblies" ItemName="_ILStripTrimmedAssemblies" />
<Output TaskParameter="UpdatedAssemblies" ItemName="_ILStripUpdatedAssemblies" />
</ILStrip>
<Move
Condition=" '$(AndroidStripILAfterAOT)' == 'true' "
SourceFiles="@(_ILStripTrimmedAssemblies->'%(TrimmedAssemblyFileName)')"
DestinationFiles="@(_ILStripTrimmedAssemblies)"
<Copy
Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '%(_ILStripUpdatedAssemblies.ILStripped)' == 'true' and '%(_ILStripUpdatedAssemblies.UntrimmedAssemblyFilePath)' != '' "
SourceFiles="@(_ILStripUpdatedAssemblies)"
DestinationFiles="@(_ILStripUpdatedAssemblies->'%(UntrimmedAssemblyFilePath)')"
/>
<WriteLinesToFile
File="$(_AndroidStampDirectory)_AndroidAot.stamp"
Expand Down
Loading
Loading