Skip to content

Commit 871d797

Browse files
IvyLinMSIvyLinMS
authored
Merge pull request #84 from xian-rong/master
Resolve warning issues
2 parents 21e0433 + 6e0045c commit 871d797

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

‎FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
<!-- Note: Property values are case-insensitive unless otherwise specified.-->
44
<appSettings>
55
<!-- The browser used to access the site. The value should be one of following: IE32, IE64, Chrome, Firefox.-->
6-
<add key="Browser" value="ie32" />
7-
<add key="UserName" value="contoso\user1"/>
8-
<add key="Password" value="XXXXXXXX"/>
9-
<add key="OtherUserName" value="contoso\user2"/>
10-
<add key="OtherPassword" value="XXXXXXXX"/>
11-
<add key="BaseAddress" value="http://sut02" />
12-
<add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx" />
13-
<add key="Excel" value="..\..\..\Resource\Excel.xlsx" />
14-
<add key="Word" value="..\..\..\Resource\Doc.docx" />
15-
<add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one" />
16-
<add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one" />
17-
<add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2" />
18-
<add key="OneEncryption" value="..\..\..\Resource\Encryption.one" />
6+
<add key="Browser" value="ie32"/>
7+
<add key="UserName" value=""/>
8+
<add key="Password" value=""/>
9+
<add key="OtherUserName" value=""/>
10+
<add key="OtherPassword" value=""/>
11+
<add key="BaseAddress" value="http://sut02"/>
12+
<add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx"/>
13+
<add key="Excel" value="..\..\..\Resource\Excel.xlsx"/>
14+
<add key="Word" value="..\..\..\Resource\Doc.docx"/>
15+
<add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one"/>
16+
<add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one"/>
17+
<add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2"/>
18+
<add key="OneEncryption" value="..\..\..\Resource\Encryption.one"/>
1919
<!-- The default wait time when finding element.-->
20-
<add key="DefaultWaitTime" value="30" />
21-
<add key="UIWaitTime" value="15" />
20+
<add key="DefaultWaitTime" value="30"/>
21+
<add key="UIWaitTime" value="15"/>
2222
<!-- The capture tool setting.-->
23-
<add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1" />
24-
<add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1" />
25-
<add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe" />
26-
<add key="path" value="\\SUT02\Wenbo\aa.cap" />
27-
<add key="defaultUserNameForFiddler" value="plugdevuser19" />
28-
<add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler" />
29-
<add key="BatPath" value="..\..\..\Resource\Converter.bat" />
30-
<add key="ClientSettingsProvider.ServiceUri" value="" />
23+
<add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1"/>
24+
<add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1"/>
25+
<add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe"/>
26+
<add key="path" value="\\SUT02\Wenbo\aa.cap"/>
27+
<add key="defaultUserNameForFiddler" value="plugdevuser19"/>
28+
<add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler"/>
29+
<add key="BatPath" value="..\..\..\Resource\Converter.bat"/>
30+
<add key="ClientSettingsProvider.ServiceUri" value=""/>
3131
</appSettings>
3232
<startup>
33-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
33+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
3434
</startup>
3535
<system.web>
3636
<membership defaultProvider="ClientAuthenticationMembershipProvider">
3737
<providers>
38-
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
38+
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
3939
</providers>
4040
</membership>
4141
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
4242
<providers>
43-
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
43+
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
4444
</providers>
4545
</roleManager>
4646
</system.web>
47-
</configuration>
47+
</configuration>

‎FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>WOPIautomation</RootNamespace>
1010
<AssemblyName>WOPIautomation</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎MAPIInspector/Source/Parsers/MSOXPROPS.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,11 @@ public enum PidTagPropertyEnum : ushort
658658
/// </summary>
659659
PidTagClientActions = 0x6645,
660660

661+
/// <summary>
662+
/// Specifies the date and time, in UTC, until which the client expects to be actively editing the object.
663+
/// </summary>
664+
PidTagClientActivelyEditingUntil = 0x3700,
665+
661666
/// <summary>
662667
/// Contains the current time, in UTC, when the email message is submitted.
663668
/// </summary>

0 commit comments

Comments
 (0)