From 461047f04af1ec773f5e6f0de672a875f5d9dc77 Mon Sep 17 00:00:00 2001
From: Ralph Wessel <ralph@speckle.systems>
Date: Thu, 12 Sep 2024 00:10:03 +0100
Subject: [PATCH] Updated VS projects Updated gitignore for temp resource files

---
 .gitignore                                    |  4 ++-
 SpeckleConnector/Connector.vcxproj            |  4 +++
 SpeckleConnector/Connector.vcxproj.filters    | 12 +++++++
 .../Database/Model/Card/CardSetting.h         |  2 +-
 SpeckleLib/SpeckleLib17.vcxproj               |  9 +++++
 SpeckleLib/SpeckleLib17.vcxproj.filters       | 33 +++++++++++++++++++
 6 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4677eaf..3230d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@ CMakeFiles/
 XCBuildData/
 **/*.xcsettings
 *.log
-.idea
\ No newline at end of file
+.idea
+*.mui
+*.aps
\ No newline at end of file
diff --git a/SpeckleConnector/Connector.vcxproj b/SpeckleConnector/Connector.vcxproj
index 355ea9f..5c34307 100644
--- a/SpeckleConnector/Connector.vcxproj
+++ b/SpeckleConnector/Connector.vcxproj
@@ -93,6 +93,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Connector\Connector.cpp" />
+    <ClCompile Include="Connector\Database\Model\Card\CardSetting.cpp" />
+    <ClCompile Include="Connector\Database\Model\Card\ModelCard.cpp" />
     <ClCompile Include="Connector\Database\Model\Card\ModelCardDatabase.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.cpp" />
@@ -124,6 +126,8 @@
   <ItemGroup>
     <ClInclude Include="Connector\Connector.h" />
     <ClInclude Include="Connector\ConnectorResource.h" />
+    <ClInclude Include="Connector\Database\Model\Card\CardSetting.h" />
+    <ClInclude Include="Connector\Database\Model\Card\ModelCard.h" />
     <ClInclude Include="Connector\Database\Model\Card\ModelCardDatabase.h" />
     <ClInclude Include="Connector\Event\ConnectorEventID.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.h" />
diff --git a/SpeckleConnector/Connector.vcxproj.filters b/SpeckleConnector/Connector.vcxproj.filters
index 2303713..d63175d 100644
--- a/SpeckleConnector/Connector.vcxproj.filters
+++ b/SpeckleConnector/Connector.vcxproj.filters
@@ -162,6 +162,12 @@
     <ClCompile Include="Connector\Interface\Browser\Bridge\Send\Arg\SendFilter.cpp">
       <Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
     </ClCompile>
+    <ClCompile Include="Connector\Database\Model\Card\CardSetting.cpp">
+      <Filter>Connector\Database\Model\Card</Filter>
+    </ClCompile>
+    <ClCompile Include="Connector\Database\Model\Card\ModelCard.cpp">
+      <Filter>Connector\Database\Model\Card</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Connector\ConnectorResource.h">
@@ -255,5 +261,11 @@
     <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendFilter.h">
       <Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
     </ClInclude>
+    <ClInclude Include="Connector\Database\Model\Card\CardSetting.h">
+      <Filter>Connector\Database\Model\Card</Filter>
+    </ClInclude>
+    <ClInclude Include="Connector\Database\Model\Card\ModelCard.h">
+      <Filter>Connector\Database\Model\Card</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SpeckleConnector/Connector/Database/Model/Card/CardSetting.h b/SpeckleConnector/Connector/Database/Model/Card/CardSetting.h
index 752dc51..37ca2da 100644
--- a/SpeckleConnector/Connector/Database/Model/Card/CardSetting.h
+++ b/SpeckleConnector/Connector/Database/Model/Card/CardSetting.h
@@ -91,7 +91,7 @@ namespace connector::database {
 		
 	private:
 			///A unique ID for the setting
-		speckle::utility::String m_ID = {speckle::utility::Guid{true}};
+		speckle::utility::String m_ID = {active::utility::Guid{true}.operator active::utility::String()};
 			///The model ID
 		speckle::utility::String m_title;
 			///The project ID
diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj
index 8a2bf4a..e79772c 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj
+++ b/SpeckleLib/SpeckleLib17.vcxproj
@@ -23,11 +23,17 @@
     <ClInclude Include="Speckle\Database\Content\Record.h" />
     <ClInclude Include="Speckle\Database\Identity\Index.h" />
     <ClInclude Include="Speckle\Database\Identity\Link.h" />
+    <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.h" />
+    <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreEngine.h" />
     <ClInclude Include="Speckle\Environment\Addon.h" />
     <ClInclude Include="Speckle\Environment\Platform.h" />
+    <ClInclude Include="Speckle\Event\Subscriber\DocStoreSubscriber.h" />
     <ClInclude Include="Speckle\Event\Subscriber\MenuSubscriber.h" />
+    <ClInclude Include="Speckle\Event\Subscriber\ProjectSubscriber.h" />
     <ClInclude Include="Speckle\Event\Subscriber\SelectionSubscriber.h" />
+    <ClInclude Include="Speckle\Event\Type\DocStoreMergeEvent.h" />
     <ClInclude Include="Speckle\Event\Type\MenuEvent.h" />
+    <ClInclude Include="Speckle\Event\Type\ProjectEvent.h" />
     <ClInclude Include="Speckle\Event\Type\SelectionEvent.h" />
     <ClInclude Include="Speckle\Interface\Browser\Bridge\BridgeArgument.h" />
     <ClInclude Include="Speckle\Interface\Browser\Bridge\BridgeArgumentWrap.h" />
@@ -61,9 +67,12 @@
     <ClCompile Include="Speckle\Database\AccountDatabase.cpp" />
     <ClCompile Include="Speckle\Database\Content\Record.cpp" />
     <ClCompile Include="Speckle\Database\Identity\Link.cpp" />
+    <ClCompile Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.cpp" />
     <ClCompile Include="Speckle\Environment\Addon.cpp" />
     <ClCompile Include="Speckle\Environment\Platform.cpp" />
+    <ClCompile Include="Speckle\Event\Subscriber\DocStoreSubscriber.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\MenuSubscriber.cpp" />
+    <ClCompile Include="Speckle\Event\Subscriber\ProjectSubscriber.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\SelectionSubscriber.cpp" />
     <ClCompile Include="Speckle\Interface\Browser\Bridge\BridgeArgument.cpp" />
     <ClCompile Include="Speckle\Interface\Browser\Bridge\BridgeArgumentWrap.cpp" />
diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters
index 90c6412..078a9b6 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj.filters
+++ b/SpeckleLib/SpeckleLib17.vcxproj.filters
@@ -56,6 +56,12 @@
     <Filter Include="Speckle\Database\Identity">
       <UniqueIdentifier>{ef1710f6-d890-4286-8fb2-f5c432a2c5ac}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Speckle\Database\Storage">
+      <UniqueIdentifier>{afbc554e-df7d-4310-a967-4df8e9febcd0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Speckle\Database\Storage\DocumentStore">
+      <UniqueIdentifier>{c4146af8-d1a1-44cc-9810-cc8da1a705a8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Speckle\Environment\Addon.h">
@@ -169,6 +175,24 @@
     <ClInclude Include="Speckle\Environment\Platform.h">
       <Filter>Speckle\Environment</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Event\Subscriber\DocStoreSubscriber.h">
+      <Filter>Speckle\Event\Subscriber</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Event\Subscriber\ProjectSubscriber.h">
+      <Filter>Speckle\Event\Subscriber</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Event\Type\DocStoreMergeEvent.h">
+      <Filter>Speckle\Event\Type</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Event\Type\ProjectEvent.h">
+      <Filter>Speckle\Event\Type</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.h">
+      <Filter>Speckle\Database\Storage\DocumentStore</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreEngine.h">
+      <Filter>Speckle\Database\Storage\DocumentStore</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -237,6 +261,15 @@
     <ClCompile Include="Speckle\Environment\Platform.cpp">
       <Filter>Speckle\Environment</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Event\Subscriber\DocStoreSubscriber.cpp">
+      <Filter>Speckle\Event\Subscriber</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Event\Subscriber\ProjectSubscriber.cpp">
+      <Filter>Speckle\Event\Subscriber</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.cpp">
+      <Filter>Speckle\Database\Storage\DocumentStore</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">