From 560de53ed1f0980bf99e31767e1e98d7157f4693 Mon Sep 17 00:00:00 2001
From: Max Golovanov <maxgolov@microsoft.com>
Date: Wed, 5 Sep 2018 12:32:22 -0700
Subject: [PATCH] Trying to fix ARM build issue that happens only on
 ARIA-BUILD-02, but not other machines :-/

---
 build-all.bat                            | 1 +
 lib/include/public/Version.hpp           | 6 +++---
 zlib/contrib/vstudio/vc14/zlibvc.vcxproj | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-all.bat b/build-all.bat
index 40d1c75f..d74ee04d 100644
--- a/build-all.bat
+++ b/build-all.bat
@@ -15,6 +15,7 @@ msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win1
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
 
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\vsdevcmd\ext\vcvars.bat" arm
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM
  
\ No newline at end of file
diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp
index bfb2e979..27c94c43 100644
--- a/lib/include/public/Version.hpp
+++ b/lib/include/public/Version.hpp
@@ -2,8 +2,8 @@
 // WARNING: DO NOT MODIFY THIS FILE!
 // Copyright (c) Microsoft. All rights reserved.
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.0.247.1"
-#define BUILD_VERSION 3,0,247,1
+#define BUILD_VERSION_STR "3.0.248.1"
+#define BUILD_VERSION 3,0,248,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include <stdint.h>
@@ -24,7 +24,7 @@ namespace ARIASDK_NS_BEGIN {
 uint64_t const Version =
 	((uint64_t)3 << 48) |
 	((uint64_t)0 << 32) |
-	((uint64_t)247 << 16) |
+	((uint64_t)248 << 16) |
 	((uint64_t)1);
 
 // TODO: [MG] - move declaration of ARIA_SDK_UNUSED to separate include file
diff --git a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
index ab8c13f1..ad9a63df 100644
--- a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+++ b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
@@ -455,7 +455,7 @@ bld_ml32.bat</Command>
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>     
+    <PreBuildEvent>
     </PreBuildEvent>
     <Lib>
       <TargetMachine>MachineARM</TargetMachine>
@@ -613,7 +613,7 @@ bld_ml32.bat</Command>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <DisableSpecificWarnings>4267</DisableSpecificWarnings>
       <ControlFlowGuard>Guard</ControlFlowGuard>