Skip to content

Commit 5544f89

Browse files
yfakariyayfakariya
committed
Replace own compile symbols with standard symbols.
Specifically, NETFX_nn to NETnn
1 parent 044d1bf commit 5544f89

94 files changed

Lines changed: 875 additions & 875 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/MsgPack/EncodingExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ namespace MsgPack
3838
internal static class EncodingExtensions
3939
{
4040
#if FEATURE_POINTER_CONVERSION
41-
#if !NETFX_35 && !UNITY
41+
#if !NET35 && !UNITY
4242
[System.Security.SecuritySafeCritical]
43-
#endif // !NETFX_35 && !UNITY
43+
#endif // !NET35 && !UNITY
4444
public static unsafe bool EncodeString( this Encoder source, char* pChar, int charsLength, byte* pBuffer, int bufferCount, out int charsUsed, out int bytesUsed )
4545
{
4646
bool isCompleted;

‎src/MsgPack/MessagePackObjectDictionary.KeySet.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ partial class MessagePackObjectDictionary
4848
[SuppressMessage( "Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible", Justification = "ICollection implementing dictionary should return ICollection implementing values." )]
4949
#if !UNITY
5050
public sealed partial class KeySet :
51-
#if !NETFX_35
51+
#if !NET35
5252
ISet<MessagePackObject>,
53-
#endif // !NETFX_35
53+
#endif // !NET35
5454
#else
5555
public sealed partial class KeyCollection :
5656
#endif // !UNITY
@@ -219,7 +219,7 @@ bool ICollection<MessagePackObject>.Remove( MessagePackObject item )
219219
}
220220

221221
#if !UNITY
222-
#if !NETFX_35
222+
#if !NET35
223223
bool ISet<MessagePackObject>.Add( MessagePackObject item )
224224
{
225225
throw new NotSupportedException();
@@ -234,7 +234,7 @@ void ISet<MessagePackObject>.IntersectWith( IEnumerable<MessagePackObject> other
234234
{
235235
throw new NotSupportedException();
236236
}
237-
#endif // !NETFX_35
237+
#endif // !NET35
238238

239239
/// <summary>
240240
/// Determines whether this set is proper subset of the specified collection.
@@ -338,7 +338,7 @@ public bool SetEquals( IEnumerable<MessagePackObject> other )
338338
return SetOperation.SetEquals( this, other );
339339
}
340340

341-
#if !NETFX_35
341+
#if !NET35
342342
void ISet<MessagePackObject>.SymmetricExceptWith( IEnumerable<MessagePackObject> other )
343343
{
344344
throw new NotSupportedException();
@@ -348,7 +348,7 @@ void ISet<MessagePackObject>.UnionWith( IEnumerable<MessagePackObject> other )
348348
{
349349
throw new NotSupportedException();
350350
}
351-
#endif // !NETFX_35
351+
#endif // !NET35
352352
#endif // !UNITY
353353

354354
/// <summary>

‎src/MsgPack/MessagePackString.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ namespace MsgPack
4646
#if !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3
4747
[Serializable]
4848
#endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3
49-
#if !NETFX_35 && !UNITY
49+
#if !NET35 && !UNITY
5050
[SecuritySafeCritical]
51-
#endif // !NETFX_35 && !UNITY
51+
#endif // !NET35 && !UNITY
5252
[DebuggerDisplay( "{DebuggerDisplayString}" )]
5353
[DebuggerTypeProxy( typeof( MessagePackStringDebuggerProxy ) )]
5454
internal sealed class MessagePackString
@@ -316,9 +316,9 @@ internal static bool IsFastEqualsDisabled
316316
}
317317
#endif
318318

319-
#if !NETFX_35 && !UNITY
319+
#if !NET35 && !UNITY
320320
[SecuritySafeCritical]
321-
#endif // !NETFX_35 && !UNITY
321+
#endif // !NET35 && !UNITY
322322
private static bool UnsafeFastEquals( byte[] x, byte[] y )
323323
{
324324
#if DEBUG

‎src/MsgPack/Properties/AssemblyInfo.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
[assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library for" +
2727
#if NET4_5
2828
".NET Framework 4.5"
29-
#elif NETFX_35
29+
#elif NET35
3030
".NET Framework 3.5"
3131
#elif WINDOWS_UWP
3232
"UWP"
@@ -51,19 +51,19 @@
5151
[assembly: AssemblyFileVersion( "0.9.2259.1047" )]
5252

5353
#if !NETSTANDARD1_1 && !NETSTANDARD1_3
54-
#if !NETFX_35
54+
#if !NET35
5555
[assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )]
56-
#endif // !NETFX_35
56+
#endif // !NET35
5757
[assembly: AllowPartiallyTrustedCallers]
5858
#endif
5959

6060
#if DEBUG || PERFORMANCE_TEST
6161
[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
6262
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
63-
#if NETFX_35
63+
#if NET35
6464
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
6565
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
66-
#endif // NETFX_35
66+
#endif // NET35
6767
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.BclExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
6868
#if XAMARIN
6969
#if __ANDROID__

‎src/MsgPack/ReflectionAbstractions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public static ConstructorInfo GetRuntimeConstructor( this Type source, Type[] pa
264264
#endif // NETSTANDARD1_1 || NETSTANDARD1_3
265265
}
266266

267-
#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
267+
#if NET35 || NET40 || SILVERLIGHT || UNITY
268268
public static Delegate CreateDelegate( this MethodInfo source, Type delegateType )
269269
{
270270
return Delegate.CreateDelegate( delegateType, source );
@@ -275,7 +275,7 @@ public static Delegate CreateDelegate( this MethodInfo source, Type delegateType
275275
return Delegate.CreateDelegate( delegateType, target, source );
276276
}
277277

278-
#endif // NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
278+
#endif // NET35 || NET40 || SILVERLIGHT || UNITY
279279

280280
#if NETSTANDARD1_1 || NETSTANDARD1_3
281281
public static MethodInfo GetMethod( this Type source, string name )
@@ -408,12 +408,12 @@ public static T GetCustomAttribute<T>( this MemberInfo source )
408408
return Attribute.GetCustomAttribute( source, typeof( T ) ) as T;
409409
}
410410

411-
#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
411+
#if NET35 || NET40 || SILVERLIGHT || UNITY
412412
public static bool IsDefined( this MemberInfo source, Type attributeType )
413413
{
414414
return Attribute.IsDefined( source, attributeType );
415415
}
416-
#endif // NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
416+
#endif // NET35 || NET40 || SILVERLIGHT || UNITY
417417

418418
#if !SILVERLIGHT
419419
public static Type GetAttributeType( this CustomAttributeData source )
@@ -436,14 +436,14 @@ public static Type GetAttributeType( this Attribute source )
436436

437437
public static string GetCultureName( this AssemblyName source )
438438
{
439-
#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
439+
#if NET35 || NET40 || SILVERLIGHT || UNITY
440440
return source.CultureInfo == null ? null : source.CultureInfo.Name;
441441
#else
442442
return source.CultureName;
443443
#endif
444444
}
445445

446-
#if NETFX_35 || UNITY
446+
#if NET35 || UNITY
447447
public static IEnumerable<CustomAttributeData> GetCustomAttributesData( this MemberInfo source )
448448
{
449449
return CustomAttributeData.GetCustomAttributes( source );
@@ -453,7 +453,7 @@ public static IEnumerable<CustomAttributeData> GetCustomAttributesData( this Par
453453
{
454454
return CustomAttributeData.GetCustomAttributes( source );
455455
}
456-
#endif // NETFX_35 || UNITY
456+
#endif // NET35 || UNITY
457457

458458
#if NETSTANDARD1_1 || NETSTANDARD1_3
459459
public static IEnumerable<CustomAttributeData> GetCustomAttributesData( this ParameterInfo source )
@@ -532,7 +532,7 @@ public KeyValuePair<Type, object> GetTypedValue()
532532

533533
public static bool GetHasDefaultValue( this ParameterInfo source )
534534
{
535-
#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY
535+
#if NET35 || NET40 || SILVERLIGHT || UNITY
536536
return source.DefaultValue != DBNull.Value;
537537
#else
538538
return source.HasDefaultValue;

‎src/MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ internal interface ISerializerCodeGenerationContext
3333
/// Generates codes for this context.
3434
/// </summary>
3535
/// <returns>A <see cref="SerializerCodeGenerationResult"/> collection which correspond to genereated codes.</returns>
36-
#if !NETFX_35
36+
#if !NET35
3737
[SecuritySafeCritical]
38-
#endif // !NETFX_35
38+
#endif // !NET35
3939
IEnumerable<SerializerCodeGenerationResult> Generate();
4040

4141
/// <summary>
@@ -46,9 +46,9 @@ internal interface ISerializerCodeGenerationContext
4646
/// </value>
4747
SerializationContext SerializationContext
4848
{
49-
#if !NETFX_35
49+
#if !NET35
5050
[SecuritySafeCritical]
51-
#endif // !NETFX_35
51+
#endif // !NET35
5252
get;
5353
}
5454
}

‎src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.Collection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ out bool isAddItemRequired
172172
isAddItemRequired = false;
173173
break;
174174
}
175-
#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
175+
#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
176176
case CollectionDetailedKind.GenericReadOnlyDictionary:
177177
{
178178
isUnpackFromRequired = false;
@@ -186,7 +186,7 @@ out bool isAddItemRequired
186186
isAddItemRequired = true;
187187
break;
188188
}
189-
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
189+
#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
190190
default:
191191
{
192192
isUnpackFromRequired = false;

‎src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.CommonConstructs.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,21 +1962,21 @@ private TConstruct EmitGetEqualityComparer( TContext context )
19621962
case CollectionDetailedKind.GenericCollection:
19631963
case CollectionDetailedKind.GenericEnumerable:
19641964
case CollectionDetailedKind.GenericList:
1965-
#if !NETFX_35
1965+
#if !NET35
19661966
case CollectionDetailedKind.GenericSet:
1967-
#if !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
1967+
#if !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
19681968
case CollectionDetailedKind.GenericReadOnlyCollection:
19691969
case CollectionDetailedKind.GenericReadOnlyList:
1970-
#endif // !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
1971-
#endif // !NETFX_35
1970+
#endif // !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
1971+
#endif // !NET35
19721972
{
19731973
comparisonType = this.CollectionTraits.ElementType;
19741974
break;
19751975
}
19761976
case CollectionDetailedKind.GenericDictionary:
1977-
#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
1977+
#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
19781978
case CollectionDetailedKind.GenericReadOnlyDictionary:
1979-
#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
1979+
#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
19801980
{
19811981
comparisonType = this.CollectionTraits.ElementType.GetGenericArguments()[ 0 ];
19821982
break;
@@ -2255,7 +2255,7 @@ var instruction in
22552255
}
22562256
break;
22572257
}
2258-
#if !WINDOWS_PHONE && !NETFX_35
2258+
#if !WINDOWS_PHONE && !NET35
22592259
case PolymorphismSchemaChildrenType.TupleItems:
22602260
{
22612261
if ( schema.ChildSchemaList.Count == 0 )
@@ -2326,7 +2326,7 @@ var instruction in
23262326
);
23272327
break;
23282328
}
2329-
#endif // !WINDOWS_PHONE && !NETFX_35
2329+
#endif // !WINDOWS_PHONE && !NET35
23302330
default:
23312331
{
23322332
foreach ( var instruction in

‎src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,20 @@ private static Type DetermineBaseClass( Type targetType, CollectionTraits traits
8484
return typeof( EnumerableMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType );
8585
}
8686
case CollectionDetailedKind.GenericCollection:
87-
#if !NETFX_35
87+
#if !NET35
8888
case CollectionDetailedKind.GenericSet:
89-
#endif // !NETFX_35
89+
#endif // !NET35
9090
case CollectionDetailedKind.GenericList:
9191
{
9292
return typeof( CollectionMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType );
9393
}
94-
#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
94+
#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
9595
case CollectionDetailedKind.GenericReadOnlyCollection:
9696
case CollectionDetailedKind.GenericReadOnlyList:
9797
{
9898
return typeof( ReadOnlyCollectionMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType );
9999
}
100-
#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
100+
#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
101101
case CollectionDetailedKind.GenericDictionary:
102102
{
103103
var keyValuePairGenericArguments = traits.ElementType.GetGenericArguments();
@@ -108,7 +108,7 @@ private static Type DetermineBaseClass( Type targetType, CollectionTraits traits
108108
keyValuePairGenericArguments[ 1 ]
109109
);
110110
}
111-
#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
111+
#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
112112
case CollectionDetailedKind.GenericReadOnlyDictionary:
113113
{
114114
var keyValuePairGenericArguments = traits.ElementType.GetGenericArguments();
@@ -119,7 +119,7 @@ keyValuePairGenericArguments[ 1 ]
119119
keyValuePairGenericArguments[ 1 ]
120120
);
121121
}
122-
#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE )
122+
#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE )
123123
case CollectionDetailedKind.NonGenericEnumerable:
124124
{
125125
return typeof( NonGenericEnumerableMessagePackSerializer<> ).MakeGenericType( targetType );
@@ -266,7 +266,7 @@ protected void BuildSerializer( TContext context, Type concreteType, Polymorphis
266266
targetInfo = null;
267267
this.BuildNullableSerializer( context, nullableUnderlyingType );
268268
}
269-
#if !NETFX_35
269+
#if !NET35
270270
else if ( TupleItems.IsTuple( this.TargetType ) )
271271
{
272272
this.BuildTupleSerializer( context, ( schema ?? PolymorphismSchema.Default ).ChildSchemaList, out targetInfo );

‎src/MsgPack/Serialization/CodeDomSerializers/CodeDomContext.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ protected override void ResetCore( Type targetType, Type baseClass )
285285
this.CollectionToBeAdded = CodeDomConstruct.Parameter( targetTypeDefinition, "collection" );
286286
this.ItemToAdd = CodeDomConstruct.Parameter( traits.ElementType, "item" );
287287
if ( traits.DetailedCollectionType == CollectionDetailedKind.GenericDictionary
288-
#if !NETFX_35 && !NETFX_40
288+
#if !NET35 && !NET40
289289
|| traits.DetailedCollectionType == CollectionDetailedKind.GenericReadOnlyDictionary
290-
#endif // !NETFX_35 && !NETFX_40
290+
#endif // !NET35 && !NET40
291291
)
292292
{
293293
this.KeyToAdd = CodeDomConstruct.Parameter( traits.ElementType.GetGenericArguments()[ 0 ], "key" );
@@ -629,9 +629,9 @@ public override CodeDomConstruct DefineUnpackedItemParameterInSetValueMethods( T
629629
/// Generates codes for this context.
630630
/// </summary>
631631
/// <returns>A <see cref="SerializerCodeGenerationResult"/> collection which correspond to genereated codes.</returns>
632-
#if !NETFX_35
632+
#if !NET35
633633
[SecuritySafeCritical]
634-
#endif // !NETFX_35
634+
#endif // !NET35
635635
public IEnumerable<SerializerCodeGenerationResult> Generate()
636636
{
637637
Contract.Assert( this._declaringTypes != null, "_declaringTypes != null" );

0 commit comments

Comments
 (0)