diff --git a/.gitignore b/.gitignore
index 051f3b8a38a..a489fe62613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,7 @@ platform/wp8/*/obj/*
platform/wp8/bin/*
platform/wp8/ipch/*
platform/uwp/*/obj/*
+platform/uwp/platform
platform/uwp/bin/*
platform/uwp/ipch/*
platform/uwp/RhoRuntimeInvoker/bin/*
diff --git a/Rakefile b/Rakefile
index 07607762e36..7536131f1cb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4237,18 +4237,19 @@ namespace "run" do
end
oldDir = File.join( $startdir, "platform/win32/RhoSimulator" )
- newDir = File.join( $startdir, "platform/win32/RhoSimulatorRunnable" )
+ newDir = oldDir
+ #newDir = File.join( $startdir, "platform/win32/RhoSimulatorRunnable" )
- rm_rf newDir if Dir.exist?(newDir)
- FileUtils.mkpath newDir
+ #rm_rf newDir if Dir.exist?(newDir)
+ #FileUtils.mkpath newDir
- cp_r File.join(oldDir, "."), newDir
+ #cp_r File.join(oldDir, "."), newDir
qtdir = ENV['QTDIR']
if !qtdir.nil?
cp File.join(qtdir, "bin/Qt5Core.dll"), newDir
+ args << "-remote-debugging-port=9090"
end
- args << "-remote-debugging-port=9090"
cmd = File.join(newDir, 'rhosimulator.exe')
elsif RUBY_PLATFORM =~ /darwin/
diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj
index fdf6520adc5..2b7198179c4 100644
--- a/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj
+++ b/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj
index ff86a02dbf2..7245ea165e3 100644
--- a/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj
+++ b/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj
index ecb6782c207..13dba4dbc0d 100644
--- a/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj
+++ b/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj
index edfe476173e..790679a49a8 100644
--- a/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj
+++ b/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
@@ -151,7 +151,6 @@
ole32.lib;%(IgnoreSpecificDefaultLibraries)
true
-
diff --git a/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj b/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj
index 11e0dedc873..61acd462fda 100644
--- a/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj
+++ b/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj b/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj
index e55fb108f34..7a992ce1ed5 100644
--- a/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj
+++ b/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/lib/extensions/digest/ext/uwp/digest.vcxproj b/lib/extensions/digest/ext/uwp/digest.vcxproj
index 734c56e0495..32e9bb3bd60 100644
--- a/lib/extensions/digest/ext/uwp/digest.vcxproj
+++ b/lib/extensions/digest/ext/uwp/digest.vcxproj
@@ -26,7 +26,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/platform/shared/ruby/io.c b/platform/shared/ruby/io.c
index ff79eafd522..fe113dcd201 100644
--- a/platform/shared/ruby/io.c
+++ b/platform/shared/ruby/io.c
@@ -284,7 +284,7 @@ rb_fix_detect_o_cloexec(int fd)
int
rb_cloexec_open(const char *pathname, int flags, mode_t mode)
{
- int ret;
+ int ret = 0;
static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
#ifdef O_CLOEXEC
@@ -5482,7 +5482,7 @@ rb_sysopen_internal(struct sysopen_struct *data)
static int
rb_sysopen(VALUE fname, int oflags, mode_t perm)
{
- int fd;
+ int fd = 0;
struct sysopen_struct data;
data.fname = rb_str_encode_ospath(fname);
diff --git a/platform/shared/ruby/uwp/win32/win32.c b/platform/shared/ruby/uwp/win32/win32.c
index e390d56a8c8..9f692e1b508 100644
--- a/platform/shared/ruby/uwp/win32/win32.c
+++ b/platform/shared/ruby/uwp/win32/win32.c
@@ -49,15 +49,10 @@
#include
#include
#include "../../../../uwp/rhoruntime/common/RhodesHelperWP8.h"
-//#define rb_w32_wopen _wopen
-
#if _MSC_VER >= 1400
#include
#include
#endif
-#ifdef __MINGW32__
-#include
-#endif
#include "uwp.h"
#include "win32/dir.h"
@@ -73,7 +68,6 @@
#include
#include
-
#define isdirsep(x) ((x) == '/' || (x) == '\\')
#include "logging/RhoLog.h"
@@ -135,7 +129,6 @@ int rb_w32_reparse_symlink_p(const WCHAR *path);
#include "../posixnames.h"
-
static struct ChildRecord *CreateChild(const WCHAR *, const WCHAR *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE, DWORD);
static int has_redirection(const char *, UINT);
int rb_w32_wait_events(HANDLE *events, int num, DWORD timeout);
@@ -144,6 +137,7 @@ static int wstati64(const WCHAR *path, struct stati64 *st);
static int wlstati64(const WCHAR *path, struct stati64 *st);
VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
int ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc);
+static FARPROC get_proc_address(const char *module, const char *func, HANDLE *mh);
#define RUBY_CRITICAL(expr) do { expr; } while (0)
@@ -494,15 +488,15 @@ regulate_path(WCHAR *path)
static FARPROC
get_proc_address(const char *module, const char *func, HANDLE *mh)
{
- HANDLE h;
+ HMODULE h = 0;
FARPROC ptr;
if (mh)
- h = LoadLibrary(module);
+ h = LoadLibraryA(module);
else
- h = GetModuleHandle(module);
- if (!h)
- return NULL;
+ h = GetModuleHandleA(module);
+
+ if (!h) return NULL;
ptr = GetProcAddress(h, func);
if (mh) {
@@ -805,14 +799,12 @@ static int w32_cmdvector(const WCHAR *, char ***, UINT, rb_encoding *);
void
rb_w32_sysinit(int *argc, char ***argv)
{
-#if RT_VER >= 80// && !defined(OS_WP8) && !defined(OS_UWP)
static void set_pioinfo_extra(void);
_CrtSetReportMode(_CRT_ASSERT, 0);
_set_invalid_parameter_handler(invalid_parameter);
- _RTC_SetErrorFunc(rtc_error_handler);
+ _RTC_SetErrorFuncW(rtc_error_handler);
set_pioinfo_extra();
-#endif
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
get_version();
@@ -2084,7 +2076,7 @@ rb_w32_wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen, long *plen)
WCHAR *
rb_w32_mbstr_to_wstr(UINT cp, const char *str, int clen, long *plen)
{
- WCHAR *ptr;
+ WCHAR *ptr = 0;
int len = MultiByteToWideChar(cp, 0, str, clen, NULL, 0);
if (!(ptr = malloc(sizeof(WCHAR) * len))) return 0;
MultiByteToWideChar(cp, 0, str, clen, ptr, len);
@@ -2422,7 +2414,7 @@ static inline ioinfo* _pioinfo(int);
#define rb_acrt_lowio_lock_fh(i) EnterCriticalSection(&_pioinfo(i)->lock)
#define rb_acrt_lowio_unlock_fh(i) LeaveCriticalSection(&_pioinfo(i)->lock)
-#if RT_VER >= 80 //&& !defined(OS_WP8) && !defined(OS_UWP)
+#if defined(OS_UWP)
static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */
/* License: Ruby's */
@@ -5781,8 +5773,7 @@ w32_stati64(const char *path, struct stati64 *st, UINT cp)
WCHAR *wpath;
int ret;
- if (!(wpath = mbstr_to_wstr(cp, path, -1, NULL)))
- return -1;
+ if (!(wpath = mbstr_to_wstr(cp, path, -1, NULL))) return -1;
ret = wstati64(wpath, st);
free(wpath);
return ret;
@@ -6169,8 +6160,7 @@ rb_w32_uopen(const char *file, int oflag, ...)
pmode = va_arg(arg, int);
va_end(arg);
- if (!(wfile = utf8_to_wstr(file, NULL)))
- return -1;
+ if (!(wfile = utf8_to_wstr(file, NULL))) return -1;
ret = rb_w32_wopen(wfile, oflag, pmode);
free(wfile);
return ret;
diff --git a/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj b/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj
index 13bad75c8f6..5ef309f5c21 100644
--- a/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj
+++ b/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj
@@ -14,7 +14,7 @@
en-US
UAP
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/platform/uwp/curl/libcurl.vcxproj b/platform/uwp/curl/libcurl.vcxproj
index 2c855d2de62..9d8605296cf 100644
--- a/platform/uwp/curl/libcurl.vcxproj
+++ b/platform/uwp/curl/libcurl.vcxproj
@@ -36,7 +36,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/platform/uwp/rhodes/MainPage.xaml.cs b/platform/uwp/rhodes/MainPage.xaml.cs
index acacec03545..959aa78bd12 100644
--- a/platform/uwp/rhodes/MainPage.xaml.cs
+++ b/platform/uwp/rhodes/MainPage.xaml.cs
@@ -195,6 +195,7 @@ public bool ApplicationBarStatus()
return getAppBar().IsOpen;
}
+
public MainPage()
{
deb("Running constructor");
@@ -230,6 +231,7 @@ public MainPage()
try{
// initialize C# extensions factories
deb("InitializeExtensions()");
+
CSharpExtensions.InitializeExtensions();
// create rhodes runtime object
@@ -661,13 +663,18 @@ private CommandBar getAppBar()
private void updateAppBarModeAndVisibility(bool autoToolbarVisibility = true)
{
+ if (autoToolbarVisibility) { deb("Tool bar visible"); }
+ else { deb("Tool bar invisible"); }
+
getAppBar().Visibility = autoToolbarVisibility ? Visibility.Visible : Visibility.Collapsed;
+ //getAppBar().IsSticky = autoToolbarVisibility ?
if (autoToolbarVisibility && (getAppBar().PrimaryCommands.Count > 0))
{
getAppBar().ClosedDisplayMode = AppBarClosedDisplayMode.Compact;
getAppBar().IsOpen = true;
//ApplicationBar.IsMenuEnabled = true;
getAppBar().Opacity = 1.0;
+ deb("Tool bar type 1");
}
else if (getAppBar().PrimaryCommands.Count > 0)
{
@@ -675,6 +682,7 @@ private void updateAppBarModeAndVisibility(bool autoToolbarVisibility = true)
getAppBar().IsOpen = true;
//ApplicationBar.IsMenuEnabled = true;
getAppBar().Opacity = 0.75;
+ deb("Tool bar type 2");
}
else
{
@@ -682,6 +690,7 @@ private void updateAppBarModeAndVisibility(bool autoToolbarVisibility = true)
getAppBar().IsOpen = false;
//ApplicationBar.IsMenuEnabled = false;
getAppBar().Opacity = 1.0;
+ deb("Tool bar type 3");
}
}
@@ -689,7 +698,7 @@ private void updateAppBarModeAndVisibility(bool autoToolbarVisibility = true)
public void toolbarRemoveAllButtons()
{
-
+ deb("Removing buttons");
if (!isUIThread) { InvokeInUIThread(delegate() { toolbarRemoveAllButtons(); }); return; }
foreach(ICommandBarElement value in getAppBar().PrimaryCommands.ToList()){
diff --git a/platform/uwp/rhodes/common/RhoResourceMap.cs b/platform/uwp/rhodes/common/RhoResourceMap.cs
index d8a88c5e2e3..60d12e7158b 100644
--- a/platform/uwp/rhodes/common/RhoResourceMap.cs
+++ b/platform/uwp/rhodes/common/RhoResourceMap.cs
@@ -58,7 +58,7 @@ private static void copyMap(String strMap)
{
String[] values = files[i].Split('|');
- String strFile = "rho/" + values[0];
+ String strFile = "rho" + values[0];
String strDstFile = strFile;
if (values[1] == "dir")
diff --git a/platform/uwp/rhodes/rhodes.csproj b/platform/uwp/rhodes/rhodes.csproj
index 0dc6e2fea45..f97004eef9c 100644
--- a/platform/uwp/rhodes/rhodes.csproj
+++ b/platform/uwp/rhodes/rhodes.csproj
@@ -22,7 +22,7 @@
en-US
UAP
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -71,6 +71,8 @@
false
prompt
true
+ true
+ true
pdbonly
@@ -202,10 +204,10 @@
Visual C++ 2015 Runtime for Universal Windows Platform Apps
-
+
Windows Desktop Extensions for the UWP
-
+
Windows IoT Extensions for the UWP
diff --git a/platform/uwp/rholib/rholib.vcxproj b/platform/uwp/rholib/rholib.vcxproj
index fb2d74c1b72..18b7630388e 100644
--- a/platform/uwp/rholib/rholib.vcxproj
+++ b/platform/uwp/rholib/rholib.vcxproj
@@ -36,7 +36,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/platform/uwp/rhoruntime/common/RhodesHelperWP8.h b/platform/uwp/rhoruntime/common/RhodesHelperWP8.h
index 336844797f1..296f324849e 100644
--- a/platform/uwp/rhoruntime/common/RhodesHelperWP8.h
+++ b/platform/uwp/rhoruntime/common/RhodesHelperWP8.h
@@ -100,7 +100,7 @@ extern "C" {
}
#endif //__cplusplus
-#if (defined(_WP8_LIB) || defined(_UWP_LIB)) && !defined(_WINRT_DLL)
+#if defined(_UWP_LIB) && !defined(_WINRT_DLL)
#define CreateFileW Rho_CreateFileW
#define CreateFileA Rho_CreateFileW
#define CreateFile Rho_CreateFileW
diff --git a/platform/uwp/rhoruntime/rhoruntime.cpp b/platform/uwp/rhoruntime/rhoruntime.cpp
index 0e2a86d0cf9..f001b16a65a 100644
--- a/platform/uwp/rhoruntime/rhoruntime.cpp
+++ b/platform/uwp/rhoruntime/rhoruntime.cpp
@@ -378,7 +378,7 @@ extern "C" void rho_title_change(const int tabIndex, const char* strTitle)
extern "C" const char* rho_native_rhopath()
{
- return "rho/"; //rho/apps?
+ return "rho"; //rho/apps?
}
diff --git a/platform/uwp/rhoruntime/rhoruntime.vcxproj b/platform/uwp/rhoruntime/rhoruntime.vcxproj
index 097b3e44024..5182f44f2f0 100644
--- a/platform/uwp/rhoruntime/rhoruntime.vcxproj
+++ b/platform/uwp/rhoruntime/rhoruntime.vcxproj
@@ -36,7 +36,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
true
@@ -137,6 +137,7 @@
Sync
false
Default
+ true
Console
@@ -145,6 +146,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ true
Console
@@ -171,6 +175,7 @@
Sync
false
Default
+ Disabled
Console
@@ -179,6 +184,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ DebugFastLink
Console
@@ -205,6 +213,7 @@
Sync
false
Default
+ true
Console
@@ -213,6 +222,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ true
Console
@@ -238,6 +250,7 @@
Sync
Default
true
+ true
Console
@@ -246,6 +259,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ true
true
@@ -269,6 +285,7 @@
Sync
false
Default
+ Disabled
Console
@@ -277,6 +294,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ DebugFastLink
Console
@@ -297,6 +317,10 @@
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
true
../../shared;../../shared/ruby/include;../../shared/curl/include;%(AdditionalIncludeDirectories)
+ false
+ true
+ Disabled
+ Default
Console
@@ -305,6 +329,9 @@
$(OutDir)
ws2_32.lib;libcurl.lib;rholib.lib;rubylib.lib;sqlite3.lib;syncengine.lib;%(AdditionalDependencies)
false
+ true
+ true
+ DebugFastLink
true
@@ -344,6 +371,9 @@
Create
+
+
+
diff --git a/platform/uwp/rubylib/rubylib.vcxproj b/platform/uwp/rubylib/rubylib.vcxproj
index 50fbcd253af..dd7d07e08e1 100644
--- a/platform/uwp/rubylib/rubylib.vcxproj
+++ b/platform/uwp/rubylib/rubylib.vcxproj
@@ -36,7 +36,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
@@ -64,19 +64,43 @@
StaticLibrary
false
- true
+ false
v140
StaticLibrary
false
- true
+ false
v140
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
false
@@ -115,15 +139,21 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- Default
- false
+ true
ProgramDatabase
- false
MultiThreadedDebugDLL
+ true
+ SyncCThrow
+ true
+ true
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -131,7 +161,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -141,16 +171,20 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- CompileAsC
- false
- false
+ true
Disabled
- false
+ true
MultiThreadedDLL
+ true
+ SyncCThrow
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -158,7 +192,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -168,15 +202,21 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- Default
- false
+ true
ProgramDatabase
- false
MultiThreadedDebugDLL
+ true
+ true
+ SyncCThrow
+ true
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -184,7 +224,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -194,15 +234,21 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- CompileAsC
- false
+ true
ProgramDatabase
- false
MultiThreadedDebugDLL
+ true
+ true
+ SyncCThrow
+ true
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -210,7 +256,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -220,16 +266,20 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- CompileAsC
- false
- false
+ true
Disabled
- false
+ true
MultiThreadedDLL
+ true
+ SyncCThrow
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -237,7 +287,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -247,14 +297,19 @@
- _LIB;_UWP_LIB;_UNICODE;UNICODE;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS
+ _LIB;_UWP_LIB;POSIXNAME;OS_UWP;CPP_ELEVEN;_WIN32;WIN32;_WINDOWS;_UNICODE;UNICODE;STATIC_LINKED;RHODES_VERSION_2;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_WINSOCK_DEPRECATED_NO_WARNINGS;__MSVC_RUNTIME_CHECKS;_CRT_RTC_INIT;
NotUsing
pch_ruby.h
$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)
- CompileAsC
- false
- false
+ true
MultiThreadedDLL
+ Disabled
+ true
+ SyncCThrow
+ false
+ true
+ false
+ EnableFastChecks
Console
@@ -262,7 +317,7 @@
%(AdditionalLibraryDirectories)
- userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib;oldnames.lib;wininet.lib;ws2_32.lib;Crypt32.lib;gdiplus.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib
+ userenv.lib;wlanapi.lib;Advapi32.lib;Dbghelp.lib;User32.lib;Shell32.lib;Iphlpapi.lib;Shlwapi.lib;Kernel32.lib
false
@@ -317,258 +372,1167 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
-
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
-
-
-
-
false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
false
+ false
- Default
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
-
-
-
-
-
-
-
false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
-
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
-
-
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
-
false
+ false
false
+ false
false
+ false
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
-
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ false
+ false
false
+ false
false
+ false
-
-
-
-
-
-
-
+
+ true
+ true
+ true
+
+
+
diff --git a/platform/uwp/rubylib/rubylib.vcxproj.filters b/platform/uwp/rubylib/rubylib.vcxproj.filters
index 544d0dcdb44..ed91dc90ef7 100644
--- a/platform/uwp/rubylib/rubylib.vcxproj.filters
+++ b/platform/uwp/rubylib/rubylib.vcxproj.filters
@@ -488,9 +488,4 @@
ext\ringtones
-
-
- ext\navbar
-
-
\ No newline at end of file
diff --git a/platform/uwp/sqlite3/sqlite3.vcxproj b/platform/uwp/sqlite3/sqlite3.vcxproj
index ffb317c4a9c..8a9887da184 100644
--- a/platform/uwp/sqlite3/sqlite3.vcxproj
+++ b/platform/uwp/sqlite3/sqlite3.vcxproj
@@ -36,7 +36,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0
diff --git a/platform/uwp/syncengine/syncengine.vcxproj b/platform/uwp/syncengine/syncengine.vcxproj
index 697ab24425d..f5705202a0d 100644
--- a/platform/uwp/syncengine/syncengine.vcxproj
+++ b/platform/uwp/syncengine/syncengine.vcxproj
@@ -35,7 +35,7 @@
true
Windows Store
10.0.14393.0
- 10.0.10586.0
+ 10.0.14393.0
10.0