Skip to content

Commit c13bb36

Browse files
yfakariyayfakariya
committed
Clean up Unity build option.
This commit fix that AotHelper reporting is not enabled in release build.
1 parent 2497fd8 commit c13bb36

100 files changed

Lines changed: 262 additions & 251 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.Unity.Full/CorLibOnlyHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//

‎src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515
<Import Project="..\..\MsgPack.Common.props" />
1616
<PropertyGroup>
17-
<DefineConstants>$(DefineConstants);UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT</DefineConstants>
17+
<DefineConstants>$(DefineConstants);FEATURE_MPCONTRACT;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT</DefineConstants>
1818
<SignAssembly>false</SignAssembly>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)' == 'Release'">

‎src/MsgPack.Unity/MsgPack.Unity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515
<Import Project="..\..\MsgPack.Common.props" />
1616
<PropertyGroup>
17-
<DefineConstants>$(DefineConstants);UNITY_IPHONE;AOT</DefineConstants>
17+
<DefineConstants>$(DefineConstants);FEATURE_MPCONTRACT;UNITY_IPHONE;AOT</DefineConstants>
1818
<SignAssembly>false</SignAssembly>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)' == 'Release'">

‎src/MsgPack/BigEndianBinary.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -23,11 +23,11 @@
2323
#endif
2424

2525
using System;
26-
#if CORE_CLR || UNITY || NETSTANDARD1_1
26+
#if FEATURE_MPCONTRACT
2727
using Contract = MsgPack.MPContract;
2828
#else
2929
using System.Diagnostics.Contracts;
30-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
30+
#endif // FEATURE_MPCONTRACT
3131

3232
namespace MsgPack
3333
{

‎src/MsgPack/CollectionOperation.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -24,11 +24,11 @@
2424

2525
using System;
2626
using System.Collections.Generic;
27-
#if CORE_CLR || UNITY || NETSTANDARD1_1
27+
#if FEATURE_MPCONTRACT
2828
using Contract = MsgPack.MPContract;
2929
#else
3030
using System.Diagnostics.Contracts;
31-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
31+
#endif // FEATURE_MPCONTRACT
3232
using System.Linq;
3333

3434
namespace MsgPack

‎src/MsgPack/EncodingExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -22,10 +22,10 @@
2222
#define UNITY
2323
#endif
2424

25-
#if CORE_CLR || UNITY || NETSTANDARD1_1
25+
#if MPCONTRACT
2626
using Contract = MsgPack.MPContract;
2727
#else
28-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
28+
#endif // MPCONTRACT
2929
using System.Text;
3030
#if FEATURE_TAP
3131
#endif // FEATURE_TAP

‎src/MsgPack/Float32Bits.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -23,11 +23,11 @@
2323
#endif
2424

2525
using System;
26-
#if CORE_CLR || UNITY || NETSTANDARD1_1
26+
#if FEATURE_MPCONTRACT
2727
using Contract = MsgPack.MPContract;
2828
#else
2929
using System.Diagnostics.Contracts;
30-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
30+
#endif // FEATURE_MPCONTRACT
3131
using System.Runtime.InteropServices;
3232

3333
namespace MsgPack

‎src/MsgPack/Float64Bits.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
#endif
2424

2525
using System;
26-
#if CORE_CLR || UNITY || NETSTANDARD1_1
26+
#if FEATURE_MPCONTRACT
2727
using Contract = MsgPack.MPContract;
2828
#else
2929
using System.Diagnostics.Contracts;
30-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
30+
#endif // FEATURE_MPCONTRACT
3131
using System.Runtime.InteropServices;
3232

3333
namespace MsgPack

‎src/MsgPack/MessagePackByteArrayUnpacker.Unpack.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -24,11 +24,11 @@
2424

2525
using System;
2626
using System.Collections.Generic;
27-
#if CORE_CLR || UNITY || NETSTANDARD1_1
27+
#if FEATURE_MPCONTRACT
2828
using Contract = MsgPack.MPContract;
2929
#else
3030
using System.Diagnostics.Contracts;
31-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
31+
#endif // FEATURE_MPCONTRACT
3232
using System.Globalization;
3333
using System.IO;
3434
#if FEATURE_TAP

‎src/MsgPack/MessagePackByteArrayUnpacker.Unpack.tt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#@ template debug="true" hostSpecific="true" language="C#" #>
1+
<#@ template debug="true" hostSpecific="true" language="C#" #>
22
<#@ output extension=".cs" #>
33
<#@ include file=".\MessagePackUnpackerCommon.ttinclude" #>
44
<#@ Assembly Name="System.Core.dll" #>
@@ -35,11 +35,11 @@
3535

3636
using System;
3737
using System.Collections.Generic;
38-
#if CORE_CLR || UNITY || NETSTANDARD1_1
38+
#if FEATURE_MPCONTRACT
3939
using Contract = MsgPack.MPContract;
4040
#else
4141
using System.Diagnostics.Contracts;
42-
#endif // CORE_CLR || UNITY || NETSTANDARD1_1
42+
#endif // FEATURE_MPCONTRACT
4343
using System.Globalization;
4444
using System.IO;
4545
#if FEATURE_TAP
@@ -105,4 +105,4 @@ if ( <#= context.BufferExpression #>.Length - <#= context.OffsetExpression #> <
105105
<#+
106106
this.PopIndent();
107107
}// WriteReadBytes( context, indentLevel, lengthExpression, onFail, isAsync )
108-
#>
108+
#>

0 commit comments

Comments
 (0)