Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
9d135b60
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9d135b60
编写于
10月 10, 2016
作者:
H
Heejae Chang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more code clean up - rename, add logging scope and etc
上级
af08805d
变更
12
展开全部
显示空白变更内容
内联
并排
Showing
12 changed file
with
124 addition
and
106 deletion
+124
-106
src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs
...RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs
+8
-5
src/VisualStudio/Core/Next/Remote/JsonRpcSession.cs
src/VisualStudio/Core/Next/Remote/JsonRpcSession.cs
+2
-2
src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs
...ore/Portable/Execution/ISolutionSynchronizationService.cs
+3
-3
src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs
...Core/Portable/Execution/SolutionSynchronizationService.cs
+7
-7
src/Workspaces/Core/Portable/Log/FunctionId.cs
src/Workspaces/Core/Portable/Log/FunctionId.cs
+7
-4
src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs
src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs
+1
-1
src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
...Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
+31
-27
src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs
...ore/Portable/Workspace/Solution/SolutionState_Checksum.cs
+10
-6
src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs
...Portable/Workspace/Solution/TextDocumentState_Checksum.cs
+9
-5
src/Workspaces/CoreTest/Execution/Extensions.cs
src/Workspaces/CoreTest/Execution/Extensions.cs
+2
-2
src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs
...paces/CoreTest/Execution/SnapshotSerializationTestBase.cs
+3
-3
src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs
...rkspaces/CoreTest/Execution/SnapshotSerializationTests.cs
+41
-41
未找到文件。
src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs
浏览文件 @
9d135b60
...
@@ -3,11 +3,11 @@
...
@@ -3,11 +3,11 @@
using
System.Threading
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis
;
using
Microsoft.CodeAnalysis
;
using
Microsoft.CodeAnalysis.Execution
;
using
Microsoft.CodeAnalysis.Notification
;
using
Microsoft.CodeAnalysis.Notification
;
using
Microsoft.CodeAnalysis.Remote
;
using
Microsoft.CodeAnalysis.Remote
;
using
Microsoft.CodeAnalysis.Shared.TestHooks
;
using
Microsoft.CodeAnalysis.Shared.TestHooks
;
using
Microsoft.CodeAnalysis.SolutionCrawler
;
using
Microsoft.CodeAnalysis.SolutionCrawler
;
using
Microsoft.CodeAnalysis.Internal.Log
;
namespace
Microsoft.VisualStudio.LanguageServices.Remote
namespace
Microsoft.VisualStudio.LanguageServices.Remote
{
{
...
@@ -125,6 +125,8 @@ private async Task SynchronizeAssets()
...
@@ -125,6 +125,8 @@ private async Task SynchronizeAssets()
return
;
return
;
}
}
using
(
Logger
.
LogBlock
(
FunctionId
.
SolutionChecksumUpdater_SynchronizeAssets
,
ShutdownCancellationToken
))
{
var
solution
=
_service
.
Workspace
.
CurrentSolution
;
var
solution
=
_service
.
Workspace
.
CurrentSolution
;
using
(
var
session
=
await
remoteHostClient
.
CreateServiceSessionAsync
(
WellKnownRemoteHostServices
.
RemoteHostService
,
solution
,
ShutdownCancellationToken
).
ConfigureAwait
(
false
))
using
(
var
session
=
await
remoteHostClient
.
CreateServiceSessionAsync
(
WellKnownRemoteHostServices
.
RemoteHostService
,
solution
,
ShutdownCancellationToken
).
ConfigureAwait
(
false
))
{
{
...
@@ -132,6 +134,7 @@ private async Task SynchronizeAssets()
...
@@ -132,6 +134,7 @@ private async Task SynchronizeAssets()
await
session
.
InvokeAsync
(
WellKnownRemoteHostServices
.
RemoteHostService_SynchronizeAsync
).
ConfigureAwait
(
false
);
await
session
.
InvokeAsync
(
WellKnownRemoteHostServices
.
RemoteHostService_SynchronizeAsync
).
ConfigureAwait
(
false
);
}
}
}
}
}
private
static
void
CancelAndDispose
(
CancellationTokenSource
cancellationSource
)
private
static
void
CancelAndDispose
(
CancellationTokenSource
cancellationSource
)
{
{
...
...
src/VisualStudio/Core/Next/Remote/JsonRpcSession.cs
浏览文件 @
9d135b60
...
@@ -178,7 +178,7 @@ private async Task WriteOneAssetAsync(ObjectWriter writer, byte[] checksum)
...
@@ -178,7 +178,7 @@ private async Task WriteOneAssetAsync(ObjectWriter writer, byte[] checksum)
{
{
var
service
=
ChecksumScope
.
Workspace
.
Services
.
GetRequiredService
<
ISolutionSynchronizationService
>();
var
service
=
ChecksumScope
.
Workspace
.
Services
.
GetRequiredService
<
ISolutionSynchronizationService
>();
var
checksumObject
=
service
.
Get
SynchronizationObject
(
new
Checksum
(
checksum
),
_source
.
Token
);
var
checksumObject
=
service
.
Get
RemotableData
(
new
Checksum
(
checksum
),
_source
.
Token
);
writer
.
WriteInt32
(
1
);
writer
.
WriteInt32
(
1
);
writer
.
WriteValue
(
checksum
);
writer
.
WriteValue
(
checksum
);
...
@@ -191,7 +191,7 @@ private async Task WriteMultipleAssetsAsync(ObjectWriter writer, byte[][] checks
...
@@ -191,7 +191,7 @@ private async Task WriteMultipleAssetsAsync(ObjectWriter writer, byte[][] checks
{
{
var
service
=
ChecksumScope
.
Workspace
.
Services
.
GetRequiredService
<
ISolutionSynchronizationService
>();
var
service
=
ChecksumScope
.
Workspace
.
Services
.
GetRequiredService
<
ISolutionSynchronizationService
>();
var
checksumObjectMap
=
service
.
Get
SynchronizationObjects
(
checksums
.
Select
(
c
=>
new
Checksum
(
c
)),
_source
.
Token
);
var
checksumObjectMap
=
service
.
Get
RemotableData
(
checksums
.
Select
(
c
=>
new
Checksum
(
c
)),
_source
.
Token
);
writer
.
WriteInt32
(
checksumObjectMap
.
Count
);
writer
.
WriteInt32
(
checksumObjectMap
.
Count
);
foreach
(
var
kv
in
checksumObjectMap
)
foreach
(
var
kv
in
checksumObjectMap
)
...
...
src/Workspaces/Core/Portable/Execution/ISolutionSynchronizationService.cs
浏览文件 @
9d135b60
...
@@ -37,16 +37,16 @@ internal interface ISolutionSynchronizationService : IWorkspaceService
...
@@ -37,16 +37,16 @@ internal interface ISolutionSynchronizationService : IWorkspaceService
/// <summary>
/// <summary>
/// Create <see cref="PinnedRemotableDataScope"/> from <see cref="Solution"/>.
/// Create <see cref="PinnedRemotableDataScope"/> from <see cref="Solution"/>.
/// </summary>
/// </summary>
Task
<
PinnedRemotableDataScope
>
Create
Synchronization
ScopeAsync
(
Solution
solution
,
CancellationToken
cancellationToken
);
Task
<
PinnedRemotableDataScope
>
Create
PinnedRemotableData
ScopeAsync
(
Solution
solution
,
CancellationToken
cancellationToken
);
/// <summary>
/// <summary>
/// Get <see cref="RemotableData"/> corresponding to given <see cref="Checksum"/>.
/// Get <see cref="RemotableData"/> corresponding to given <see cref="Checksum"/>.
/// </summary>
/// </summary>
RemotableData
Get
SynchronizationObject
(
Checksum
checksum
,
CancellationToken
cancellationToken
);
RemotableData
Get
RemotableData
(
Checksum
checksum
,
CancellationToken
cancellationToken
);
/// <summary>
/// <summary>
/// Get <see cref="RemotableData"/>s corresponding to given <see cref="Checksum"/>s.
/// Get <see cref="RemotableData"/>s corresponding to given <see cref="Checksum"/>s.
/// </summary>
/// </summary>
IReadOnlyDictionary
<
Checksum
,
RemotableData
>
Get
SynchronizationObjects
(
IEnumerable
<
Checksum
>
checksums
,
CancellationToken
cancellationToken
);
IReadOnlyDictionary
<
Checksum
,
RemotableData
>
Get
RemotableData
(
IEnumerable
<
Checksum
>
checksums
,
CancellationToken
cancellationToken
);
}
}
}
}
src/Workspaces/Core/Portable/Execution/SolutionSynchronizationService.cs
浏览文件 @
9d135b60
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
namespace
Microsoft.CodeAnalysis.Execution
namespace
Microsoft.CodeAnalysis.Execution
{
{
[
ExportWorkspaceServiceFactory
(
typeof
(
ISolutionSynchronizationService
)),
Shared
]
[
ExportWorkspaceServiceFactory
(
typeof
(
ISolutionSynchronizationService
)),
Shared
]
internal
class
Solution
Checksum
ServiceFactory
:
IWorkspaceServiceFactory
internal
class
Solution
Synchronization
ServiceFactory
:
IWorkspaceServiceFactory
{
{
private
readonly
AssetStorages
_assetStorages
=
new
AssetStorages
();
private
readonly
AssetStorages
_assetStorages
=
new
AssetStorages
();
...
@@ -49,9 +49,9 @@ public void RemoveGlobalAsset(object value, CancellationToken cancellationToken)
...
@@ -49,9 +49,9 @@ public void RemoveGlobalAsset(object value, CancellationToken cancellationToken)
_assetStorages
.
RemoveGlobalAsset
(
value
,
cancellationToken
);
_assetStorages
.
RemoveGlobalAsset
(
value
,
cancellationToken
);
}
}
public
async
Task
<
PinnedRemotableDataScope
>
Create
Synchronization
ScopeAsync
(
Solution
solution
,
CancellationToken
cancellationToken
)
public
async
Task
<
PinnedRemotableDataScope
>
Create
PinnedRemotableData
ScopeAsync
(
Solution
solution
,
CancellationToken
cancellationToken
)
{
{
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
ChecksumServiceFactory_CreateChecksum
Async
,
cancellationToken
))
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
SynchronizationServiceFactory_CreatePinnedRemotableDataScope
Async
,
cancellationToken
))
{
{
var
storage
=
_assetStorages
.
CreateStorage
(
solution
.
State
);
var
storage
=
_assetStorages
.
CreateStorage
(
solution
.
State
);
var
checksum
=
await
solution
.
State
.
GetChecksumAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
checksum
=
await
solution
.
State
.
GetChecksumAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
...
@@ -61,17 +61,17 @@ public async Task<PinnedRemotableDataScope> CreateSynchronizationScopeAsync(Solu
...
@@ -61,17 +61,17 @@ public async Task<PinnedRemotableDataScope> CreateSynchronizationScopeAsync(Solu
}
}
}
}
public
RemotableData
Get
SynchronizationObject
(
Checksum
checksum
,
CancellationToken
cancellationToken
)
public
RemotableData
Get
RemotableData
(
Checksum
checksum
,
CancellationToken
cancellationToken
)
{
{
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
ChecksumServiceFactory_GetChecksumObject
,
Checksum
.
GetChecksumLogInfo
,
checksum
,
cancellationToken
))
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
SynchronizationServiceFactory_GetRemotableData
,
Checksum
.
GetChecksumLogInfo
,
checksum
,
cancellationToken
))
{
{
return
_assetStorages
.
GetSynchronizationObject
(
checksum
,
cancellationToken
);
return
_assetStorages
.
GetSynchronizationObject
(
checksum
,
cancellationToken
);
}
}
}
}
public
IReadOnlyDictionary
<
Checksum
,
RemotableData
>
Get
SynchronizationObjects
(
IEnumerable
<
Checksum
>
checksums
,
CancellationToken
cancellationToken
)
public
IReadOnlyDictionary
<
Checksum
,
RemotableData
>
Get
RemotableData
(
IEnumerable
<
Checksum
>
checksums
,
CancellationToken
cancellationToken
)
{
{
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
ChecksumServiceFactory_GetChecksumObjects
,
Checksum
.
GetChecksumsLogInfo
,
checksums
,
cancellationToken
))
using
(
Logger
.
LogBlock
(
FunctionId
.
Solution
SynchronizationServiceFactory_GetRemotableData
,
Checksum
.
GetChecksumsLogInfo
,
checksums
,
cancellationToken
))
{
{
return
_assetStorages
.
GetSynchronizationObjects
(
checksums
,
cancellationToken
);
return
_assetStorages
.
GetSynchronizationObjects
(
checksums
,
cancellationToken
);
}
}
...
...
src/Workspaces/Core/Portable/Log/FunctionId.cs
浏览文件 @
9d135b60
...
@@ -335,8 +335,9 @@ internal enum FunctionId
...
@@ -335,8 +335,9 @@ internal enum FunctionId
RemoteHostClientService_RemoveGlobalAssets
,
RemoteHostClientService_RemoveGlobalAssets
,
RemoteHostClientService_Enabled
,
RemoteHostClientService_Enabled
,
ServiceHubRemoteHostClient_CreateAsync
,
ServiceHubRemoteHostClient_CreateAsync
,
SolutionChecksumServiceFactory_CreateChecksumAsync
,
SolutionSynchronizationServiceFactory_CreatePinnedRemotableDataScopeAsync
,
SolutionChecksumServiceFactory_GetChecksumObject
,
SolutionSynchronizationServiceFactory_GetRemotableData
,
Serializer_CreateChecksum
,
Serializer_Serialize
,
Serializer_Serialize
,
Serializer_Deserialize
,
Serializer_Deserialize
,
CodeAnalysisService_CalculateDiagnosticsAsync
,
CodeAnalysisService_CalculateDiagnosticsAsync
,
...
@@ -349,11 +350,13 @@ internal enum FunctionId
...
@@ -349,11 +350,13 @@ internal enum FunctionId
AssetService_TryGetAsset
,
AssetService_TryGetAsset
,
AssetService_SynchronizeAssetsAsync
,
AssetService_SynchronizeAssetsAsync
,
AssetService_SynchronizeSolutionAssetsAsync
,
AssetService_SynchronizeSolutionAssetsAsync
,
SolutionChecksumServiceFactory_GetChecksumObjects
,
CodeAnalysisService_GetReferenceCountAsync
,
CodeAnalysisService_GetReferenceCountAsync
,
CodeAnalysisService_FindReferenceLocationsAsync
,
CodeAnalysisService_FindReferenceLocationsAsync
,
CodeAnalysisService_FindReferenceMethodsAsync
,
CodeAnalysisService_FindReferenceMethodsAsync
,
CodeAnalysisService_GetFullyQualifiedName
,
CodeAnalysisService_GetFullyQualifiedName
,
Serializer_CreateChecksum
,
SolutionChecksumUpdater_SynchronizeAssets
,
SolutionState_ComputeChecksumsAsync
,
ProjectState_ComputeChecksumsAsync
,
DocumentState_ComputeChecksumsAsync
,
}
}
}
}
src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs
浏览文件 @
9d135b60
...
@@ -34,7 +34,7 @@ public async Task<Session> CreateServiceSessionAsync(string serviceName, Solutio
...
@@ -34,7 +34,7 @@ public async Task<Session> CreateServiceSessionAsync(string serviceName, Solutio
Contract
.
ThrowIfFalse
(
solution
.
Workspace
==
_workspace
);
Contract
.
ThrowIfFalse
(
solution
.
Workspace
==
_workspace
);
var
service
=
_workspace
.
Services
.
GetService
<
ISolutionSynchronizationService
>();
var
service
=
_workspace
.
Services
.
GetService
<
ISolutionSynchronizationService
>();
var
snapshot
=
await
service
.
Create
Synchronization
ScopeAsync
(
solution
,
cancellationToken
).
ConfigureAwait
(
false
);
var
snapshot
=
await
service
.
Create
PinnedRemotableData
ScopeAsync
(
solution
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
CreateServiceSessionAsync
(
serviceName
,
snapshot
,
callbackTarget
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
CreateServiceSessionAsync
(
serviceName
,
snapshot
,
callbackTarget
,
cancellationToken
).
ConfigureAwait
(
false
);
}
}
...
...
src/Workspaces/Core/Portable/Workspace/Solution/ProjectState_Checksum.cs
浏览文件 @
9d135b60
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
using
System.Threading
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Internal.Log
;
namespace
Microsoft.CodeAnalysis
namespace
Microsoft.CodeAnalysis
{
{
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
}
}
private
async
Task
<
ProjectStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
private
async
Task
<
ProjectStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
{
using
(
Logger
.
LogBlock
(
FunctionId
.
ProjectState_ComputeChecksumsAsync
,
FilePath
,
cancellationToken
))
{
{
// get states by id order to have deterministic checksum
// get states by id order to have deterministic checksum
var
documentChecksumsTasks
=
DocumentIds
.
Select
(
id
=>
DocumentStates
[
id
].
GetChecksumAsync
(
cancellationToken
));
var
documentChecksumsTasks
=
DocumentIds
.
Select
(
id
=>
DocumentStates
[
id
].
GetChecksumAsync
(
cancellationToken
));
...
@@ -51,4 +54,5 @@ private async Task<ProjectStateChecksums> ComputeChecksumsAsync(CancellationToke
...
@@ -51,4 +54,5 @@ private async Task<ProjectStateChecksums> ComputeChecksumsAsync(CancellationToke
new
TextDocumentChecksumCollection
(
additionalChecksums
));
new
TextDocumentChecksumCollection
(
additionalChecksums
));
}
}
}
}
}
}
}
src/Workspaces/Core/Portable/Workspace/Solution/SolutionState_Checksum.cs
浏览文件 @
9d135b60
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
using
System.Threading
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Internal.Log
;
namespace
Microsoft.CodeAnalysis
namespace
Microsoft.CodeAnalysis
{
{
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
}
}
private
async
Task
<
SolutionStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
private
async
Task
<
SolutionStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
{
using
(
Logger
.
LogBlock
(
FunctionId
.
SolutionState_ComputeChecksumsAsync
,
FilePath
,
cancellationToken
))
{
{
// get states by id order to have deterministic checksum
// get states by id order to have deterministic checksum
var
projectChecksumTasks
=
ProjectIds
.
Select
(
id
=>
ProjectStates
[
id
].
GetChecksumAsync
(
cancellationToken
));
var
projectChecksumTasks
=
ProjectIds
.
Select
(
id
=>
ProjectStates
[
id
].
GetChecksumAsync
(
cancellationToken
));
...
@@ -32,4 +35,5 @@ private async Task<SolutionStateChecksums> ComputeChecksumsAsync(CancellationTok
...
@@ -32,4 +35,5 @@ private async Task<SolutionStateChecksums> ComputeChecksumsAsync(CancellationTok
return
new
SolutionStateChecksums
(
infoChecksum
,
new
ProjectChecksumCollection
(
projectChecksums
));
return
new
SolutionStateChecksums
(
infoChecksum
,
new
ProjectChecksumCollection
(
projectChecksums
));
}
}
}
}
}
}
}
src/Workspaces/Core/Portable/Workspace/Solution/TextDocumentState_Checksum.cs
浏览文件 @
9d135b60
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Serialization
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Internal.Log
;
namespace
Microsoft.CodeAnalysis
namespace
Microsoft.CodeAnalysis
{
{
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
...
@@ -21,6 +22,8 @@ public async Task<Checksum> GetChecksumAsync(CancellationToken cancellationToken
}
}
private
async
Task
<
DocumentStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
private
async
Task
<
DocumentStateChecksums
>
ComputeChecksumsAsync
(
CancellationToken
cancellationToken
)
{
using
(
Logger
.
LogBlock
(
FunctionId
.
DocumentState_ComputeChecksumsAsync
,
FilePath
,
cancellationToken
))
{
{
var
textTask
=
GetTextAsync
(
cancellationToken
);
var
textTask
=
GetTextAsync
(
cancellationToken
);
...
@@ -32,4 +35,5 @@ private async Task<DocumentStateChecksums> ComputeChecksumsAsync(CancellationTok
...
@@ -32,4 +35,5 @@ private async Task<DocumentStateChecksums> ComputeChecksumsAsync(CancellationTok
return
new
DocumentStateChecksums
(
infoChecksum
,
textChecksum
);
return
new
DocumentStateChecksums
(
infoChecksum
,
textChecksum
);
}
}
}
}
}
}
}
src/Workspaces/CoreTest/Execution/Extensions.cs
浏览文件 @
9d135b60
...
@@ -17,8 +17,8 @@ internal static class Extensions
...
@@ -17,8 +17,8 @@ internal static class Extensions
{
{
public
static
async
Task
<
T
>
GetValueAsync
<
T
>(
this
ISolutionSynchronizationService
service
,
Checksum
checksum
)
public
static
async
Task
<
T
>
GetValueAsync
<
T
>(
this
ISolutionSynchronizationService
service
,
Checksum
checksum
)
{
{
var
syncService
=
(
Solution
Checksum
ServiceFactory
.
Service
)
service
;
var
syncService
=
(
Solution
Synchronization
ServiceFactory
.
Service
)
service
;
var
syncObject
=
service
.
Get
SynchronizationObject
(
checksum
,
CancellationToken
.
None
);
var
syncObject
=
service
.
Get
RemotableData
(
checksum
,
CancellationToken
.
None
);
using
(
var
stream
=
SerializableBytes
.
CreateWritableStream
())
using
(
var
stream
=
SerializableBytes
.
CreateWritableStream
())
using
(
var
writer
=
new
ObjectWriter
(
stream
))
using
(
var
writer
=
new
ObjectWriter
(
stream
))
...
...
src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs
浏览文件 @
9d135b60
...
@@ -115,8 +115,8 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv
...
@@ -115,8 +115,8 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv
Func
<
T
,
string
,
Serializer
,
RemotableData
>
assetGetter
)
Func
<
T
,
string
,
Serializer
,
RemotableData
>
assetGetter
)
{
{
// re-create asset from object
// re-create asset from object
var
syncService
=
(
Solution
Checksum
ServiceFactory
.
Service
)
service
;
var
syncService
=
(
Solution
Synchronization
ServiceFactory
.
Service
)
service
;
var
syncObject
=
service
.
Get
SynchronizationObject
(
checksum
,
CancellationToken
.
None
);
var
syncObject
=
service
.
Get
RemotableData
(
checksum
,
CancellationToken
.
None
);
var
recoveredValue
=
await
service
.
GetValueAsync
<
T
>(
checksum
);
var
recoveredValue
=
await
service
.
GetValueAsync
<
T
>(
checksum
);
var
recreatedSyncObject
=
assetGetter
(
recoveredValue
,
kind
,
syncService
.
Serializer_TestOnly
);
var
recreatedSyncObject
=
assetGetter
(
recoveredValue
,
kind
,
syncService
.
Serializer_TestOnly
);
...
@@ -258,7 +258,7 @@ internal static void VerifySnapshotInService(ISolutionSynchronizationService sna
...
@@ -258,7 +258,7 @@ internal static void VerifySnapshotInService(ISolutionSynchronizationService sna
internal
static
void
VerifyChecksumInService
(
ISolutionSynchronizationService
snapshotService
,
Checksum
checksum
,
string
kind
)
internal
static
void
VerifyChecksumInService
(
ISolutionSynchronizationService
snapshotService
,
Checksum
checksum
,
string
kind
)
{
{
Assert
.
NotNull
(
checksum
);
Assert
.
NotNull
(
checksum
);
var
otherObject
=
snapshotService
.
Get
SynchronizationObject
(
checksum
,
CancellationToken
.
None
);
var
otherObject
=
snapshotService
.
Get
RemotableData
(
checksum
,
CancellationToken
.
None
);
ChecksumEqual
(
checksum
,
kind
,
otherObject
.
Checksum
,
otherObject
.
Kind
);
ChecksumEqual
(
checksum
,
kind
,
otherObject
.
Checksum
,
otherObject
.
Kind
);
}
}
...
...
src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs
浏览文件 @
9d135b60
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录