Removed legacy VS project and solution files, updated project dependencies.

19 files changed, 26 insertions, 647 deletions

diff --git a/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems b/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems
deleted file mode 100644
index a0d4048..0000000
--- a/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <ItemsProjectGuid>{FBE96ADC-7C36-45B2-BE6D-F173413EB1C6}</ItemsProjectGuid>
-    <ItemsRootNamespace>AtmosphereSample</ItemsRootNamespace>
-    <ItemsProjectName>UnityEmulatorUWP.Shared</ItemsProjectName>
-    <SharedGUID>2c11e612-847b-48ac-a5dd-fd953e773442</SharedGUID>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectCapability Include="SourceItemsFromImports" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\App.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DeviceResources.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\UnityEmulatorAppMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\App.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DeviceResources.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DirectXHelper.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\pch2.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\UnityEmulatorAppMain.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\StepTimer.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems.filters b/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems.filters
deleted file mode 100644
index 6763a1b..0000000
--- a/unityplugin/UnityEmulator/build/UWP.Shared/UnityEmulatorUWP.Shared.vcxitems.filters
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\App.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DeviceResources.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UWP\UnityEmulatorAppMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\App.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\pch2.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DeviceResources.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\DirectXHelper.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\StepTimer.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UWP\UnityEmulatorAppMain.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj b/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj
deleted file mode 100644
index 074fade..0000000
--- a/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{17597734-2FBF-481F-99D4-3315B70FE3E2}</ProjectGuid>
-    <Keyword>StaticLibrary</Keyword>
-    <RootNamespace>UnityEmulator</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-    <Import Project="..\Windows.Shared\UnityEmulator.Shared.vcxitems" Label="Shared" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj.filters b/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj.filters
deleted file mode 100644
index c31757e..0000000
--- a/unityplugin/UnityEmulator/build/UWP/UnityEmulator.vcxproj.filters
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj
deleted file mode 100644
index 736d6d6..0000000
--- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F40021AC-6D7B-4828-81C4-2D04F946A88E}</ProjectGuid>
-    <RootNamespace>UnityEmulator</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-    <ProjectName>UnityEmulator</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\Windows.Shared\UnityEmulator.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\UnityEmulator.Shared\UnityEmulator.Shared.vcxitems')" />
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-    <Import Project="..\Windows.Shared\UnityEmulator.Shared.vcxitems" Label="Shared" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" />
-    <Import Project="..\Windows.Shared\UnityEmulator.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;PLATFORM_WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Message>Copying D3DCompiler_47.dll to $(TargetDir)...</Message>
-      <Command>copy "$(VC_ExecutablePath_x86_x86)\D3Dcompiler_47.dll" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;PLATFORM_WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Message>Copying D3DCompiler_47.dll to $(TargetDir)...</Message>
-      <Command>copy "$(VC_ExecutablePath_x64_x64)\D3Dcompiler_47.dll" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;PLATFORM_WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Message>Copying D3DCompiler_47.dll to $(TargetDir)...</Message>
-      <Command>copy "$(VC_ExecutablePath_x86_x86)\D3Dcompiler_47.dll" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;PLATFORM_WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Message>Copying D3DCompiler_47.dll to $(TargetDir)...</Message>
-      <Command>copy "$(VC_ExecutablePath_x64_x64)\D3Dcompiler_47.dll" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\Windows\WinMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\diligentcore\Common\build\Win32\Common.vcxproj">
-      <Project>{7380f7e6-315f-4b4e-92eb-e6aeee865298}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\External\glew\build\Win32\glew_static.vcxproj">
-      <Project>{664e6f0d-6784-4760-9565-d54f8eb1edf4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\Win32\GraphicsEngineD3D11.vcxproj">
-      <Project>{fe289cc7-15d6-4a76-b9cb-f61cab3192c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Graphics\GraphicsEngineD3D12\build\Win32\GraphicsEngineD3D12.vcxproj">
-      <Project>{fff8071a-db82-485b-adc3-f0b675296869}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Graphics\GraphicsEngineOpenGL\build\Win32\GraphicsEngineOpenGL.vcxproj">
-      <Project>{15e346d3-fde6-4b29-88b7-fca14dada501}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Graphics\GraphicsEngine\build\Win32\GraphicsEngine.vcxproj">
-      <Project>{052dd700-477c-4512-a7f4-b05ebef5c80e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Platforms\Basic\build\Win32\BasicPlatform.vcxproj">
-      <Project>{8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\diligentcore\Platforms\Win32\build\Win32\WindowsPlatform.vcxproj">
-      <Project>{58f32677-436b-412a-bbf8-2b1310d82cd8}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters
deleted file mode 100644
index 1395a81..0000000
--- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Windows">
-      <UniqueIdentifier>{e9f1e7cd-5112-4fb6-854a-3ebfd5efa88b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\src">
-      <UniqueIdentifier>{f1774749-d1e5-4b2c-9f8d-df8ef690d4b5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\Windows\WinMain.cpp">
-      <Filter>Windows\src</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems b/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems
deleted file mode 100644
index 37e73bc..0000000
--- a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <ItemsProjectGuid>{ae83b976-c8ca-4621-9269-bf47c5789018}</ItemsProjectGuid>
-    <ItemsRootNamespace>AtmosphereSample</ItemsRootNamespace>
-    <ItemsProjectName>UnityEmulator.Shared</ItemsProjectName>
-    <SharedGUID>2c11e612-847b-48ac-a5dd-fd953e773442</SharedGUID>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectCapability Include="SourceItemsFromImports" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapter.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterD3D11.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterD3D12.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterGL.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\ResourceStateTransitionHandler.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsD3D11Emulator.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsD3D12Emulator.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsEmulator.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsGLCoreES_Emulator.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnitySceneBase.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D11Impl.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D12Impl.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCore_Impl.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGL_Impl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D11Emulator.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D12Emulator.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsEmulator.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCoreES_Emulator.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterD3D11.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterD3D12.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterGL.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCore_Impl.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems.filters b/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems.filters
deleted file mode 100644
index 4fb2f8d..0000000
--- a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.Shared.vcxitems.filters
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{74468132-c052-44c1-9407-963d145244d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{58f43661-c9a6-48e2-bfaa-818a394b2c36}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnitySceneBase.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapter.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterD3D11.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterD3D12.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DiligentGraphicsAdapterGL.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D11Impl.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D12Impl.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\ResourceStateTransitionHandler.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsD3D11Emulator.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsD3D12Emulator.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsEmulator.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCore_Impl.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\UnityGraphicsGLCoreES_Emulator.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGL_Impl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D11Emulator.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsEmulator.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsD3D12Emulator.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterD3D11.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterD3D12.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DiligentGraphicsAdapterGL.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCore_Impl.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\UnityGraphicsGLCoreES_Emulator.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.props b/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.props
deleted file mode 100644
index 915b946..0000000
--- a/unityplugin/UnityEmulator/build/Windows.Shared/UnityEmulator.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <ProjectRoot>..\..</ProjectRoot>
-    <AssetsPath>$(ProjectRoot)\build\assets</AssetsPath>
-    <EngineRoot>$(ProjectRoot)\..\..</EngineRoot>
-    <CoreRoot>$(EngineRoot)\diligentcore</CoreRoot>
-    <ToolsRoot>$(EngineRoot)\diligenttools</ToolsRoot>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(ProjectRoot)\include;$(CoreRoot)\Graphics\GraphicsEngine\interface;$(CoreRoot)\Graphics\GraphicsEngine\include;$(CoreRoot)\Graphics\GraphicsEngineD3D11\interface;$(CoreRoot)\Graphics\GraphicsEngineD3D12\interface;$(CoreRoot)\Graphics\GraphicsEngineD3DBase\include;$(CoreRoot)\Graphics\GraphicsEngineOpenGL\interface;$(CoreRoot)\Graphics\HLSL2GLSLConverterLib\interface;$(CoreRoot)\Common\include;$(CoreRoot)\Common\interface;$(CoreRoot)\Platforms\interface;$(CoreRoot)\Graphics\GraphicsTools\include;$(ToolsRoot)\TextureLoader\interface;$(AssetsPath)\shaders;$(ProjectRoot)\..\GhostCubePlugin\PluginSource\src\Unity;$(ProjectRoot)\src;$(ProjectRoot)\src\UWP;$(CoreRoot)\External\glew\include\GL;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <PostBuildEvent />
-    <Link>
-      <AdditionalDependencies>d3d11.lib;d3d12.lib;d3dcompiler.lib;opengl32.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="ProjectRoot">
-      <Value>$(ProjectRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="AssetsPath">
-      <Value>$(AssetsPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="EngineRoot">
-      <Value>$(EngineRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CoreRoot">
-      <Value>$(CoreRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ToolsRoot">
-      <Value>$(ToolsRoot)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
index 4b02965..e196585 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
@@ -31,7 +31,7 @@ public:
 
     virtual IDXGISwapChain *GetDXGISwapChain()override final
     {
-        UNEXPECTED("DXGI swap chain cannot be requested through the proxy swap chain")
+        UNEXPECTED("DXGI swap chain cannot be requested through the proxy swap chain");
         return nullptr;
     }
 
@@ -41,7 +41,7 @@ public:
 
     virtual void Present()override final
     {
-        UNEXPECTED("Present is not expected to be called directly")
+        UNEXPECTED("Present is not expected to be called directly");
     }
 
     virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
index 9aea25d..11b912e 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
@@ -89,7 +89,7 @@ public:
 
     virtual IDXGISwapChain *GetDXGISwapChain()override final
     {
-        UNEXPECTED("DXGI swap chain cannot be requested through the proxy swap chain")
+        UNEXPECTED("DXGI swap chain cannot be requested through the proxy swap chain");
         return nullptr;
     }
 
@@ -105,7 +105,7 @@ public:
 
     virtual void Present()override final
     {
-        UNEXPECTED("Present is not expected to be called directly")
+        UNEXPECTED("Present is not expected to be called directly");
     }
 
     virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
index 4b5ecb1..b9ab052 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -27,7 +27,7 @@ public:
         
     virtual void Present()override final
     {
-        UNEXPECTED("Present is not expected to be called directly")
+        UNEXPECTED("Present is not expected to be called directly");
     }
 
     virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final
@@ -55,7 +55,7 @@ DiligentGraphicsAdapterGL::DiligentGraphicsAdapterGL(const UnityGraphicsGLCoreES
         SCDesc.ColorBufferFormat = TEX_FORMAT_RGBA8_UNORM_SRGB;
     else
     {
-        UNEXPECTED("Unexpected back buffer format")
+        UNEXPECTED("Unexpected back buffer format");
     }
 
     if (DepthBufferGLFormat == GL_DEPTH_COMPONENT32F)
@@ -66,7 +66,7 @@ DiligentGraphicsAdapterGL::DiligentGraphicsAdapterGL(const UnityGraphicsGLCoreES
         SCDesc.DepthBufferFormat = TEX_FORMAT_D16_UNORM;
     else
     {
-        UNEXPECTED("Unexpected depth buffer format")
+        UNEXPECTED("Unexpected depth buffer format");
     }
 
     SCDesc.Width = UnityGraphicsGLImpl->GetBackBufferWidth();
diff --git a/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp b/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp
index ea19b7c..71a82c1 100644
--- a/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp
+++ b/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp
@@ -26,6 +26,7 @@
 #include "DirectXHelper.h"
 #include "StringTools.h"
 #include "Errors.h"
+#include "FileSystem.h"
 
 using namespace UnityEmulatorApp;
 using namespace Windows::Foundation;
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Emulator.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Emulator.cpp
index 19d1f20..ce42b31 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Emulator.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Emulator.cpp
@@ -61,7 +61,7 @@ void UnityGraphicsD3D12Impl::CreateDeviceAndCommandQueue()
 
 	CComPtr<IDXGIFactory4> factory;
     HRESULT hr = CreateDXGIFactory1(__uuidof(factory), reinterpret_cast<void**>(static_cast<IDXGIFactory4**>(&factory)) );
-    if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to create DXGI factory")
+    if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to create DXGI factory");
 
 	CComPtr<IDXGIAdapter1> hardwareAdapter;
 	GetHardwareAdapter(factory, &hardwareAdapter);
@@ -69,14 +69,14 @@ void UnityGraphicsD3D12Impl::CreateDeviceAndCommandQueue()
 	hr = D3D12CreateDevice(hardwareAdapter, D3D_FEATURE_LEVEL_11_0, __uuidof(m_D3D12Device), reinterpret_cast<void**>(static_cast<ID3D12Device**>(&m_D3D12Device)) );
     if( FAILED(hr))
     {
-        LOG_WARNING_MESSAGE("Failed to create hardware device. Attempting to create WARP device")
+        LOG_WARNING_MESSAGE("Failed to create hardware device. Attempting to create WARP device");
 
 		CComPtr<IDXGIAdapter> warpAdapter;
 		hr = factory->EnumWarpAdapter( __uuidof(warpAdapter),  reinterpret_cast<void**>(static_cast<IDXGIAdapter**>(&warpAdapter)) );
-        if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to enum warp adapter")
+        if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to enum warp adapter");
 
 		hr = D3D12CreateDevice( warpAdapter, D3D_FEATURE_LEVEL_11_0, __uuidof(m_D3D12Device), reinterpret_cast<void**>(static_cast<ID3D12Device**>(&m_D3D12Device)) );
-        if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to crate warp device")
+        if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to crate warp device");
     }
 
 #if _DEBUG
@@ -129,7 +129,7 @@ void UnityGraphicsD3D12Impl::CreateDeviceAndCommandQueue()
 	queueDesc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
 
     hr = m_D3D12Device->CreateCommandQueue(&queueDesc, __uuidof(m_D3D12CmdQueue), reinterpret_cast<void**>(static_cast<ID3D12CommandQueue**>(&m_D3D12CmdQueue)));
-    if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to create command queue")
+    if(FAILED(hr)) LOG_ERROR_AND_THROW("Failed to create command queue");
 
     hr = m_D3D12Device->SetName(L"Main Command Queue");
     VERIFY_EXPR(SUCCEEDED(hr));
@@ -168,7 +168,7 @@ void UnityGraphicsD3D12Impl::CreateSwapChain(void* pNativeWndHandle, unsigned in
     CComPtr<IDXGISwapChain1> pSwapChain1;
 	CComPtr<IDXGIFactory4> factory;
     HRESULT hr = CreateDXGIFactory1(__uuidof(factory), reinterpret_cast<void**>(static_cast<IDXGIFactory4**>(&factory)) );
-    if(FAILED(hr))LOG_ERROR_AND_THROW("Failed to create DXGI factory")
+    if(FAILED(hr))LOG_ERROR_AND_THROW("Failed to create DXGI factory");
 
 #if defined( PLATFORM_WIN32 )
     hr = factory->CreateSwapChainForHwnd(m_D3D12CmdQueue, hWnd, &swapChainDesc, nullptr, nullptr, &pSwapChain1);
@@ -210,7 +210,7 @@ void UnityGraphicsD3D12Impl::InitBuffersAndViews()
         rtvHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
         rtvHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
         auto hr = m_D3D12Device->CreateDescriptorHeap(&rtvHeapDesc, IID_PPV_ARGS(&m_RTVDescriptorHeap));
-        if (FAILED(hr))LOG_ERROR_AND_THROW("Failed to create RTV descriptor heap")
+        if (FAILED(hr))LOG_ERROR_AND_THROW("Failed to create RTV descriptor heap");
 
         m_rtvDescriptorSize = m_D3D12Device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
     }
@@ -223,7 +223,7 @@ void UnityGraphicsD3D12Impl::InitBuffersAndViews()
         rtvHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV;
         rtvHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
         auto hr = m_D3D12Device->CreateDescriptorHeap(&rtvHeapDesc, IID_PPV_ARGS(&m_DSVDescriptorHeap));
-        if (FAILED(hr))LOG_ERROR_AND_THROW("Failed to create DSV descriptor heap")
+        if (FAILED(hr))LOG_ERROR_AND_THROW("Failed to create DSV descriptor heap");
     }
 
     {
@@ -233,7 +233,7 @@ void UnityGraphicsD3D12Impl::InitBuffersAndViews()
         for (UINT n = 0; n < m_BackBuffersCount; n++)
         {
             auto hr = m_SwapChain->GetBuffer(n, IID_PPV_ARGS(&m_RenderTargets[n]));
-            VERIFY_EXPR(SUCCEEDED(hr))
+            VERIFY_EXPR(SUCCEEDED(hr));
 
             D3D12_RENDER_TARGET_VIEW_DESC RTVDesc = {};
             RTVDesc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
@@ -271,7 +271,7 @@ void UnityGraphicsD3D12Impl::InitBuffersAndViews()
         ClearValue.Format = Desc.Format;
         auto hr = m_D3D12Device->CreateCommittedResource( &HeapProps, D3D12_HEAP_FLAG_NONE,
 		    &Desc, D3D12_RESOURCE_STATE_DEPTH_WRITE, &ClearValue, __uuidof(m_DepthStencilBuffer), reinterpret_cast<void**>(static_cast<ID3D12Resource**>(&m_DepthStencilBuffer)) );
-        if(FAILED(hr))LOG_ERROR_AND_THROW("Failed to create depth-stencil buffer")
+        if(FAILED(hr))LOG_ERROR_AND_THROW("Failed to create depth-stencil buffer");
 
         // Create depth-stencil view
         D3D12_CPU_DESCRIPTOR_HANDLE dsvHandle = m_DSVDescriptorHeap->GetCPUDescriptorHandleForHeapStart();
@@ -314,7 +314,7 @@ void UnityGraphicsD3D12Impl::ResizeSwapChain( UINT NewWidth, UINT NewHeight )
     m_SwapChain->GetDesc( &SCDes );
     auto hr = m_SwapChain->ResizeBuffers(SCDes.BufferCount, NewWidth, NewHeight, SCDes.BufferDesc.Format, SCDes.Flags);
     if(FAILED(hr))
-        LOG_ERROR_MESSAGE("Failed to resize swap chain")
+        LOG_ERROR_MESSAGE("Failed to resize swap chain");
 
     m_FrameIndex = m_SwapChain->GetCurrentBackBufferIndex();
 
@@ -353,7 +353,7 @@ CComPtr<ID3D12CommandAllocator> UnityGraphicsD3D12Impl::GetCommandAllocator()
 	if (!m_CmdAllocator)
 	{
 		auto hr = m_D3D12Device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, __uuidof(m_CmdAllocator), reinterpret_cast<void**>(&m_CmdAllocator));
-        VERIFY(SUCCEEDED(hr), "Failed to create command allocator")
+        VERIFY(SUCCEEDED(hr), "Failed to create command allocator");
 		m_CmdAllocator->SetName(L"UnityGraphicsD3D12Impl: cmd list allocator");
 	}
 
@@ -400,7 +400,7 @@ void UnityGraphicsD3D12Impl::TransitonResourceStates(int stateCount, UnityGraphi
 {
     if (stateCount >= 0)
     {
-        VERIFY(m_pStateTransitionHandler != nullptr, "State transition handler is not set")
+        VERIFY(m_pStateTransitionHandler != nullptr, "State transition handler is not set");
         m_pStateTransitionHandler->TransitionResources(stateCount, states);
     }
 }
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Impl.h b/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Impl.h
index df496c7..c969f0d 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Impl.h
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsD3D12Impl.h
@@ -62,7 +62,7 @@ public:
 private:
 
     UINT m_BackBufferWidth, m_BackBufferHeight;
-    static const UINT m_BackBuffersCount = 3;
+    static constexpr UINT m_BackBuffersCount = 3;
 
     UINT m_FrameIndex = 0;
     CComPtr<ID3D12Device> m_D3D12Device;
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsEmulator.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsEmulator.cpp
index cb21cfb..2bfbb32 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsEmulator.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsEmulator.cpp
@@ -45,7 +45,7 @@ void UnityGraphicsEmulator::InvokeDeviceEventCallback(UnityGfxDeviceEventType ev
 //static void Get
 UnityGraphicsEmulator::UnityGraphicsEmulator()
 { 
-    VERIFY(m_Instance == nullptr, "Only single instance of UnityGraphicsEmulator must be initialized")
+    VERIFY(m_Instance == nullptr, "Only single instance of UnityGraphicsEmulator must be initialized");
     m_Instance = this; 
     static IUnityGraphics UnityGraphics;
     UnityGraphics.GetRenderer = GetUnityRenderer;
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
index 9f17ef1..0fceadc 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
@@ -86,7 +86,7 @@ void UnityGraphicsGLCoreES_Emulator::BeginFrame()
     glDepthRangef( 0, 1 );
     auto err = glGetError();
     if( err != GL_NO_ERROR)
-        LOG_ERROR_MESSAGE("GL Error: ", err)
+        LOG_ERROR_MESSAGE("GL Error: ", err);
 }
 
 void UnityGraphicsGLCoreES_Emulator::EndFrame()
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
index 59a3aa0..f73db1a 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
@@ -188,7 +188,7 @@ void UnityGraphicsGLCore_Impl::InitGLContext(void *pNativeWndHandle,
     //Or better yet, use the GL3 way to get the version number
     glGetIntegerv( GL_MAJOR_VERSION, &MajorVersion );
     glGetIntegerv( GL_MINOR_VERSION, &MinorVersion );
-    LOG_INFO_MESSAGE("Initialized OpenGL ", MajorVersion, '.', MinorVersion, " context (", GLVersionString, ")")
+    LOG_INFO_MESSAGE("Initialized OpenGL ", MajorVersion, '.', MinorVersion, " context (", GLVersionString, ")");
 
     if( glDebugMessageCallback )
     {
diff --git a/unityplugin/UnityEmulator/src/Windows/WinMain.cpp b/unityplugin/UnityEmulator/src/Windows/WinMain.cpp
index c8085aa..dad27c4 100644
--- a/unityplugin/UnityEmulator/src/Windows/WinMain.cpp
+++ b/unityplugin/UnityEmulator/src/Windows/WinMain.cpp
@@ -150,7 +150,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int cmdShow)
         }
         else
         {
-            LOG_ERROR("Unknown device type. Only the following types are supported: D3D11, D3D12, GL")
+            LOG_ERROR("Unknown device type. Only the following types are supported: D3D11, D3D12, GL");
             return -1;
         }
     }