diff --git a/build/windows10/liblinphone-tester/MainPage.xaml.cs b/build/windows10/liblinphone-tester/MainPage.xaml.cs index 043713796..005f38891 100644 --- a/build/windows10/liblinphone-tester/MainPage.xaml.cs +++ b/build/windows10/liblinphone-tester/MainPage.xaml.cs @@ -37,6 +37,7 @@ namespace liblinphone_tester protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + LibLinphoneTester.Instance.setWritableDirectory(ApplicationData.Current.LocalFolder); _suites = UnitTestDataSource.GetSuites(LibLinphoneTester.Instance); TryAutoLaunch(); } diff --git a/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj b/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj index 9f1c02cff..a66c5e7ed 100644 --- a/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj +++ b/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj @@ -70,7 +70,9 @@ 14.0 true Windows Store - 8.2 + 10 + 10.0.10240.0 + 10.0.10069.0 diff --git a/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj b/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj index 73ce588be..80e57dedb 100644 --- a/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj +++ b/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj @@ -81,7 +81,9 @@ 14.0 true Windows Store - 8.2 + 10 + 10.0.10240.0 + 10.0.10069.0 diff --git a/build/windows10/liblinphone-tester/liblinphone-tester.csproj b/build/windows10/liblinphone-tester/liblinphone-tester.csproj index f3c30d0fb..d50b0c18e 100644 --- a/build/windows10/liblinphone-tester/liblinphone-tester.csproj +++ b/build/windows10/liblinphone-tester/liblinphone-tester.csproj @@ -11,7 +11,7 @@ liblinphone-tester en-US UAP - 10.0.10069.0 + 10.0.10240.0 10.0.10069.0 14 true @@ -24,7 +24,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full ARM @@ -34,7 +34,7 @@ bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -47,7 +47,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full x64 @@ -57,7 +57,7 @@ bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -70,7 +70,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full x86 @@ -80,7 +80,7 @@ bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -90,6 +90,13 @@ true true + + + + PreserveNewest + + + App.xaml @@ -104,7 +111,6 @@ Designer - PreserveNewest @@ -281,28 +287,6 @@ Designer - - - packages\Microsoft.ApplicationInsights.0.14.3-build00177\lib\portable-win81+wpa81\Microsoft.ApplicationInsights.dll - True - - - packages\Microsoft.ApplicationInsights.WindowsApps.0.14.3-build00177\lib\win81\Microsoft.ApplicationInsights.Extensibility.Windows.dll - True - - - packages\Microsoft.ApplicationInsights.PersistenceChannel.0.14.3-build00177\lib\portable-win81+wpa81\Microsoft.ApplicationInsights.PersistenceChannel.dll - True - - - packages\System.Numerics.Vectors.4.0.0\lib\win8\System.Numerics.Vectors.dll - True - - - packages\System.Numerics.Vectors.4.0.0\lib\win8\System.Numerics.Vectors.WindowsRuntime.dll - True - - {1ce10f06-8fad-437f-b3d7-3b7a8909a190} @@ -314,15 +298,6 @@ 14.0 - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - XCopy /I /Y $(ProjectDir)..\..\..\tester\tester_hosts $(ProjectDir)Assets\ XCopy /I /Y $(ProjectDir)..\..\..\tester\certificates\altname $(ProjectDir)Assets\certificates\altname diff --git a/build/windows10/liblinphone-tester/project.json b/build/windows10/liblinphone-tester/project.json new file mode 100644 index 000000000..e3b2dba25 --- /dev/null +++ b/build/windows10/liblinphone-tester/project.json @@ -0,0 +1,19 @@ +{ + "dependencies": { + "Microsoft.ApplicationInsights": "1.0.0", + "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0", + "Microsoft.ApplicationInsights.WindowsApps": "1.0.0", + "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0" + }, + "frameworks": { + "uap10.0": {} + }, + "runtimes": { + "win10-arm": {}, + "win10-arm-aot": {}, + "win10-x86": {}, + "win10-x86-aot": {}, + "win10-x64": {}, + "win10-x64-aot": {} + } +} \ No newline at end of file diff --git a/build/windows10/liblinphone/liblinphone.vcxproj b/build/windows10/liblinphone/liblinphone.vcxproj index 5d1809af7..2be93aeb0 100644 --- a/build/windows10/liblinphone/liblinphone.vcxproj +++ b/build/windows10/liblinphone/liblinphone.vcxproj @@ -135,7 +135,9 @@ 14.0 true Windows Store - 8.2 + 10 + 10.0.10240.0 + 10.0.10069.0 diff --git a/mediastreamer2 b/mediastreamer2 index 8d06ddb2a..0b72fb676 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 8d06ddb2a723319efa263935eabe897201212c22 +Subproject commit 0b72fb676c24356a548710c5e3a1d0ee3a1dbd70 diff --git a/oRTP b/oRTP index 32f4e635d..5aa889bfe 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 32f4e635db66d2acec21c4633d37776cd6ed34df +Subproject commit 5aa889bfe539f6b83962334adb9f49aa76bc8303 diff --git a/tester/liblinphone_tester_windows.cpp b/tester/liblinphone_tester_windows.cpp index a1e064da6..30b480a8c 100644 --- a/tester/liblinphone_tester_windows.cpp +++ b/tester/liblinphone_tester_windows.cpp @@ -53,13 +53,8 @@ static void libLinphoneNativeOutputTraceHandler(OrtpLogLevel lev, const char *fm LibLinphoneTester::LibLinphoneTester() { - char writable_dir[MAX_WRITABLE_DIR_SIZE]; - StorageFolder ^folder = ApplicationData::Current->LocalFolder; - const wchar_t *wwritable_dir = folder->Path->Data(); - wcstombs(writable_dir, wwritable_dir, sizeof(writable_dir)); liblinphone_tester_init(nativeOutputTraceHandler); bc_tester_set_resource_dir_prefix("Assets"); - bc_tester_set_writable_dir_prefix(writable_dir); } LibLinphoneTester::~LibLinphoneTester() @@ -67,6 +62,14 @@ LibLinphoneTester::~LibLinphoneTester() liblinphone_tester_uninit(); } +void LibLinphoneTester::setWritableDirectory(StorageFolder^ folder) +{ + char writable_dir[MAX_WRITABLE_DIR_SIZE] = { 0 }; + const wchar_t *wwritable_dir = folder->Path->Data(); + wcstombs(writable_dir, wwritable_dir, sizeof(writable_dir)); + bc_tester_set_writable_dir_prefix(writable_dir); +} + void LibLinphoneTester::setOutputTraceListener(OutputTraceListener^ traceListener) { sTraceListener = traceListener; diff --git a/tester/liblinphone_tester_windows.h b/tester/liblinphone_tester_windows.h index 959a6d1d9..08d60ddfd 100644 --- a/tester/liblinphone_tester_windows.h +++ b/tester/liblinphone_tester_windows.h @@ -14,6 +14,7 @@ namespace liblinphone_tester_runtime_component public ref class LibLinphoneTester sealed { public: + void setWritableDirectory(Windows::Storage::StorageFolder^ folder); void setOutputTraceListener(OutputTraceListener^ traceListener); unsigned int nbTestSuites(); unsigned int nbTests(Platform::String^ suiteName);