Update release

Import/GacUI.cpp

@@ -645,7 +645,7 @@ GuiControl
 				styleController->SetText(text);
 				styleController->SetVisuallyEnabled(isVisuallyEnabled);
 				
-				sharedPtrDestructorProc=&GuiControl::SharedPtrDestructorProc;
+				sharedPtrDestructorProc = &GuiControl::SharedPtrDestructorProc;
 			}
 
 			GuiControl::~GuiControl()
@@ -3521,7 +3521,7 @@ GuiControlHost
 
 				host=new GuiGraphicsHost;
 				host->GetMainComposition()->AddChild(GetStyleController()->GetBoundsComposition());
-				sharedPtrDestructorProc=0;
+				sharedPtrDestructorProc = 0;
 			}
 
 			GuiControlHost::~GuiControlHost()
@@ -32851,7 +32851,7 @@ GuiGraphicsComposition
 				,associatedCursor(0)
 				,associatedHitTestResult(INativeWindowListener::NoDecision)
 			{
-				sharedPtrDestructorProc=&GuiGraphicsComposition::SharedPtrDestructorProc;
+				sharedPtrDestructorProc = &GuiGraphicsComposition::SharedPtrDestructorProc;
 			}
 
 			GuiGraphicsComposition::~GuiGraphicsComposition()
@@ -43354,7 +43354,7 @@ GuiResourceFolder
 			}
 		}
 
-		void GuiResourceFolder::LoadResourceFolderFromBinary(DelayLoadingList& delayLoadings, stream::internal::Reader& reader, collections::List<WString>& typeNames, collections::List<WString>& errors)
+		void GuiResourceFolder::LoadResourceFolderFromBinary(DelayLoadingList& delayLoadings, stream::internal::ContextFreeReader& reader, collections::List<WString>& typeNames, collections::List<WString>& errors)
 		{
 			vint count = 0;
 			reader << count;
@@ -43453,7 +43453,7 @@ GuiResourceFolder
 			}
 		}
 
-		void GuiResourceFolder::SaveResourceFolderToBinary(stream::internal::Writer& writer, collections::List<WString>& typeNames)
+		void GuiResourceFolder::SaveResourceFolderToBinary(stream::internal::ContextFreeWriter& writer, collections::List<WString>& typeNames)
 		{
 			typedef Tuple<vint, WString, IGuiResourceTypeResolver_DirectLoadStream*, Ptr<DescriptableObject>> ItemTuple;
 			List<ItemTuple> itemTuples;
@@ -43788,7 +43788,7 @@ GuiResource
 
 		Ptr<GuiResource> GuiResource::LoadPrecompiledBinary(stream::IStream& stream, collections::List<WString>& errors)
 		{
-			stream::internal::Reader reader(stream);
+			stream::internal::ContextFreeReader reader(stream);
 			auto resource = MakePtr<GuiResource>();
 
 			List<WString> typeNames;
@@ -43803,7 +43803,7 @@ GuiResource
 
 		void GuiResource::SavePrecompiledBinary(stream::IStream& stream)
 		{
-			stream::internal::Writer writer(stream);
+			stream::internal::ContextFreeWriter writer(stream);
 
 			List<WString> typeNames;
 			CollectTypeNames(typeNames);
@@ -44204,7 +44204,7 @@ Image Type Resolver (Image)
 			void SerializePrecompiled(Ptr<DescriptableObject> resource, stream::IStream& stream)override
 			{
 				auto obj = resource.Cast<GuiImageData>();
-				stream::internal::Writer writer(stream);
+				stream::internal::ContextFreeWriter writer(stream);
 				FileStream fileStream(obj->GetFilePath(), FileStream::ReadOnly);
 				writer << (stream::IStream&)fileStream;
 			}
@@ -44242,7 +44242,7 @@ Image Type Resolver (Image)
 
 			Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
 			{
-				stream::internal::Reader reader(stream);
+				stream::internal::ContextFreeReader reader(stream);
 				MemoryStream memoryStream;
 				reader << (stream::IStream&)memoryStream;
 
@@ -44314,7 +44314,7 @@ Text Type Resolver (Text)
 			void SerializePrecompiled(Ptr<DescriptableObject> resource, stream::IStream& stream)override
 			{
 				auto obj = resource.Cast<GuiTextData>();
-				stream::internal::Writer writer(stream);
+				stream::internal::ContextFreeWriter writer(stream);
 				WString text = obj->GetText();
 				writer << text;
 			}
@@ -44340,7 +44340,7 @@ Text Type Resolver (Text)
 
 			Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
 			{
-				stream::internal::Reader reader(stream);
+				stream::internal::ContextFreeReader reader(stream);
 				WString text;
 				reader << text;
 				return new GuiTextData(text);
@@ -44408,7 +44408,7 @@ Xml Type Resolver (Xml)
 					StreamReader reader(buffer);
 					WString text = reader.ReadToEnd();
 
-					stream::internal::Writer writer(stream);
+					stream::internal::ContextFreeWriter writer(stream);
 					writer << text;
 				}
 			}
@@ -44444,7 +44444,7 @@ Xml Type Resolver (Xml)
 
 			Ptr<DescriptableObject> ResolveResourcePrecompiled(stream::IStream& stream, collections::List<WString>& errors)override
 			{
-				stream::internal::Reader reader(stream);
+				stream::internal::ContextFreeReader reader(stream);
 				WString text;
 				reader << text;
 

Import/GacUIWindows.cpp

@@ -2104,7 +2104,7 @@ ControllerListener
 							}
 						}
 #if _DEBUG
-						CHECK_ERROR(d3d11Device, L"Direct2DWindowsNativeControllerListener::NativeWindowCreated(INativeWindow*)#Failed to create Direct3D 11 Device.");
+						CHECK_ERROR(d3d11Device, L"Direct2DWindowsNativeControllerListener::NativeWindowCreated(INativeWindow*)#Failed to create Direct3D 11 Device. This error will be skipped under Release mode, but you still need to check your Windows SDK Installation.");
 #endif
 					}
 

Tutorial/GacUI_ControlTemplate/BlackSkin/Main.cpp

@@ -17,7 +17,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/BlackSkin.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_Controls/ContainersAndButtons/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/ContainersAndButtons.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_Controls/TextEditor/Main.cpp

@@ -17,7 +17,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/TextEditor.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_HelloWorlds/CppXml/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/CppXml.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	helloworld::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_HelloWorlds/GacUI_HelloWorlds.sln

@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppXml", "CppXml\CppXml.vcx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MVVM", "MVVM\MVVM.vcxproj", "{3EC7E343-4D10-4E6B-B5EE-485B38AFAD85}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUIComplete", "..\Lib\GacUIComplete\GacUIComplete.vcxproj", "{3AEC5E1A-482F-41B1-8598-C02321621A64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -47,6 +49,10 @@ Global
 		{3EC7E343-4D10-4E6B-B5EE-485B38AFAD85}.Debug|Win32.Build.0 = Debug|Win32
 		{3EC7E343-4D10-4E6B-B5EE-485B38AFAD85}.Release|Win32.ActiveCfg = Release|Win32
 		{3EC7E343-4D10-4E6B-B5EE-485B38AFAD85}.Release|Win32.Build.0 = Release|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Debug|Win32.Build.0 = Debug|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Release|Win32.ActiveCfg = Release|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -54,5 +60,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{8018D622-66BA-4E65-9D03-BDAC37EA9A54} = {A01236E9-92C5-424F-B564-DBF1A9F94E7F}
 		{96C559CA-9718-4BEC-A053-28A0AB6A8CA2} = {A01236E9-92C5-424F-B564-DBF1A9F94E7F}
+		{3AEC5E1A-482F-41B1-8598-C02321621A64} = {A01236E9-92C5-424F-B564-DBF1A9F94E7F}
 	EndGlobalSection
 EndGlobal

Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj

@@ -85,11 +85,6 @@
     <ClCompile Include="UI\Source\HelloWorldPartialClasses.cpp" />
     <ClCompile Include="UI\Source\MainWindow.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Lib\GacUI\GacUI.vcxproj">
-      <Project>{8018d622-66ba-4e65-9d03-bdac37ea9a54}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Xml Include="UI\MainWindow.xml" />
     <Xml Include="UI\Resource.xml" />
@@ -100,6 +95,11 @@
     <ClInclude Include="UI\Source\HelloWorldPartialClasses.h" />
     <ClInclude Include="UI\Source\MainWindow.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Lib\GacUI\GacUI.vcxproj">
+      <Project>{8018d622-66ba-4e65-9d03-bdac37ea9a54}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Tutorial/GacUI_HelloWorlds/MVVM/Main.cpp

@@ -80,7 +80,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/MVVM.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	auto viewModel = MakePtr<ViewModel>();
 	auto window = new helloworld::MainWindow(viewModel);

Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp

@@ -1,4 +1,4 @@
-#include <GacUIReflection.h>
+#include <GacUICompiler.h>
 #include <Windows.h>
 
 using namespace vl::parsing;

Tutorial/GacUI_Layout/Alignment/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/Alignment.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_Layout/Flow/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/Flow.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_Layout/Flow/UI/Resource.xml

@@ -47,14 +47,14 @@
           <ev.Clicked-eval>
             <![CDATA[
             {
-              for (item in flowLayout.FlowItems)
+              for (flowItem in flowLayout.FlowItems)
               {
-                item.ExtraMargin = cast Margin "";
+                flowItem.ExtraMargin = cast Margin "";
               }
             
-              var item = cast (FlowItem*) sender.Parent;
+              var selectedItem = cast (FlowItem*) sender.Parent;
-              item.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10";
+              selectedItem.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10";
-              flowLayout.MoveChild(item, flowLayout.FlowItems.Count - 1);
+              flowLayout.MoveChild(selectedItem, flowLayout.FlowItems.Count - 1);
             }
           ]]>
           </ev.Clicked-eval>

Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp

@@ -24,7 +24,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/RichTextEmbedding.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window(new ViewModel);
 	window.MoveToScreenCenter();

Tutorial/GacUI_Layout/Stack/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/Stack.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/GacUI_Layout/Stack/UI/Resource.xml

@@ -32,14 +32,14 @@
           <ev.Clicked-eval>
             <![CDATA[
             {
-              for (item in stackLayout.StackItems)
+              for (stackItem in stackLayout.StackItems)
               {
-                item.ExtraMargin = cast Margin "";
+                stackItem.ExtraMargin = cast Margin "";
               }
             
-              var item = cast (StackItem*) sender.Parent;
+              var selectedItem = cast (StackItem*) sender.Parent;
-              item.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10";
+              selectedItem.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10";
-              stackLayout.MoveChild(item, stackLayout.StackItems.Count - 1);
+              stackLayout.MoveChild(selectedItem, stackLayout.StackItems.Count - 1);
             }
           ]]>
           </ev.Clicked-eval>

Tutorial/GacUI_Layout/Table/Main.cpp

@@ -15,7 +15,7 @@ void GuiMain()
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/Table.bin", FileStream::ReadOnly);
 		auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors);
-		GetInstanceLoaderManager()->SetResource(L"Resource", resource);
+		GetInstanceResourceManager()->SetResource(L"Resource", resource);
 	}
 	demo::MainWindow window;
 	window.MoveToScreenCenter();

Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3AEC5E1A-482F-41B1-8598-C02321621A64}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>GacUIComplete</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GacUI\GacUI.vcxproj">
+      <Project>{8018d622-66ba-4e65-9d03-bdac37ea9a54}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Import\GacUICompiler.cpp" />
+    <ClCompile Include="..\..\..\Import\VlppWorkflowCompiler.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Import\GacUICompiler.h" />
+    <ClInclude Include="..\..\..\Import\VlppWorkflowCompiler.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj.filters

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Import\GacUICompiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Import\VlppWorkflowCompiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Import\GacUICompiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Import\VlppWorkflowCompiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

Tutorial/Lib/Lib.sln

@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUILite", "GacUILite\GacU
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUI", "GacUI\GacUI.vcxproj", "{8018D622-66BA-4E65-9D03-BDAC37EA9A54}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUIComplete", "GacUIComplete\GacUIComplete.vcxproj", "{3AEC5E1A-482F-41B1-8598-C02321621A64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -21,6 +23,10 @@ Global
 		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Debug|Win32.Build.0 = Debug|Win32
 		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Release|Win32.ActiveCfg = Release|Win32
 		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Release|Win32.Build.0 = Release|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Debug|Win32.Build.0 = Debug|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Release|Win32.ActiveCfg = Release|Win32
+		{3AEC5E1A-482F-41B1-8598-C02321621A64}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE