diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2b363aeffed..4012d12f3b5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -27,7 +27,6 @@ /eng @jonathanpeppers @pjcollins @jonpryor -/src/OpenTK-1.0 @radekdoulik @jonpryor /src/Mono.Android.Export @jonpryor /src/r8 @jonathanpeppers @jonpryor /src/Xamarin.Android.Build.Tasks @dellis1972 @jonathanpeppers diff --git a/Configuration.props b/Configuration.props index 29fd92a437d..1e93cb5ac5d 100644 --- a/Configuration.props +++ b/Configuration.props @@ -98,7 +98,6 @@ $(MonoRequiredMinimumVersion) False True - $(MSBuildThisFileDirectory)external\opentk $(MSBuildThisFileDirectory)external\sqlite $(MSBuildThisFileDirectory)external\libunwind $(BootstrapOutputDirectory)\libunwind @@ -143,7 +142,6 @@ $([System.IO.Path]::GetFullPath ('$(LibUnwindSourceDirectory)')) $([System.IO.Path]::GetFullPath ('$(LibUnwindGeneratedHeadersDirectory)')) $([System.IO.Path]::GetFullPath ('$(LZ4SourceDirectory)')) - $([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)')) net8.0 diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 0a63d3bfcf0..2101dec82b6 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -80,8 +80,6 @@ <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.dll" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.pdb" /> - <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.dll" /> - <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.pdb" /> <_FrameworkFiles Include="@(MonoFacadeAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" /> <_FrameworkFiles Include="@(MonoFacadeAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" /> <_FrameworkFiles Include="@(MonoProfileAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" /> @@ -96,7 +94,6 @@ <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\System.EnterpriseServices.pdb" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.dll" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.pdb" /> - <_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.xml" /> <_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.xml" /> diff --git a/src/OpenTK-1.0/GlobalAssemblyInfo.cs b/src/OpenTK-1.0/GlobalAssemblyInfo.cs deleted file mode 100644 index 670ac9d7f0c..00000000000 --- a/src/OpenTK-1.0/GlobalAssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// This file is auto-generated through Source/Build.Tasks/GenerateAssemblyInfo.cs. -// Do not edit by hand! - -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006 - 2010 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -#if OPENTK_0_9 -[assembly: AssemblyVersion("0.9.9.3")] -[assembly: AssemblyFileVersion("0.9.9.3")] -#elif OPENTK_1_0 -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.278.44921")] -#endif diff --git a/src/OpenTK-1.0/OpenTK.csproj b/src/OpenTK-1.0/OpenTK.csproj deleted file mode 100644 index 8bb80733e8e..00000000000 --- a/src/OpenTK-1.0/OpenTK.csproj +++ /dev/null @@ -1,544 +0,0 @@ - - - - OpenTK-1.0 - 3001,3002,3003,3005,3006,3021,3014,0618,1591,0414,0169,0419,1570,1572,1573,1635 - true - $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\ - $(OutputPath)$(AssemblyName).xml - false - false - - - - - Audio\AudioCapture.cs - - - Audio\AudioContext.cs - - - Audio\AudioContextException.cs - - - Audio\AudioDeviceEnumerator.cs - - - Audio\AudioDeviceErrorChecker.cs - - - Audio\AudioDeviceException.cs - - - Audio\AudioException.cs - - - Audio\AudioValueException.cs - - - Audio\OpenAL\AL\AL.cs - - - Audio\OpenAL\AL\ALEnums.cs - - - Audio\OpenAL\Alc\Alc.cs - - - Audio\OpenAL\Alc\AlcEnums.cs - - - Audio\OpenAL\AL\EffectsExtension.cs - - - Audio\OpenAL\AL\EffectsExtensionEnums.cs - - - Audio\OpenAL\AL\EffectsExtensionPresets.cs - - - Audio\OpenAL\AL\XRamExtension.cs - - - AutoGeneratedAttribute.cs - - - BindingsBase.cs - - - BlittableValueType.cs - - - Compute\CL10\CL.cs - - - Compute\CL10\CLHelper.cs - - - Compute\CL10\Core.cs - - - Compute\CL10\Delegates.cs - - - Compute\CL10\Enums.cs - - - Compute\CL10\ErrorHelper.cs - - - Compute\CL10\ImageFormat.cs - - - Compute\CLHelper.cs - - - Compute\CommandQueue.cs - - - Compute\ComputeContext.cs - - - Compute\Configuration.cs - - - Compute\Device.cs - - - Compute\Enums.cs - - - Compute\Event.cs - - - Compute\Kernel.cs - - - Compute\Memory.cs - - - Compute\Platform.cs - - - Compute\Profiler.cs - - - Compute\Program.cs - - - Compute\Sampler.cs - - - Compute\Structs.cs - - - Configuration.cs - - - ContextHandle.cs - - - DisplayDevice.cs - - - DisplayIndex.cs - - - DisplayResolution.cs - - - Exceptions.cs - - - FrameEventArgs.cs - - - GameWindowFlags.cs - - - Graphics\Color4.cs - - - Graphics\ColorFormat.cs - - - Graphics\ES10.Android\Core.cs - - - Graphics\ES10.Android\Delegates.cs - - - Graphics\ES10.Android\Enums.cs - - - Graphics\ES10.Android\ES.cs - - - Graphics\ES10.Android\ES.Obsolete.cs - - - Graphics\ES10.Android\Helper.cs - - - Graphics\ES10\ErrorHelper.cs - - - Graphics\ES11.Android\Core.cs - - - Graphics\ES11.Android\Delegates.cs - - - Graphics\ES11.Android\Enums.cs - - - Graphics\ES11.Android\ES.cs - - - Graphics\ES11.Android\ES.Obsolete.cs - - - Graphics\ES11.Android\Helper.cs - - - Graphics\ES11\ErrorHelper.cs - - - Graphics\ES20.Android\Core.cs - - - Graphics\ES20.Android\Delegates.cs - - - Graphics\ES20.Android\Enums.cs - - - Graphics\ES20.Android\ES.cs - - - Graphics\ES20.Android\ES.Obsolete.cs - - - Graphics\ES20.Android\Helper.cs - - - Graphics\ES20\ErrorHelper.cs - - - Graphics\ES30.Android\Core.cs - - - Graphics\ES30.Android\Delegates.cs - - - Graphics\ES30.Android\Enums.cs - - - Graphics\ES30.Android\ES.cs - - - Graphics\ES30.Android\ES.Obsolete.cs - - - Graphics\ES30.Android\Helper.cs - - - Graphics\ES31.Android\Core.cs - - - Graphics\ES31.Android\Delegates.cs - - - Graphics\ES31.Android\Enums.cs - - - Graphics\ES31.Android\ES.cs - - - Graphics\ES31.Android\ES.Obsolete.cs - - - Graphics\ES31.Android\Helper.cs - - - Graphics\GraphicsBindingsBase.cs - - - Graphics\GraphicsContextBase.cs - - - Graphics\GraphicsContext.cs - - - Graphics\GraphicsContextException.cs - - - Graphics\GraphicsContextFlags.cs - - - Graphics\GraphicsContextMissingException.cs - - - Graphics\GraphicsContextVersion.cs - - - Graphics\GraphicsErrorException.cs - - - Graphics\GraphicsExceptions.cs - - - Graphics\GraphicsMode.cs - - - Graphics\GraphicsModeException.cs - - - Graphics\IGraphicsContext.cs - - - Graphics\IGraphicsMode.cs - - - IGameWindow.cs - - - INativeWindow.cs - - - Input\ButtonState.cs - - - Input\GamePad.cs - - - Input\GamePadState.cs - - - Input\IInputDevice.cs - - - Input\IInputDriver.cs - - - Input\IJoystickDriver.cs - - - Input\IKeyboardDriver2.cs - - - Input\IKeyboardDriver.cs - - - Input\IMouseDriver2.cs - - - Input\IMouseDriver.cs - - - Input\JoystickDevice.cs - - - Input\Keyboard.cs - - - Input\KeyboardDevice.cs - - - Input\KeyboardKeyEventArgs.cs - - - Input\KeyboardState.cs - - - Input\Key.cs - - - Input\MouseButton.cs - - - Input\Mouse.cs - - - Input\MouseDevice.cs - - - Input\MouseState.cs - - - KeyPressEventArgs.cs - - - Math\BezierCurve.cs - - - Math\BezierCurveCubic.cs - - - Math\BezierCurveQuadric.cs - - - Math\Box2.cs - - - Math\Functions.cs - - - Math\Half.cs - - - Math\MathHelper.cs - - - Math\Matrix2.cs - - - Math\Matrix3.cs - - - Math\Matrix3d.cs - - - Math\Matrix4.cs - - - Math\Matrix4d.cs - - - Math\Point.cs - - - Math\Quaternion.cs - - - Math\Quaterniond.cs - - - Math\Rectangle.cs - - - Math\Size.cs - - - Math\Vector2.cs - - - Math\Vector2d.cs - - - Math\Vector2h.cs - - - Math\Vector3.cs - - - Math\Vector3d.cs - - - Math\Vector3h.cs - - - Math\Vector4.cs - - - Math\Vector4d.cs - - - Math\Vector4h.cs - - - Minimal.cs - - - NativeWindow.cs - - - Platform\Android\1.0\AndroidDisplayDeviceDriver.cs - - - Platform\Android\1.0\AndroidFactory.cs - - - Platform\Android\1.0\EglAndroidPlatformFactory.cs - - - Platform\Android\1.0\Enums.cs - - - Platform\Android\AndroidGameView.cs - - - Platform\Android\AndroidGraphicsContext.cs - - - Platform\Android\AndroidGraphicsMode.cs - - - Platform\Android\GameViewBase.cs - - - Platform\Android\GLCalls.cs - - - Platform\DesktopGraphicsContext.cs - - - Platform\Dummy\DummyGLContext.cs - - - Platform\Dummy\DummyWindowInfo.cs - - - Platform\Egl\EglContext.cs - - - Platform\Egl\Egl.cs - - - Platform\Egl\EglGraphicsMode.cs - - - Platform\Egl\EglWindowInfo.cs - - - Platform\EmbeddedGraphicsContext.cs - - - Platform\Factory.cs - - - Platform\IDisplayDeviceDriver.cs - - - Platform\INativeGLWindow.cs - - - Platform\IPlatformFactory.cs - - - Platform\IWindowInfo.cs - - - Platform\PlatformException.cs - - - Platform\Utilities.cs - - - Properties\AssemblyInfo.cs - - - Toolkit.cs - - - WindowBorder.cs - - - WindowState.cs - - - - - MONODROID;MINIMAL;MOBILE;OPENTK_1;OPENTK_1_0 - - diff --git a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg index dbebe3a85bc..9b16fefd6cf 100644 --- a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg +++ b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg @@ -10,10 +10,6 @@ -keep class mono.android.** { *; (...); } -keep class mono.java.** { *; (...); } -keep class mono.javax.** { *; (...); } --keep class opentk.platform.android.AndroidGameView { *; (...); } --keep class opentk.GameViewBase { *; (...); } --keep class opentk_1_0.platform.android.AndroidGameView { *; (...); } --keep class opentk_1_0.GameViewBase { *; (...); } -keep class net.dot.jni.ManagedPeer { *; (...); } -keep class xamarin.android.net.ServerCertificateCustomValidator_TrustManager { *; (...); } -keep class xamarin.android.net.ServerCertificateCustomValidator_TrustManager_FakeSSLSession { *; (...); } diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs index c0f7f0432ce..1bb04982727 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs @@ -104,11 +104,6 @@ public override bool RunTask () continue; pkgmgr.WriteLine ("\t\t\"" + Path.GetFileName (assembly.ItemSpec) + "\","); } - foreach (var assembly in MonoAndroidHelper.GetFrameworkAssembliesToTreatAsUserAssemblies (ResolvedAssemblies)) { - if (string.Compare (Path.GetFileName (assembly.ItemSpec), mainFileName, StringComparison.OrdinalIgnoreCase) == 0) - continue; - pkgmgr.WriteLine ("\t\t\"" + Path.GetFileName (assembly.ItemSpec) + "\","); - } // Write the assembly dependencies pkgmgr.WriteLine ("\t};"); diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Linker.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Linker.cs index 3a2ba68f765..3d13492aec7 100644 --- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Linker.cs +++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Linker.cs @@ -18,12 +18,6 @@ public partial class MonoAndroidHelper "Mono.Data.Sqlite.dll", "Mono.Posix.dll", }; - internal static readonly HashSet FrameworkAssembliesToTreatAsUserAssemblies = new HashSet (StringComparer.OrdinalIgnoreCase) { - "OpenTK-1.0.dll", - "Mono.Android.Support.v13.dll", - "Mono.Android.Support.v4.dll", - "Xamarin.Android.NUnitLite.dll", - }; public static bool IsFrameworkAssembly (string assembly) { @@ -33,14 +27,6 @@ public static bool IsFrameworkAssembly (string assembly) public static bool IsFrameworkAssembly (string assembly, bool checkSdkPath) { if (IsSharedRuntimeAssembly (assembly)) { -#if MSBUILD - bool treatAsUser = FrameworkAssembliesToTreatAsUserAssemblies.Contains (Path.GetFileName (assembly)); - // Framework assemblies don't come from outside the SDK Path; - // user assemblies do - if (checkSdkPath && treatAsUser && TargetFrameworkDirectories != null) { - return ExistsInFrameworkPath (assembly); - } -#endif return true; } return TargetFrameworkDirectories == null || !checkSdkPath ? false : ExistsInFrameworkPath (assembly); diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs index cb7f516ddab..b4daa6d8bc0 100644 --- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs +++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs @@ -415,17 +415,6 @@ public static ZipArchive ReadZipFile (string filename) } #if MSBUILD - internal static IEnumerable GetFrameworkAssembliesToTreatAsUserAssemblies (ITaskItem[] resolvedAssemblies) - { - var ret = new List (); - foreach (ITaskItem item in resolvedAssemblies) { - if (FrameworkAssembliesToTreatAsUserAssemblies.Contains (Path.GetFileName (item.ItemSpec))) - ret.Add (item); - } - - return ret; - } - public static bool SaveMapFile (IBuildEngine4 engine, string mapFile, Dictionary map) { engine?.RegisterTaskObjectAssemblyLocal (mapFile, map, RegisteredTaskObjectLifetime.Build);