diff --git a/Directory.Build.props b/Directory.Build.props index 7f565800d..a96a72df1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,8 +6,10 @@ $(BUILD_SOURCEVERSION) - <_DefaultTargetFrameworks>net8.0-android - <_DefaultNetTargetFrameworks>net8.0 + <_DefaultTargetFrameworks>net10.0-android + <_DefaultNetTargetFrameworks>net10.0 + + -preview.net10 true @@ -83,13 +85,13 @@ - - + + - + diff --git a/global.json b/global.json index 031a73545..5166053f2 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,4 @@ { - "sdk": - { - "version": "8.0.404", - "rollForward": "patch" - }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", diff --git a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj index 1b4d92eaa..cf40a4473 100644 --- a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj +++ b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj @@ -33,7 +33,7 @@ Xamarin AndroidX Xamarin.AndroidX Support Google appcompat-resources LICENSE.md icon.png - 1.1.0.3 + 1.1.0.3$(PackageVersionSuffix) $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index d8a473f19..b61494e2a 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,7 +3,7 @@ which is tuned for building bindings packages. --> - <_DefaultTargetFrameworks>net8.0-android - <_DefaultNetTargetFrameworks>net8.0 + <_DefaultTargetFrameworks>net10.0-android + <_DefaultNetTargetFrameworks>net10.0 diff --git a/utilities.cake b/utilities.cake index 038049bee..d4bc053eb 100644 --- a/utilities.cake +++ b/utilities.cake @@ -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 <