diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets
index f3a1fcfb948..dec69f327bc 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.AvailableItems.targets
@@ -29,32 +29,15 @@ This item group populates the Build Action drop-down in IDEs.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
@@ -64,13 +47,13 @@ This item group populates the Build Action drop-down in IDEs.
true
- true
+ true
- true
+ true
- true
+ true
@@ -80,38 +63,26 @@ This item group populates the Build Action drop-down in IDEs.
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets
index 107a95fe476..37a058a8ded 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets
@@ -20,10 +20,8 @@ It is shared between "legacy" binding projects and .NET 5 projects.
$(IntermediateOutputPath)generated\
intellisense
$(IntermediateOutputPath)api.xml
- class-parse.dll
- class-parse.exe
- generator.dll
- generator.exe
+ class-parse.dll
+ generator.dll
javadoc-to-mdoc.exe
<_GeneratorStampFile>$(_AndroidStampDirectory)generator.stamp
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
index c7f9b949e47..8504ad98ec8 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -8,8 +8,7 @@
Assets
Resource
true
- Xamarin.Android.Net.AndroidMessageHandler
- Xamarin.Android.Net.AndroidClientHandler
+ Xamarin.Android.Net.AndroidMessageHandler
true
true
false
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
index 670fcfe566e..7c50f680dfa 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
@@ -79,7 +79,6 @@ public class GeneratePackageManagerJava : AndroidTask
public string TlsProvider { get; set; }
public string AndroidSequencePointsMode { get; set; }
public bool EnableSGenConcurrent { get; set; }
- public bool UsingAndroidNETSdk { get; set; }
[Output]
public string BuildId { get; set; }
@@ -195,7 +194,7 @@ void AddEnvironment ()
BrokenExceptionTransitions = false,
UsesAssemblyPreload = EnablePreloadAssembliesDefault,
};
- environmentParser.Parse (Environments, sequencePointsMode, UsingAndroidNETSdk, Log);
+ environmentParser.Parse (Environments, sequencePointsMode, Log);
foreach (string line in environmentParser.EnvironmentVariableLines) {
AddEnvironmentVariableLine (line);
@@ -219,13 +218,6 @@ void AddEnvironment ()
AddEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE", HttpClientHandlerType.Trim ());
}
- if (!UsingAndroidNETSdk && !environmentParser.HaveTlsProvider) {
- if (TlsProvider == null)
- AddEnvironmentVariable (defaultTlsProvider[0], defaultTlsProvider[1]);
- else
- AddEnvironmentVariable ("XA_TLS_PROVIDER", TlsProvider.Trim ());
- }
-
if (!environmentParser.HaveMonoGCParams) {
if (EnableSGenConcurrent)
AddEnvironmentVariable ("MONO_GC_PARAMS", "major=marksweep-conc");
@@ -355,19 +347,6 @@ void AddEnvironment ()
}
}
- // In "classic" Xamarin.Android, we need to add libaot-*.dll.so files
- if (!UsingAndroidNETSdk && usesMonoAOT) {
- foreach (var assembly in ResolvedAssemblies) {
- string name = $"libaot-{Path.GetFileNameWithoutExtension (assembly.ItemSpec)}.dll.so";
- if (seenNativeLibraryNames.Contains (name)) {
- continue;
- }
-
- seenNativeLibraryNames.Add (name);
- uniqueNativeLibraries.Add (new TaskItem (name));
- }
- }
-
bool haveRuntimeConfigBlob = !String.IsNullOrEmpty (RuntimeConfigBinFilePath) && File.Exists (RuntimeConfigBinFilePath);
var appConfState = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal (ProjectSpecificTaskObjectKey (ApplicationConfigTaskState.RegisterTaskObjectKey), RegisteredTaskObjectLifetime.Build);
var jniRemappingNativeCodeInfo = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal (ProjectSpecificTaskObjectKey (GenerateJniRemappingNativeCode.JniRemappingNativeCodeInfoKey), RegisteredTaskObjectLifetime.Build);
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/LinkAssembliesNoShrink.cs b/src/Xamarin.Android.Build.Tasks/Tasks/LinkAssembliesNoShrink.cs
index 8a6c162fe8e..7f551dbc898 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/LinkAssembliesNoShrink.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/LinkAssembliesNoShrink.cs
@@ -34,8 +34,6 @@ public class LinkAssembliesNoShrink : AndroidTask
[Required]
public string TargetName { get; set; } = "";
- public bool UsingAndroidNETSdk { get; set; }
-
public bool AddKeepAlives { get; set; }
public bool UseDesignerAssembly { get; set; }
@@ -70,7 +68,7 @@ public override bool RunTask ()
// Set up the FixAbstractMethodsStep and AddKeepAlivesStep
var cache = new TypeDefinitionCache ();
var fixAbstractMethodsStep = new FixAbstractMethodsStep (resolver, cache, Log);
- var addKeepAliveStep = new AddKeepAlivesStep (resolver, cache, Log, UsingAndroidNETSdk);
+ var addKeepAliveStep = new AddKeepAlivesStep (resolver, cache, Log);
var fixLegacyResourceDesignerStep = new FixLegacyResourceDesignerStep (resolver, Log);
for (int i = 0; i < SourceFiles.Length; i++) {
var source = SourceFiles [i];
@@ -78,7 +76,7 @@ public override bool RunTask ()
var assemblyName = Path.GetFileNameWithoutExtension (source.ItemSpec);
// In .NET 6+, we can skip the main assembly
- if (UsingAndroidNETSdk && !AddKeepAlives && assemblyName == TargetName) {
+ if (!AddKeepAlives && assemblyName == TargetName) {
CopyIfChanged (source, destination);
continue;
}
@@ -87,17 +85,9 @@ public override bool RunTask ()
continue;
}
- // Check AppDomain usage on any non-Product or Sdk assembly
- AssemblyDefinition? assemblyDefinition = null;
- if (!UsingAndroidNETSdk) {
- assemblyDefinition = resolver.GetAssembly (source.ItemSpec);
- fixAbstractMethodsStep.CheckAppDomainUsage (assemblyDefinition, (string msg) => Log.LogCodedWarning ("XA2000", msg));
- }
-
// Only run the step on "MonoAndroid" assemblies
if (MonoAndroidHelper.IsMonoAndroidAssembly (source) && !MonoAndroidHelper.IsSharedRuntimeAssembly (source.ItemSpec)) {
- if (assemblyDefinition == null)
- assemblyDefinition = resolver.GetAssembly (source.ItemSpec);
+ var assemblyDefinition = resolver.GetAssembly (source.ItemSpec);
bool save = fixAbstractMethodsStep.FixAbstractMethods (assemblyDefinition);
if (UseDesignerAssembly)
@@ -185,19 +175,17 @@ class AddKeepAlivesStep : MonoDroid.Tuner.AddKeepAlivesStep
{
readonly DirectoryAssemblyResolver resolver;
readonly TaskLoggingHelper logger;
- readonly bool hasSystemPrivateCoreLib;
- public AddKeepAlivesStep (DirectoryAssemblyResolver resolver, TypeDefinitionCache cache, TaskLoggingHelper logger, bool hasSystemPrivateCoreLib)
+ public AddKeepAlivesStep (DirectoryAssemblyResolver resolver, TypeDefinitionCache cache, TaskLoggingHelper logger)
: base (cache)
{
this.resolver = resolver;
this.logger = logger;
- this.hasSystemPrivateCoreLib = hasSystemPrivateCoreLib;
}
protected override AssemblyDefinition GetCorlibAssembly ()
{
- return resolver.GetAssembly (hasSystemPrivateCoreLib ? "System.Private.CoreLib.dll" : "mscorlib.dll");
+ return resolver.GetAssembly ("System.Private.CoreLib.dll");
}
public override void LogMessage (string message)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
index c663d3eaa8d..767ac77e9e8 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
@@ -33,7 +33,7 @@ public bool AreBrokenExceptionTransitionsEnabled (ITaskItem[] environments)
return false;
}
- public void Parse (ITaskItem[] environments, SequencePointsMode sequencePointsMode, bool usingAndroidNETSdk, TaskLoggingHelper log)
+ public void Parse (ITaskItem[] environments, SequencePointsMode sequencePointsMode, TaskLoggingHelper log)
{
foreach (ITaskItem env in environments ?? Array.Empty ()) {
foreach (string line in File.ReadLines (env.ItemSpec)) {
@@ -56,9 +56,6 @@ public void Parse (ITaskItem[] environments, SequencePointsMode sequencePointsMo
if (lineToWrite.StartsWith ("XA_HTTP_CLIENT_HANDLER_TYPE=", StringComparison.Ordinal))
HaveHttpMessageHandler = true;
- if (!usingAndroidNETSdk && lineToWrite.StartsWith ("XA_TLS_PROVIDER=", StringComparison.Ordinal))
- HaveTlsProvider = true;
-
if (lineToWrite.StartsWith ("mono.enable_assembly_preload=", StringComparison.Ordinal)) {
int idx = lineToWrite.IndexOf ('=');
uint val;
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in
index 6f24d0e127d..d25dca5bf76 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in
@@ -2,7 +2,6 @@
- @PACKAGE_VERSION@-@PACKAGE_VERSION_BUILD@
<_JavaInteropReferences>Java.Interop;System.Runtime
Xamarin
true
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index c9b8dfd5e4f..d8919b2e499 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -134,9 +134,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
*******************************************
-->
-
-
- armeabi-v7a;arm64-v8a
-
@@ -299,8 +294,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
False
- <_AndroidEnablePreloadAssembliesDefault Condition=" '$(UsingAndroidNETSdk)' == 'true' ">False
- <_AndroidEnablePreloadAssembliesDefault Condition=" '$(UsingAndroidNETSdk)' != 'true' ">True
+ <_AndroidEnablePreloadAssembliesDefault>False
$(_AndroidEnablePreloadAssembliesDefault)
<_NativeAssemblySourceDir>$(IntermediateOutputPath)android\
<_AndroidUseNewTypemaps>True
@@ -335,8 +329,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
false
true
True
- False
- False
+ False
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)
@@ -387,15 +380,10 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
<_AppExtensionReference Condition=" '%(ProjectReference.IsAppExtension)' == 'True' " Include="@(ProjectReference)" />
-
- <_AppExtensionContinueOnError Condition=" '$(UsingAndroidNETSdk)' == 'true' ">ErrorAndStop
- <_AppExtensionContinueOnError Condition=" '$(UsingAndroidNETSdk)' != 'true' ">WarnAndContinue
-
@@ -543,17 +531,13 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
ResourceName="XA1023"
Condition=" '$(AndroidDexTool)' == 'dx' "
/>
-
@@ -843,23 +827,17 @@ because xbuild doesn't support framework reference assemblies.
-
- <_TreatErrorAsWarning Condition="'$(UsingAndroidNETSdk)' != 'true' " >True
- <_TreatErrorAsWarning Condition=" '$(_TreatErrorAsWarning)' == ''">False
-
@@ -971,8 +949,7 @@ because xbuild doesn't support framework reference assemblies.
<_PropertyCacheItems Include="AndroidNdkPath=$(_AndroidNdkDirectory)" />
<_PropertyCacheItems Include="JavaSdkPath=$(_JavaSdkDirectory)" />
<_PropertyCacheItems Include="AndroidSequencePointsMode=$(_AndroidSequencePointsMode)" />
- <_PropertyCacheItems Include="XamarinAndroidVersion=$(XamarinAndroidVersion)" Condition=" '$(UsingAndroidNETSdk)' != 'true' " />
- <_PropertyCacheItems Include="AndroidNETSdkVersion=$(AndroidNETSdkVersion)" Condition=" '$(UsingAndroidNETSdk)' == 'true' " />
+ <_PropertyCacheItems Include="AndroidNETSdkVersion=$(AndroidNETSdkVersion)" />
<_PropertyCacheItems Include="MonoSymbolArchive=$(MonoSymbolArchive)" />
<_PropertyCacheItems Include="AndroidUseLatestPlatformSdk=$(AndroidUseLatestPlatformSdk)" />
<_PropertyCacheItems Include="TargetFrameworkVersion=$(TargetFrameworkVersion)" />
@@ -1374,18 +1351,14 @@ because xbuild doesn't support framework reference assemblies.
- <_RuntimeJar Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(MSBuildThisFileDirectory)\java_runtime.jar
- <_RuntimeDex Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(MSBuildThisFileDirectory)\java_runtime.dex
-
- <_RuntimeJar Condition=" '$(UsingAndroidNETSdk)' == 'True' ">$(MSBuildThisFileDirectory)\java_runtime_net6.jar
- <_RuntimeDex Condition=" '$(UsingAndroidNETSdk)' == 'True' ">$(MSBuildThisFileDirectory)\java_runtime_net6.dex
+ <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_net6.jar
+ <_RuntimeDex>$(MSBuildThisFileDirectory)\java_runtime_net6.dex
- <_AndroidJarAndDexDirectory Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(TargetFrameworkDirectory)
- <_AndroidJarAndDexDirectory Condition=" '$(UsingAndroidNETSdk)' == 'True' ">$(_XATargetFrameworkDirectories)
+ <_AndroidJarAndDexDirectory>$(_XATargetFrameworkDirectories)
@@ -1457,7 +1430,6 @@ because xbuild doesn't support framework reference assemblies.
UseDesignerAssembly="$(AndroidUseDesignerAssembly)"
Deterministic="$(Deterministic)"
ReadSymbols="$(_AndroidLinkAssembliesReadSymbols)"
- UsingAndroidNETSdk="$(UsingAndroidNETSdk)"
/>
@@ -1648,7 +1620,7 @@ because xbuild doesn't support framework reference assemblies.
<_GeneratedAndroidEnvironment Include="__XA_PACKAGE_NAMING_POLICY__=$(AndroidPackageNamingPolicy)" />
<_GeneratedAndroidEnvironment Include="mono.enable_assembly_preload=0" Condition=" '$(AndroidEnablePreloadAssemblies)' != 'True' " />
- <_GeneratedAndroidEnvironment Include="DOTNET_MODIFIABLE_ASSEMBLIES=Debug" Condition=" '$(UsingAndroidNETSdk)' == 'true' and '$(AndroidIncludeDebugSymbols)' == 'true' and '$(AndroidUseInterpreter)' == 'true' " />
+ <_GeneratedAndroidEnvironment Include="DOTNET_MODIFIABLE_ASSEMBLIES=Debug" Condition=" '$(AndroidIncludeDebugSymbols)' == 'true' and '$(AndroidUseInterpreter)' == 'true' " />
@@ -2763,8 +2734,6 @@ because xbuild doesn't support framework reference assemblies.
-
-
-
-
+
<_ResolveSdksDependsOnTargets>ResolveTargetingPackAssets
-
- <_ResolveSdksDependsOnTargets>_GetReferenceAssemblyPaths
-
-
+
<_AndroidApiInfo Include="$(MSBuildThisFileDirectory)..\data\*\AndroidApiInfo.xml" />
<_AndroidApiInfoDirectories Include="@(_AndroidApiInfo->'%(RootDir)%(Directory)')" />
<_ResolveSdksFrameworkRefAssemblyPaths Include="@(Reference->'$([System.String]::Copy('%(RootDir)%(Directory)').TrimEnd('\'))')" Condition=" '%(Reference.FrameworkReferenceName)' != '' " />
-
- <_AndroidApiInfoDirectories Include="$(_XATargetFrameworkDirectories)" />
-
<_AndroidAllowMissingSdkTooling Condition=" '$(_AndroidAllowMissingSdkTooling)' == '' ">False
- <_XATargetFrameworkDirectories Condition=" '$(UsingAndroidNETSdk)' == 'True' ">@(_ResolveSdksFrameworkRefAssemblyPaths->Distinct())
+ <_XATargetFrameworkDirectories>@(_ResolveSdksFrameworkRefAssemblyPaths->Distinct())