Fix merge issues.

SergeyTeplyakov · Apr 23, 2018 · a14a220 · a14a220
1 parent 66175aa
commit a14a220
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 80 deletions.
diff --git a/...tor.Tests/ClassWithExplicitLayoutTests.cs → ...tor.Tests/ClassWithExplicitLayoutTests.cs b/...tor.Tests/ClassWithExplicitLayoutTests.cs → ...tor.Tests/ClassWithExplicitLayoutTests.cs
diff --git a/src/ObjectLayoutInspector.Tests/ObjectLayoutInspector.Tests.csproj b/src/ObjectLayoutInspector.Tests/ObjectLayoutInspector.Tests.csproj
@@ -8,6 +8,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="NUnit" Version="3.10.1" />

diff --git a/src/ObjectLayoutInspector/ObjectLayoutInspector.Tests/ObjectLayoutInspector.Tests.csproj b/src/ObjectLayoutInspector/ObjectLayoutInspector.Tests/ObjectLayoutInspector.Tests.csproj
diff --git a/src/ObjectLayoutInspector/ObjectLayoutInspector.csproj b/src/ObjectLayoutInspector/ObjectLayoutInspector.csproj
@@ -12,7 +12,7 @@
 
   <PropertyGroup>
     <PackageId>ObjectLayoutInspector</PackageId>
-    <PackageVersion>0.1.0.0</PackageVersion>
+    <PackageVersion>0.1.1.0</PackageVersion>
     <Authors>SergeyTeplyakov</Authors>
     <PackageLicenseUrl>https://github.com/SergeyTeplyakov/ObjectLayoutInspector/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/SergeyTeplyakov/ObjectLayoutInspector</PackageProjectUrl>