Merge pull request #84 from xian-rong/master

Resolve warning issues
OfficeDev · Sep 25, 2024 · 871d797 · 871d797
2 parents 21e0433 + 6e0045c
commit 871d797
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config
@@ -3,45 +3,45 @@
   <!-- Note: Property values are case-insensitive unless otherwise specified.-->
   <appSettings>
     <!-- The browser used to access the site. The value should be one of following: IE32, IE64, Chrome, Firefox.-->
-    <add key="Browser" value="ie32" />
-    <add key="UserName" value="contoso\user1"/>
-    <add key="Password" value="XXXXXXXX"/>
-    <add key="OtherUserName" value="contoso\user2"/>
-    <add key="OtherPassword" value="XXXXXXXX"/>
-    <add key="BaseAddress" value="http://sut02" />
-    <add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx" />
-    <add key="Excel" value="..\..\..\Resource\Excel.xlsx" />
-    <add key="Word" value="..\..\..\Resource\Doc.docx" />
-    <add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one" />
-    <add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one" />
-    <add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2" />
-    <add key="OneEncryption" value="..\..\..\Resource\Encryption.one" />
+    <add key="Browser" value="ie32"/>
+    <add key="UserName" value=""/>
+    <add key="Password" value=""/>
+    <add key="OtherUserName" value=""/>
+    <add key="OtherPassword" value=""/>
+    <add key="BaseAddress" value="http://sut02"/>
+    <add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx"/>
+    <add key="Excel" value="..\..\..\Resource\Excel.xlsx"/>
+    <add key="Word" value="..\..\..\Resource\Doc.docx"/>
+    <add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one"/>
+    <add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one"/>
+    <add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2"/>
+    <add key="OneEncryption" value="..\..\..\Resource\Encryption.one"/>
     <!-- The default wait time when finding element.-->
-    <add key="DefaultWaitTime" value="30" />
-    <add key="UIWaitTime" value="15" />
+    <add key="DefaultWaitTime" value="30"/>
+    <add key="UIWaitTime" value="15"/>
     <!-- The capture tool setting.-->
-    <add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1" />
-    <add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1" />
-    <add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe" />
-    <add key="path" value="\\SUT02\Wenbo\aa.cap" />
-    <add key="defaultUserNameForFiddler" value="plugdevuser19" />
-    <add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler" />
-    <add key="BatPath" value="..\..\..\Resource\Converter.bat" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1"/>
+    <add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1"/>
+    <add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe"/>
+    <add key="path" value="\\SUT02\Wenbo\aa.cap"/>
+    <add key="defaultUserNameForFiddler" value="plugdevuser19"/>
+    <add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler"/>
+    <add key="BatPath" value="..\..\..\Resource\Converter.bat"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>
diff --git a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WOPIautomation</RootNamespace>
     <AssemblyName>WOPIautomation</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/MAPIInspector/Source/Parsers/MSOXPROPS.cs b/MAPIInspector/Source/Parsers/MSOXPROPS.cs
@@ -658,6 +658,11 @@ public enum PidTagPropertyEnum : ushort
         /// </summary>
         PidTagClientActions = 0x6645,
 
+        /// <summary>
+        /// Specifies the date and time, in UTC, until which the client expects to be actively editing the object.
+        /// </summary>
+        PidTagClientActivelyEditingUntil = 0x3700,
+
         /// <summary>
         /// Contains the current time, in UTC, when the email message is submitted.
         /// </summary>