From dd3f6db0cb3c242758ab0000a0513e093f02531c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 18 十一月 2021 13:11:32 +0800
Subject: [PATCH] 合并成功
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 203c887..50014a3 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -3,32 +3,33 @@
<MonoDevelop.MacDev.AppleDevelopmentTeam />
</MonoDevelop.Ide.ItemProperties.SiriIntentUI>
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.ItemProperties.SiriIntents FirstBuild="True">
+ <MonoDevelop.Ide.ItemProperties.SiriIntents>
<MonoDevelop.MacDev.AppleDevelopmentTeam />
</MonoDevelop.Ide.ItemProperties.SiriIntents>
- <MonoDevelop.Ide.Workbench ActiveDocument="SiriIntents/IntentHandler.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SiriBinding/obj/Debug/iOS/HdlSiri/HDLRunSceneIntent.g.cs">
<Files>
<File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="35" />
- <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="35" Column="1" />
- <File FileName="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" Line="25" Column="2" />
- <File FileName="SiriBinding/ApiDefinition.cs" Line="8" Column="18" />
- <File FileName="SiriBinding/Structs.cs" Line="19" Column="1" />
- <File FileName="SiriIntents/IntentHandler.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="18" Column="36" />
+ <File FileName="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" Line="34" Column="101" />
+ <File FileName="SiriBinding/Structs.cs" />
+ <File FileName="SiriIntents/IntentHandler.cs" />
+ <File FileName="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" Line="23" Column="45" />
+ <File FileName="SiriBinding/obj/Debug/iOS/HdlSiri/HDLRunSceneIntent.g.cs" Line="63" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="SiriIntents" expanded="True">
- <Node name="IntentHandler.cs" selected="True" />
+ <Node name="HDL-ON_iOS" selected="True" />
+ <Node name="SiriBinding" expanded="True">
+ <Node name="NativeReferenceFolder" expanded="True" />
</Node>
- <Node name="SiriIntentsUI" expanded="True" />
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.SiriIntentsUI FirstBuild="True">
+ <MonoDevelop.Ide.ItemProperties.SiriIntentsUI>
<MonoDevelop.MacDev.AppleDevelopmentTeam />
</MonoDevelop.Ide.ItemProperties.SiriIntentsUI>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
@@ -37,7 +38,6 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
<String>SiriIntent/SiriIntent.csproj</String>
- <String>SiriBinding/SiriBinding.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
--
Gitblit v1.8.0