diff --git a/audio/drivers/xaudio.c b/audio/drivers/xaudio.c
index da57ee9f2b..594d3124d4 100644
--- a/audio/drivers/xaudio.c
+++ b/audio/drivers/xaudio.c
@@ -201,10 +201,8 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 {
    xaudio2_t *handle = NULL;
    WAVEFORMATEX wfx  = {0};
-   HRESULT hr;
-
-#ifndef _XBOX
-   hr = CoInitialize(NULL);
+#if !defined(_XBOX) && !defined(__WINRT__)
+   HRESULT hr        = CoInitialize(NULL);
    if (FAILED(hr))
       return NULL;
 #endif
@@ -258,7 +256,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 
 error:
    xaudio2_free(handle);
-#ifndef _XBOX
+#if !defined(_XBOX) && !defined(__WINRT__)
    CoUninitialize();
 #endif
    return NULL;
@@ -411,7 +409,7 @@ static void xa_free(void *data)
       xaudio2_free(xa->xa);
    free(xa);
 
-#ifndef _XBOX
+#if !defined(_XBOX) && !defined(__WINRT__)
    CoUninitialize();
 #endif
 }
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/LargeTile.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/LargeTile.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/SmallTile.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/SmallTile.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square150x150Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-16.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-256.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Square44x44Logo.targetsize-48.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/StoreLogo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Assets/Wide310x150Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Package.appxmanifest b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Package.appxmanifest
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/Package.appxmanifest
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/Package.appxmanifest
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj
similarity index 98%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj
index 99539b2ed8..07b6a388d8 100644
--- a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj
+++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>{cc7b9a23-bd64-4eb9-9d8f-f5115fb8960f}</ProjectGuid>
-    <RootNamespace>RetroArchUWP_cores_nonfree</RootNamespace>
+    <RootNamespace>RetroArch_msvc2017_UWP_cores_nonfree</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -118,7 +118,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>..\RetroArch-UWP\RetroArch-UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\msvc2017-UWP\RetroArch-msvc2017-UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
@@ -227,4 +227,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj.filters b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj.filters
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/RetroArch-UWP-cores-nonfree.vcxproj.filters
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj.filters
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM64/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM64/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM64/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/ARM64/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/ARM64/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/Win32/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/Win32/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/Win32/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/Win32/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/Win32/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/x64/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/x64/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/x64/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/cores/x64/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/cores/x64/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/dummy.cpp b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/dummy.cpp
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP-cores-nonfree/dummy.cpp
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/dummy.cpp
diff --git a/pkg/msvc-uwp/RetroArch-UWP.sln b/pkg/msvc-uwp/RetroArch-msvc2017-UWP.sln
similarity index 92%
rename from pkg/msvc-uwp/RetroArch-UWP.sln
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP.sln
index 29d683556e..7cd6c43dd7 100644
--- a/pkg/msvc-uwp/RetroArch-UWP.sln
+++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.168
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP", "RetroArch-UWP\RetroArch-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017-UWP", "RetroArch-msvc2017-UWP\RetroArch-msvc2017-UWP.vcxproj", "{F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-UWP-cores-nonfree", "RetroArch-UWP-cores-nonfree\RetroArch-UWP-cores-nonfree.vcxproj", "{CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017-UWP-cores-nonfree", "RetroArch-msvc2017-UWP-cores-nonfree\RetroArch-msvc2017-UWP-cores-nonfree.vcxproj", "{CC7B9A23-BD64-4EB9-9D8F-F5115FB8960F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/LargeTile.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/LargeTile.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SmallTile.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SmallTile.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/SplashScreen.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/SplashScreen.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square150x150Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square150x150Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-16.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-16.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-16.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-256.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-256.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-256.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-48.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Square44x44Logo.targetsize-48.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Square44x44Logo.targetsize-48.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/StoreLogo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/StoreLogo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-100.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-100.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-100.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-100.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-200.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-200.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-200.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-400.png b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-400.png
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Assets/Wide310x150Logo.scale-400.png
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Assets/Wide310x150Logo.scale-400.png
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Bundle.Mapping.txt b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Bundle.Mapping.txt
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt
diff --git a/pkg/msvc-uwp/RetroArch-UWP/Package.appxmanifest b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Package.appxmanifest
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/Package.appxmanifest
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/Package.appxmanifest
diff --git a/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj
diff --git a/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj.filters b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj.filters
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP.vcxproj.filters
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj.filters
diff --git a/pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP_TemporaryKey.pfx b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP_TemporaryKey.pfx
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/RetroArch-UWP_TemporaryKey.pfx
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP_TemporaryKey.pfx
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/ARM/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/ARM/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM64/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM64/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM64/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/ARM64/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/ARM64/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/Win32/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/Win32/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/Win32/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/Win32/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/Win32/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/Win32/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/Win32/cores/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/x64/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/x64/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/x64/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/x64/.empty
diff --git a/pkg/msvc-uwp/RetroArch-UWP/cores/x64/cores/.empty b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/x64/cores/.empty
similarity index 100%
rename from pkg/msvc-uwp/RetroArch-UWP/cores/x64/cores/.empty
rename to pkg/msvc-uwp/RetroArch-msvc2017-UWP/cores/x64/cores/.empty