Skip to content

Commit

Permalink
Update csproj and code with 1.11.1 sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
mingaliu committed Dec 30, 2016
1 parent d654c59 commit c683de3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions DocumentDBStudio/DocumentDBStudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Documents.Client">
<HintPath>..\packages\Microsoft.Azure.DocumentDB.1.10.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
<HintPath>..\packages\Microsoft.Azure.DocumentDB.1.11.1\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MimeSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down Expand Up @@ -285,12 +285,12 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Import Project="..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" />
<Import Project="..\packages\Microsoft.Azure.DocumentDB.1.11.1\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.11.1\build\Microsoft.Azure.DocumentDB.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.11.1\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.11.1\build\Microsoft.Azure.DocumentDB.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 4 additions & 2 deletions DocumentDBStudio/Nodes/DocumentCollectionNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,12 @@ public void FillWithChildren()

using (PerfStatus.Start("ReadDocumentFeed"))
{
var feedReader = _client.CreateDocumentFeedReader(((DocumentCollection)Tag).GetLink(_client), new FeedOptions { EnableCrossPartitionQuery = true });
IDocumentQuery<dynamic> feedReader = _client.CreateDocumentQuery((Tag as DocumentCollection).GetLink(_client), "Select * from c",
new FeedOptions { EnableCrossPartitionQuery = true }).AsDocumentQuery();

while (feedReader.HasMoreResults && docs.Count() < 100)
{
var response = feedReader.ExecuteNextAsync().Result;
FeedResponse<Document> response = feedReader.ExecuteNextAsync<Document>().Result;
docs.AddRange(response);

responseHeaders = response.ResponseHeaders;
Expand Down

0 comments on commit c683de3

Please sign in to comment.