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.

Sign up for GitHub

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

Build with TargetFramework=net10.0 #1079

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Build with TargetFramework=net10.0 #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f7890f
`net8.0` -> `net10.0`
jonathanpeppers Jan 16, 2025
728dd59
Added `-preview.net10` suffix
jonathanpeppers Jan 22, 2025
77a129e
Merge branch 'main' into net10.0
moljac Feb 24, 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
12 changes: 7 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>

<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
<_DefaultTargetFrameworks>net10.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net10.0</_DefaultNetTargetFrameworks>

<PackageVersionSuffix>-preview.net10</PackageVersionSuffix>

<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
Expand Down Expand Up @@ -83,13 +85,13 @@

<!-- Folders that .targets files need to go into -->
<ItemGroup>
<AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="build\net10.0-android35.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net10.0-android35.0" />
</ItemGroup>

<!-- Folders that _._ files need to go into for packages without managed libraries -->
<ItemGroup>
<AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
<AndroidXNuGetLibFolders Include="lib\net10.0-android35.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"sdk":
{
"version": "8.0.404",
"rollForward": "patch"
},
"msbuild-sdks":
{
"MSBuild.Sdk.Extras": "3.0.44",
Expand Down
2 changes: 1 addition & 1 deletion ...idx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageTags>Xamarin AndroidX Xamarin.AndroidX Support Google appcompat-resources</PackageTags>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageIcon>icon.png</PackageIcon>
<PackageVersion>1.1.0.3</PackageVersion>
<PackageVersion>1.1.0.3$(PackageVersionSuffix)</PackageVersion>
<!-- Include symbol files (*.pdb) in the built .nupkg -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
which is tuned for building bindings packages. -->
<PropertyGroup>
<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
<_DefaultTargetFrameworks>net10.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net10.0</_DefaultNetTargetFrameworks>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion utilities.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ Task("java-resolution-analysis")

string dir = "output/java-resolution-analysis";
EnsureDirectoryExists(dir);
EnsureDirectoryExists($"{dir}/net8.0-android");
EnsureDirectoryExists($"{dir}/net10.0-android");

ConcurrentDictionary
<
Expand Down