- Notifications
You must be signed in to change notification settings - Fork63
[DO NOT MERGE] TFM net9.0#850
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
moljac wants to merge71 commits intomainChoose a base branch frommu-20240220-tfm-net90
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Draft
Changes fromall commits
Commits
Show all changes
71 commits Select commitHold shift + click to select a range
37a66e7 net9.0
moljacf2ed288 net9.0 fixes
moljacdaa9660 agent dotnet version
moljacbc9f982 Merge branch 'main' into mu-20240220-tfm-net90
moljac363a5e0 Update global.json
moljac524815e Update build.yml
moljacfbb35bc file renamed for net9.0
moljacb4c8f57 metadatq fixes
moljac934b8fa nuget fixes
moljac300418d Update build.cake
moljacd1cc416 Update build.cake
moljac667ce5f Merge branch 'main' into mu-20240220-tfm-net90
moljace9c8b21 Merge branch 'main' into mu-20240220-tfm-net90
moljacc644a41 added AndroidManifest.xml to the root of the project to fix errors
moljac0650707 renamed AndroidManifest.xml
moljacc1e6d88 Merge branch 'main' into mu-20240220-tfm-net90
moljac58c2447 Merge branch 'main' into mu-20240220-tfm-net90
moljacd7e1245 Merge branch 'main' into mu-20240220-tfm-net90
moljac854aaff Merge branch 'main' into mu-20240220-tfm-net90
moljac70b1662 Merge branch 'main' into mu-20240220-tfm-net90
moljac7d585a2 Merge branch 'main' into mu-20240220-tfm-net90
moljacdec3a46 samples fixed
moljac54dbd73 Merge branch 'main' into mu-20240220-tfm-net90
moljac49ec27a automatic files
moljac9149f8b Merge branch 'main' into mu-20240220-tfm-net90
moljacd196b0c Merge branch 'main' into mu-20240220-tfm-net90
moljac99b2121 Update published-namespaces.txt
moljacaed9564 Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac3960b42 Merge branch 'main' into mu-20240220-tfm-net90
moljac52882a5 bum dotnet to preview 9.0.100-preview.4
moljacfd39db8 automagic files
moljacc392d19 Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac19246ca typos fixed
moljacd09a234 Update setup-environment.yml
moljaced355f6 Merge branch 'main' into mu-20240220-tfm-net90
moljacc83ea9b Merge branch 'main' into mu-20240220-tfm-net90
moljac69baef1 samples fixed
moljacabbb3d4 Merge branch 'main' into mu-20240220-tfm-net90
moljac24533e4 Merge branch 'main' into mu-20240220-tfm-net90
moljac03912f5 Merge branch 'main' into mu-20240220-tfm-net90
moljacdc17d44 automatic files
moljac855a04f Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac3b29b6b Merge branch 'main' into mu-20240220-tfm-net90
moljacf8cdfca Merge branch 'main' into mu-20240220-tfm-net90
moljace9e7ab3 "excludedRuntimeDependencies": "androidx.emoji2.emoji2"
moljac274234f dotnet bump to 9.0.100-rc.1.24452.12
moljaceceaac5 dotnetVersion: '9.0.0-rc.1'
moljac4242b63 CI fixes
moljac332a4c3 sdk version fix
moljac5c82eee parameters fixes
moljace0dc83b workloads.json
moljace561931 Fix for Kotlin issue
jpobst3b36c85 Merge branch 'main' into mu-20240220-tfm-net90
moljac9d160bc Merge branch 'main' into mu-20240220-tfm-net90
moljacdaf9101 rc2
moljaca380608 metadata fixes
moljac9880350 Merge branch 'main' into mu-20240220-tfm-net90
moljac34d395f Merge branch 'main' into mu-20240220-tfm-net90
moljac439714d grpc fixes
moljac71da063 Merge branch 'main' into mu-20240220-tfm-net90
moljac9cca6d3 Merge branch 'main' into mu-20240220-tfm-net90
moljacabf1ffe Merge branch 'main' into mu-20240220-tfm-net90
moljac221ffb2 Merge branch 'main' into mu-20240220-tfm-net90
moljacea65769 Merge branch 'main' into mu-20240220-tfm-net90
moljac42477ad Merge branch 'main' into mu-20240220-tfm-net90
moljac4b98ef7 Merge branch 'main' into mu-20240220-tfm-net90
moljac1a58073 Merge branch 'main' into mu-20240220-tfm-net90
moljac88ae83e Merge branch 'main' into mu-20240220-tfm-net90
moljac86eeb7c Merge branch 'main' into mu-20240220-tfm-net90
moljacbdda4bb Merge branch 'main' into mu-20240220-tfm-net90
moljaca8f29f7 Merge branch 'main' into mu-20240220-tfm-net90
moljacFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
11 changes: 5 additions & 6 deletionsDirectory.Build.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
49 changes: 9 additions & 40 deletionsbuild/ci/setup-environment.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionbuild/ci/variables.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1,332 changes: 666 additions & 666 deletionsdocs/artifact-list-with-versions.md
Large diffs are not rendered by default.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
19 changes: 0 additions & 19 deletionsdocs/buildtoolsinventory.csv
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +0,0 @@ | ||
23 changes: 0 additions & 23 deletionsdocs/buildtoolsinventory.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +0,0 @@ | ||
2 changes: 1 addition & 1 deletionglobal.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "sdk": | ||
| { | ||
| "version": "9.0.201", | ||
| "rollForward": "patch" | ||
| }, | ||
| "msbuild-sdks": | ||
3 changes: 3 additions & 0 deletions...istry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <values> | ||
| <value name="StillAlive" type="qword">133595683463017070</value> | ||
| </values> |
3 changes: 3 additions & 0 deletionssamples/Directory.Packages.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <Project> | ||
| <Import Project="../output/Directory.packages.props" /> | ||
| </Project> |
26 changes: 26 additions & 0 deletionssamples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks> | ||
| <!-- Some packages specify a minimum of 28 (eg: Xamarin.AndroidX.HeifWriter) --> | ||
| <SupportedOSPlatformVersion>28</SupportedOSPlatformVersion> | ||
| <OutputType>Exe</OutputType> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <ApplicationId>com.companyname.BuildAllDotNet</ApplicationId> | ||
| <ApplicationVersion>1</ApplicationVersion> | ||
| <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> | ||
| <!-- Override property from 'Directory.Build.props' --> | ||
| <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner> | ||
| <!-- Prevent linking, since that would remove ~everything --> | ||
| <PublishTrimmed>False</PublishTrimmed> | ||
| <RunAOTCompilation>False</RunAOTCompilation> | ||
| <JavaMaximumHeapSize>4G</JavaMaximumHeapSize> | ||
| </PropertyGroup> | ||
| <Import Project="..\..\..\output\AllPackages.targets" /> | ||
| </Project> |
83 changes: 83 additions & 0 deletionssamples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks> | ||
| <OutputType>Exe</OutputType> | ||
| <RootNamespace>BuildAllMauiApp</RootNamespace> | ||
| <UseMaui>true</UseMaui> | ||
| <SingleProject>true</SingleProject> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <!-- Display name --> | ||
| <ApplicationTitle>BuildAllMauiApp</ApplicationTitle> | ||
| <!-- App Identifier --> | ||
| <ApplicationId>com.companyname.buildallmauiapp</ApplicationId> | ||
| <ApplicationIdGuid>bf82dcee-2471-4ec8-856a-a3d17e578c8e</ApplicationIdGuid> | ||
| <!-- Versions --> | ||
| <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> | ||
| <ApplicationVersion>1</ApplicationVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">28.0</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> | ||
| <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup | ||
| Condition="$(TargetFramework.EndsWith('-android')) == true" | ||
| > | ||
| <JavaMaximumHeapSize>4G</JavaMaximumHeapSize> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- App Icon --> | ||
| <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" /> | ||
| <!-- Splash Screen --> | ||
| <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" /> | ||
| <!-- Images --> | ||
| <MauiImage Include="Resources\Images\*" /> | ||
| <MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" /> | ||
| <!-- Custom Fonts --> | ||
| <MauiFont Include="Resources\Fonts\*" /> | ||
| <!-- Raw Assets (also remove the "Resources\Raw" prefix) --> | ||
| <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> | ||
| </ItemGroup> | ||
| <Import | ||
| Condition="$(TargetFramework.StartsWith('net8.0-android')) == true" | ||
| Project="..\..\..\output\AllPackages.targets" | ||
| /> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Maui.Controls" /> | ||
| <PackageReference Include="Microsoft.Maui.Controls.Compatibility" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" /> | ||
| </ItemGroup> | ||
| <!-- | ||
| ./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : | ||
| error NU1605: Detected package downgrade: Xamarin.AndroidX.Security.SecurityCrypto from 1.1.0-alpha03 to 1.0.0.7. | ||
| Reference the package directly from the project to select a different version. | ||
| [./samples/dotnet/BuildAllMauiApp.sln] | ||
| ./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : | ||
| error NU1605: BuildAllMauiApp -> Microsoft.Maui.Dependencies 6.0.312 -> Xamarin.AndroidX.Security.SecurityCrypto (>= 1.1.0-alpha03) | ||
| [./samples/dotnet/BuildAllMauiApp.sln] | ||
| ./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : | ||
| error NU1605: BuildAllMauiApp -> Xamarin.AndroidX.Security.SecurityCrypto (>= 1.0.0.7) | ||
| [./samples/dotnet/BuildAllMauiApp.sln] | ||
| --> | ||
| <ItemGroup | ||
| Condition="$(TargetFramework.StartsWith('net8.0-android')) == true" | ||
| > | ||
| <PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto" Version="[1.1.0.1-alpha06]" /> | ||
| <PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto.Ktx" Version="[1.1.0.1-alpha06]" /> | ||
| </ItemGroup> | ||
| </Project> |
7 changes: 7 additions & 0 deletionssamples/dotnet/BuildAllMauiApp/Platforms/Android/___AndroidManifest.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.buildallmauiapp" android:versionCode="1" android:versionName="1.0"> | ||
| <application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:largeHeap="true" android:label="BuildAllMauiApp"></application> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="34" /> | ||
| </manifest> |
15 changes: 15 additions & 0 deletionssamples/dotnet/Directory.Packages.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <Project> | ||
| <Import Project="..\Directory.Packages.props"/> | ||
| <ItemGroup> | ||
| <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" /> | ||
| <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.3.24172.9" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2612" /> | ||
| <PackageVersion Include="Xamarin.Essentials" Version="1.8.0" /> | ||
| <PackageVersion Include="Xamarin.Google.Guava.ListenableFuture" Version="1.0.0.16" /> | ||
| <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.6.0.2" /> | ||
| </ItemGroup> | ||
| </Project> |
28 changes: 15 additions & 13 deletionssource/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionssource/androidx.media3/media3-exoplayer/Transforms/Metadata.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletionssource/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.