Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ public void CreateFactory_CreatesFactoryMethod_KeyedParams_ValueTypes(bool useDy

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData(true)]
#if NETCOREAPP
#if NET
[InlineData(false)]
#endif
public void CreateFactory_CreatesFactoryMethod_KeyedParams_1Injected(bool useDynamicCode)
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Memory/tests/Base64/Base64TestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public static IEnumerable<object[]> BasicDecodingWithExtraWhitespaceShouldBeCoun

private static char[] GetChars(Random r, int i)
{
#if NETCOREAPP
#if NET
return r.GetItems<char>(" \n\t\r", i);
#else
byte[] bytes = new byte[i];
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Numerics.Tensors/tests/Helpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static bool IsEqualWithTolerance(float expected, float actual, float? tol
return null;
}

#if NETCOREAPP
#if NET
public delegate void AssertThrowsAction<T>(TensorSpan<T> span);

// Cannot use standard Assert.Throws() when testing Span - Span and closures don't get along.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal static ObjectRecordDeserializer Create(ClassRecord classRecord, IDeseri
}

object @object =
#if NETCOREAPP
#if NET
RuntimeHelpers.GetUninitializedObject(type);
#else
Runtime.Serialization.FormatterServices.GetUninitializedObject(type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private static SerializationEvents CreateSerializationEvents([DynamicallyAccesse
foreach (MethodInfo method in methods)
{
Action<StreamingContext> onDeserialized =
#if NETCOREAPP
#if NET
method.CreateDelegate<Action<StreamingContext>>(obj);
#else
(Action<StreamingContext>)method.CreateDelegate(typeof(Action<StreamingContext>), obj);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static class SerializationExtensions
public static SerializationException ConvertToSerializationException(this Exception ex)
=> ex is SerializationException serializationException
? serializationException
#if NETCOREAPP
#if NET
: (SerializationException)ExceptionDispatchInfo.SetRemoteStackTrace(
new SerializationException(ex.Message, ex),
ex.StackTrace ?? string.Empty);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal static class SerializationInfoExtensions
private static readonly Action<SerializationInfo, string, object, Type> s_updateValue =
typeof(SerializationInfo)
.GetMethod("UpdateValue", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)!
#if NETCOREAPP
#if NET
.CreateDelegate<Action<SerializationInfo, string, object, Type>>();
#else
.CreateDelegate(typeof(Action<SerializationInfo, string, object, Type>)) as Action<SerializationInfo, string, object, Type>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ public static void IsEqual(this AggregateException @this, AggregateException oth
@this.InnerExceptions.CheckSequenceEquals(other.InnerExceptions, isSamePlatform);
}

#if NETCOREAPP
#if NET
public static void IsEqual(this JsonException? @this, JsonException? other, bool isSamePlatform = true)
{
if (@this is null && other is null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public sealed partial class JsonSchemaExporterTests_SourceGen()
[JsonSerializable(typeof(float))]
[JsonSerializable(typeof(double))]
[JsonSerializable(typeof(decimal))]
#if NETCOREAPP
#if NET
[JsonSerializable(typeof(UInt128))]
[JsonSerializable(typeof(Int128))]
[JsonSerializable(typeof(Half))]
Expand All @@ -42,7 +42,7 @@ public sealed partial class JsonSchemaExporterTests_SourceGen()
[JsonSerializable(typeof(DateTime))]
[JsonSerializable(typeof(DateTimeOffset))]
[JsonSerializable(typeof(TimeSpan))]
#if NETCOREAPP
#if NET
[JsonSerializable(typeof(DateOnly))]
[JsonSerializable(typeof(TimeOnly))]
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/mono/tests/HwIntrinsics/HwIntrinsics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Optimize>True</Optimize>
<DebugType>Full</DebugType>
<OutputPath>bin</OutputPath>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RunAnalyzers>false</RunAnalyzers>
Expand Down
Loading