Changing error string conversions to use to_utf8string (#235)

* Changing error string conversions to use to_utf8string

* Rerun CMake to update project file

* Update project template this time

Build/Microsoft.Xbox.Services.140.UWP.WinRT/Microsoft.Xbox.Services.140.UWP.WinRT.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -520,7 +520,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp" >
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -911,4 +911,4 @@
     <IntDir>$(ProjectDir)..\..\Obj\$(Configuration)\$(Platform)\$(ProjectFolder)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

Source/Services/Clubs/clubs_serializers.cpp

@@ -248,20 +248,16 @@ xbox_live_result<void> clubs_serializers::generate_xbox_live_result(
     {
         result._Set_err(httpErrorCode);
 
-#ifdef _WIN32
         auto errorMessageFromJsonResult = deserialize_error_description(response->response_body_json());
         if (!errorMessageFromJsonResult.err())
         {
             result._Set_err_message(
-                utils::convert_wide_string_to_standard_string(errorMessageFromJsonResult.payload()));
+                utility::conversions::to_utf8string(errorMessageFromJsonResult.payload()));
         }
         else
         {
             result._Set_err_message(response->err_message());
         }
-#else
-        result._Set_err_message(response->err_message());
-#endif
     }
 
     return result;

Source/Services/Clubs/clubs_serializers.h

@@ -128,20 +128,16 @@ xbox::services::xbox_live_result<T> clubs_serializers::generate_xbox_live_result
     {
         deserializationResult._Set_err(httpErrorCode);
 
-#ifdef _WIN32
         auto errorMessageFromJsonResult = deserialize_error_description(response->response_body_json());
         if (!errorMessageFromJsonResult.err())
         {
             deserializationResult._Set_err_message(
-                utils::convert_wide_string_to_standard_string(errorMessageFromJsonResult.payload()));
+                utility::conversions::to_utf8string(errorMessageFromJsonResult.payload()));
         }
         else
         {
             deserializationResult._Set_err_message(response->err_message());
         }
-#else
-        deserializationResult._Set_err_message(response->err_message());
-#endif
     }
 
     return deserializationResult;

Utilities/CMake/template-Microsoft.Xbox.Services.140.UWP.WinRT.vcxproj

@@ -111,7 +111,7 @@
       $(ProjectDir)\..\..\Source\Services\Clubs;
       $(ProjectDir)\..\..\Source\Services\Clubs\WinRT;
       %(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>false</TreatWarningAsError>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>windowsapp.lib;msxml6.lib;%(AdditionalDependencies)</AdditionalDependencies>