Skip to content

Commit 536b966

Browse files
jasonjohjasonjoh
authored
Merge pull request #15 from microsoftgraph/patch-6-14
Fixing build errors
2 parents fec6ab5 + 8a48ff3 commit 536b966

9 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎Client/Client.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,15 @@
2121

2222
namespace DeltaQueryClient
2323
{
24+
using Microsoft.Identity.Client;
2425
using System;
2526
using System.Collections.Generic;
2627
using System.Collections.Specialized;
27-
using System.Diagnostics.CodeAnalysis;
28-
using System.Globalization;
29-
using System.IO;
3028
using System.Linq;
3129
using System.Net;
32-
using System.Runtime.Serialization;
33-
using System.Runtime.Serialization.Json;
3430
using System.Text;
35-
using System.Web;
36-
using System.Web.Script.Serialization;
37-
using Microsoft.IdentityModel.Clients.ActiveDirectory;
38-
using Microsoft.Identity.Client;
3931
using System.Threading.Tasks;
40-
using System.Security.Claims;
32+
using System.Web.Script.Serialization;
4133

4234
/// <summary>
4335
/// Sample implementation of obtaining changes from graph using Delta Query.

‎Client/DeltaQueryClient.csproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,26 @@
5252
<None Include="packages.config" />
5353
</ItemGroup>
5454
<ItemGroup>
55-
<Reference Include="Microsoft.Identity.Client">
56-
<HintPath>..\..\..\..\CxCache\Microsoft.Identity.Client.1.1.2-preview0008\Microsoft.Identity.Client.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\..\CxCache\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\..\CxCache\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
64-
<Private>True</Private>
55+
<Reference Include="Microsoft.CSharp" />
56+
<Reference Include="Microsoft.Identity.Client, Version=1.1.4.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Microsoft.Identity.Client.1.1.4-preview0002\lib\net45\Microsoft.Identity.Client.dll</HintPath>
6558
</Reference>
6659
<Reference Include="System" />
6760
<Reference Include="System.Configuration" />
61+
<Reference Include="System.Data" />
62+
<Reference Include="System.Data.DataSetExtensions" />
63+
<Reference Include="System.Drawing" />
64+
<Reference Include="System.IdentityModel" />
65+
<Reference Include="System.Net.Http" />
6866
<Reference Include="System.Runtime.Serialization" />
6967
<Reference Include="System.Web" />
7068
<Reference Include="System.Web.Extensions" />
7169
<Reference Include="System.Windows.Forms" />
7270
<Reference Include="System.Xml" />
71+
<Reference Include="System.Xml.Linq" />
72+
</ItemGroup>
73+
<ItemGroup>
74+
<Analyzer Include="..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
7375
</ItemGroup>
7476
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7577
</Project>

‎Client/MsalAuthHelper.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121

2222
namespace DeltaQueryClient
2323
{
24+
using Microsoft.Identity.Client;
2425
using System;
2526
using System.Collections.Generic;
2627
using System.Threading.Tasks;
27-
using Microsoft.Identity.Client;
28-
using System.Windows.Forms;
2928
using System.Windows.Forms;
3029

3130
class MsalAuthHelper

‎Client/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
3+
<package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
4+
<package id="Microsoft.Identity.Client" version="1.1.4-preview0002" targetFramework="net45" />
45
</packages>

‎ConsoleApplication/DeltaQueryConsoleApplication.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,8 @@
7878
<None Include="app.config">
7979
<SubType>Designer</SubType>
8080
</None>
81-
<None Include="packages.config" />
8281
</ItemGroup>
8382
<ItemGroup>
84-
<Reference Include="Microsoft.Identity.Client, Version=1.1.2.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\..\CxCache\Microsoft.Identity.Client.1.1.2-preview0008\lib\net45\Microsoft.Identity.Client.dll</HintPath>
86-
<Private>True</Private>
87-
</Reference>
8883
<Reference Include="System" />
8984
<Reference Include="System.Configuration" />
9085
<Reference Include="System.Core" />

‎ConsoleApplication/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--Windows Azure AD tenant domain name-->
55
<add key="TenantDomainName" value="To be filled in"/>
66
<!--Service principal credentials-->
7-
<add key="AppPrincipalId" value="To be filled in"/>
7+
<add key="AppPrincipalId" value="edd4904c-ac06-4f13-b8b5-9ec799e82bd3"/>
88
<add key="AppVersion" value=""/>
99
<!-- Polling interval in seconds -->
1010
<add key="PullIntervalSec" value="60"/>

‎ConsoleApplication/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎DeltaQuerySample.sln‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28010.2003
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeltaQueryConsoleApplication", "ConsoleApplication\DeltaQueryConsoleApplication.csproj", "{FE14AE0B-4328-4633-ABFA-C87000175BD2}"
77
EndProject
@@ -35,4 +35,7 @@ Global
3535
GlobalSection(SolutionProperties) = preSolution
3636
HideSolutionNode = FALSE
3737
EndGlobalSection
38+
GlobalSection(ExtensibilityGlobals) = postSolution
39+
SolutionGuid = {19CAD7FA-EBFB-47E7-94ED-ECEE3661264B}
40+
EndGlobalSection
3841
EndGlobal

‎NuGet.config‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<packageRestore>
4+
<add key="enabled" value="True" />
5+
<add key="automatic" value="True" />
6+
</packageRestore>
7+
<packageSources>
8+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
9+
</packageSources>
10+
<config>
11+
<add key="repositoryPath" value=".\packages" />
12+
</config>
13+
</configuration>

0 commit comments

Comments
 (0)