xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[NET 6 Attribute Conversion] OpenGLES (#14010) 

* Remove existing attributes

* Attribute Conversion

* Reverting changes to OpenGLES/EAGLEnums.cs

* reverting files with unneccessary changes

Co-authored-by: tj_devel709 <antlambe@microsoft.com>
This commit is contained in:
TJ Lambert 2022-02-02 11:47:39 -06:00 коммит произвёл GitHub
Родитель 91a81a5a4f
Коммит 6cf58f6345
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 30 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
src/OpenGLES/EAGLConsts.cs
Просмотреть файл

@ -14,8 +14,13 @@ using ObjCRuntime;
namespace OpenGLES { namespace OpenGLES {
#if NET #if NET
[UnsupportedOSPlatform ("ios12.0")]
[UnsupportedOSPlatform ("tvos12.0")] [UnsupportedOSPlatform ("tvos12.0")]
[UnsupportedOSPlatform ("ios12.0")]
#if TVOS
[Obsolete ("Starting with tvos12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else #else
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")] [Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")] [Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]
@ -35,8 +40,13 @@ namespace OpenGLES {
} }
#if NET #if NET
[UnsupportedOSPlatform ("ios12.0")]
[UnsupportedOSPlatform ("tvos12.0")] [UnsupportedOSPlatform ("tvos12.0")]
[UnsupportedOSPlatform ("ios12.0")]
#if TVOS
[Obsolete ("Starting with tvos12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else #else
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")] [Deprecated (PlatformName.iOS, 12,0, message: "Use 'Metal' instead.")]
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")] [Deprecated (PlatformName.TvOS, 12,0, message: "Use 'Metal' instead.")]

19
src/OpenGLES/EAGLContext.cs
Просмотреть файл

@ -22,7 +22,17 @@ namespace OpenGLES
} }
#endif #endif
#if !NET #if NET
[SupportedOSPlatform ("ios10.0")]
[SupportedOSPlatform ("tvos10.0")]
[UnsupportedOSPlatform ("tvos12.0")]
[UnsupportedOSPlatform ("ios12.0")]
#if TVOS
[Obsolete ("Starting with tvos12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else
[iOS (10,0)] [iOS (10,0)]
[TV (10,0)] [TV (10,0)]
#endif #endif
@ -34,6 +44,13 @@ namespace OpenGLES
#if NET #if NET
[SupportedOSPlatform ("ios10.3")] [SupportedOSPlatform ("ios10.3")]
[SupportedOSPlatform ("tvos10.2")] [SupportedOSPlatform ("tvos10.2")]
[UnsupportedOSPlatform ("tvos12.0")]
[UnsupportedOSPlatform ("ios12.0")]
#if TVOS
[Obsolete ("Starting with tvos12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios12.0 use 'Metal' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else #else
[iOS (10,3)] [iOS (10,3)]
[TV (10,2)] [TV (10,2)]