Prepare for 3.2.1 (#1775)

* Prepare for 3.2.1 * Fix Windows build?
realm · Sep 27, 2018 · cf5f4f4 · cf5f4f4
1 parent a4e2442
commit cf5f4f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-3.2.1 (TBD)
+3.2.1 (2018-09-27)
 ------------------
 
 ### Bug fixes

diff --git a/RealmAssemblyInfo.cs b/RealmAssemblyInfo.cs
@@ -23,8 +23,8 @@
 [assembly: AssemblyCompany("Realm Inc.")]
 [assembly: AssemblyProduct("Realm C#")]
 
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]

diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
@@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 endif()
 
 if(NOT REALM_PLATFORM)
-  set(REALM_PLATFORM DotNet) 
+  set(REALM_PLATFORM DotNet)
 endif()
 
 include(CompilerFlags)
@@ -184,6 +184,10 @@ if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
 elseif(CMAKE_SYSTEM_NAME MATCHES "^Windows")
   add_definitions(-DWIN32_LEAN_AND_MEAN)
+  add_definitions(
+    /D_DISABLE_EXTENDED_ALIGNED_STORAGE # https://developercommunity.visualstudio.com/comments/279328/view.html
+  )
+
   if(WINDOWS_STORE)
     set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib")
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib")