[src] Define NET[_TODO] instead of DOTNET[_TODO].
This commit is contained in:
Родитель
1acba86f71
Коммит
53b54fad13
|
@ -46,7 +46,7 @@ namespace CFNetwork {
|
|||
this.responseStream = stream;
|
||||
}
|
||||
|
||||
#if (MONOMAC && XAMCORE_2_0) && !DOTNET
|
||||
#if (MONOMAC && XAMCORE_2_0) && !NET
|
||||
internal
|
||||
#endif
|
||||
protected override bool TryComputeLength (out long length)
|
||||
|
|
|
@ -78,7 +78,7 @@ namespace CFNetwork {
|
|||
CFHTTPAuthentication auth;
|
||||
|
||||
#region implemented abstract members of HttpMessageHandler
|
||||
#if (MONOMAC && XAMCORE_2_0) && !DOTNET
|
||||
#if (MONOMAC && XAMCORE_2_0) && !NET
|
||||
internal
|
||||
#endif
|
||||
protected override async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request,
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
// We need it to be backwards compatible in .NET 5 for the implementations of Compression.[Begin|End]|[Read|Write].
|
||||
//
|
||||
|
||||
#if DOTNET
|
||||
#if NET
|
||||
#nullable enable
|
||||
using System.Diagnostics;
|
||||
|
||||
|
|
|
@ -473,7 +473,7 @@ namespace Foundation {
|
|||
return nsrequest;
|
||||
}
|
||||
|
||||
#if (SYSTEM_NET_HTTP || MONOMAC) && !DOTNET
|
||||
#if (SYSTEM_NET_HTTP || MONOMAC) && !NET
|
||||
internal
|
||||
#endif
|
||||
protected override async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
|
||||
|
@ -935,7 +935,7 @@ namespace Foundation {
|
|||
return content.CopyToAsync (stream, bufferSize, cancellationToken);
|
||||
}
|
||||
|
||||
#if !DOTNET
|
||||
#if !NET
|
||||
internal
|
||||
#endif
|
||||
protected override bool TryComputeLength (out long length)
|
||||
|
|
|
@ -25,7 +25,7 @@ TVOS_DOTNET_BUILD_DIR=$(DOTNET_BUILD_DIR)/tvos
|
|||
|
||||
GENERATOR_FLAGS=-process-enums -core -nologo -nostdlib -noconfig -native-exception-marshalling --ns:ObjCRuntime
|
||||
|
||||
DOTNET_FLAGS=/noconfig /nostdlib+ /deterministic /features:strict /nologo /target:library /debug /unsafe /define:DOTNET /define:DOTNET_TODO \
|
||||
DOTNET_FLAGS=/noconfig /nostdlib+ /deterministic /features:strict /nologo /target:library /debug /unsafe /define:NET /define:NET_TODO \
|
||||
/r:$(DOTNET_BCL_DIR)/System.Buffers.dll \
|
||||
/r:$(DOTNET_BCL_DIR)/System.Collections.Concurrent.dll \
|
||||
/r:$(DOTNET_BCL_DIR)/System.Collections.dll \
|
||||
|
|
|
@ -253,7 +253,7 @@ namespace ObjCRuntime {
|
|||
Registrar = new DynamicRegistrar ();
|
||||
RegisterDelegates (options);
|
||||
Class.Initialize (options);
|
||||
#if !DOTNET
|
||||
#if !NET
|
||||
// This is not needed for .NET 5:
|
||||
// * https://github.com/xamarin/xamarin-macios/issues/7924#issuecomment-588331822
|
||||
// * https://github.com/xamarin/xamarin-macios/issues/7924#issuecomment-589356481
|
||||
|
@ -261,8 +261,8 @@ namespace ObjCRuntime {
|
|||
#endif
|
||||
InitializePlatform (options);
|
||||
|
||||
#if !XAMMAC_SYSTEM_MONO && !DOTNET_TODO
|
||||
// DOTNET_TODO: https://github.com/dotnet/runtime/issues/32543
|
||||
#if !XAMMAC_SYSTEM_MONO && !NET_TODO
|
||||
// NET_TODO: https://github.com/dotnet/runtime/issues/32543
|
||||
UseAutoreleasePoolInThreadPool = true;
|
||||
#endif
|
||||
IsARM64CallingConvention = GetIsARM64CallingConvention (); // Can only be done after Runtime.Arch is set (i.e. InitializePlatform has been called).
|
||||
|
@ -276,8 +276,8 @@ namespace ObjCRuntime {
|
|||
#endif
|
||||
}
|
||||
|
||||
#if !XAMMAC_SYSTEM_MONO && !DOTNET_TODO
|
||||
// DOTNET_TODO: https://github.com/dotnet/runtime/issues/32543
|
||||
#if !XAMMAC_SYSTEM_MONO && !NET_TODO
|
||||
// NET_TODO: https://github.com/dotnet/runtime/issues/32543
|
||||
static bool has_autoreleasepool_in_thread_pool;
|
||||
public static bool UseAutoreleasePoolInThreadPool {
|
||||
get {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if (XAMARIN_APPLETLS || WATCH) && !DOTNET
|
||||
#if (XAMARIN_APPLETLS || WATCH) && !NET
|
||||
#define NATIVE_APPLE_CERTIFICATE
|
||||
#endif
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ namespace System.Net.Http
|
|||
}
|
||||
}
|
||||
|
||||
#if !DOTNET
|
||||
#if !NET
|
||||
internal
|
||||
#endif
|
||||
protected override bool TryComputeLength (out long length)
|
||||
|
|
|
@ -194,7 +194,7 @@ namespace System.Net.Http
|
|||
return req;
|
||||
}
|
||||
|
||||
#if !DOTNET
|
||||
#if !NET
|
||||
internal
|
||||
#endif
|
||||
protected override async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
|
||||
|
@ -384,8 +384,8 @@ namespace System.Net.Http
|
|||
|
||||
void AddCookie (string value, Uri uri, string header)
|
||||
{
|
||||
#if !DOTNET_TODO
|
||||
// DOTNET_TODO: CookieCollection.CookieCutter is internal to mscorlib:
|
||||
#if !NET_TODO
|
||||
// NET_TODO: CookieCollection.CookieCutter is internal to mscorlib:
|
||||
// https://github.com/microsoft/referencesource/blob/a7bd3242bd7732dec4aebb21fbc0f6de61c2545e/System/net/System/Net/cookiecontainer.cs#L632
|
||||
// https://github.com/xamarin/xamarin-macios/issues/8072
|
||||
CookieCollection cookies1 = null;
|
||||
|
|
Загрузка…
Ссылка в новой задаче