Skip to content
This repository was archived by the owner on Dec 13, 2019. It is now read-only.

Commit a8d10f8

Browse files
jmprieurjmprieur
authored
Merge pull request #16 from Azure-Samples/upgradeToDotNet3-18
Upgrade the sample to ADAL.NET 3.18 and the latest VS 2017 release
2 parents 80c8384 + 29ea5fc commit a8d10f8

File tree

12 files changed

+64
-46
lines changed

12 files changed

+64
-46
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,3 +183,4 @@ UpgradeLog*.htm
183183
FakesAssemblies/
184184
/.vs/NativeClient-MultiTarget-DotNet/v15/sqlite3
185185
/.vs/config
186+
/.vs/NativeClient-MultiTarget-DotNet/v15/Server/sqlite3

‎DirSearchClient-Android/DirSearchClient-Android.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1919
<RestorePackages>true</RestorePackages>
20-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
2121
</PropertyGroup>
2222
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2323
<DebugSymbols>true</DebugSymbols>
@@ -39,11 +39,11 @@
3939
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\MonoAndroid10\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
42+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\MonoAndroid7\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\MonoAndroid10\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
45+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\MonoAndroid7\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Mono.Android" />
4949
<Reference Include="mscorlib" />

‎DirSearchClient-Android/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.16.1" targetFramework="monoandroid70" />
3+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.18.0" targetFramework="monoandroid80" />
44
</packages>

‎DirSearchClient-Desktop/DirSearchClient-Desktop.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<ErrorReport>prompt</ErrorReport>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
37+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
3939
</Reference>
40-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
40+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Data" />

‎DirSearchClient-Desktop/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.16.1" targetFramework="net45" />
3+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.18.0" targetFramework="net45" />
44
</packages>

‎DirSearchClient-Universal/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Microsoft.ApplicationInsights": "1.0.0",
44
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
55
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
6-
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.16.1",
6+
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.18.0",
77
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
88
},
99
"frameworks": {

‎DirSearchClient-Universal/project.lock.json‎

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"lib/netcore50/Microsoft.CSharp.dll": {}
6464
}
6565
},
66-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
66+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
6767
"type": "package",
6868
"compile": {
6969
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -1995,7 +1995,7 @@
19951995
"lib/netcore50/Microsoft.CSharp.dll": {}
19961996
}
19971997
},
1998-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
1998+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
19991999
"type": "package",
20002000
"compile": {
20012001
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -3784,7 +3784,7 @@
37843784
"lib/netcore50/Microsoft.CSharp.dll": {}
37853785
}
37863786
},
3787-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
3787+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
37883788
"type": "package",
37893789
"compile": {
37903790
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -5536,7 +5536,7 @@
55365536
"lib/netcore50/Microsoft.CSharp.dll": {}
55375537
}
55385538
},
5539-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
5539+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
55405540
"type": "package",
55415541
"compile": {
55425542
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -7332,7 +7332,7 @@
73327332
"lib/netcore50/Microsoft.CSharp.dll": {}
73337333
}
73347334
},
7335-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
7335+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
73367336
"type": "package",
73377337
"compile": {
73387338
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -9084,7 +9084,7 @@
90849084
"lib/netcore50/Microsoft.CSharp.dll": {}
90859085
}
90869086
},
9087-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
9087+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
90889088
"type": "package",
90899089
"compile": {
90909090
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -10880,7 +10880,7 @@
1088010880
"lib/netcore50/Microsoft.CSharp.dll": {}
1088110881
}
1088210882
},
10883-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
10883+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
1088410884
"type": "package",
1088510885
"compile": {
1088610886
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll": {},
@@ -12659,15 +12659,15 @@
1265912659
"ref/xamarinmac20/_._"
1266012660
]
1266112661
},
12662-
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.16.1": {
12663-
"sha512": "bZeGAqMPk1FI0bzq2CPY9JoKql7GkOFLAnuZz4HaF7sgHxWpXorhDNtDr5BHNYlW2J1BxMlf1gD6uv30NfIdMQ==",
12662+
"Microsoft.IdentityModel.Clients.ActiveDirectory/3.18.0": {
12663+
"sha512": "P9MRzL1YkecRj/mk+NGl1kyKPm4yCT+RwgCQ7uke+MaRvFl7s/yS1+wUMt/E3hpd7FrryisCq9cQknJtlnSG1A==",
1266412664
"type": "package",
12665-
"path": "microsoft.identitymodel.clients.activedirectory/3.16.1",
12665+
"path": "microsoft.identitymodel.clients.activedirectory/3.18.0",
1266612666
"files": [
12667-
"lib/MonoAndroid10/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
12668-
"lib/MonoAndroid10/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
12669-
"lib/MonoAndroid10/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
12670-
"lib/MonoAndroid10/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
12667+
"lib/MonoAndroid7/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
12668+
"lib/MonoAndroid7/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
12669+
"lib/MonoAndroid7/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
12670+
"lib/MonoAndroid7/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
1267112671
"lib/Xamarin.iOS10/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
1267212672
"lib/Xamarin.iOS10/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
1267312673
"lib/Xamarin.iOS10/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
@@ -12680,12 +12680,19 @@
1268012680
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
1268112681
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
1268212682
"lib/netcore45/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
12683+
"lib/netstandard1.1/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
12684+
"lib/netstandard1.1/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
12685+
"lib/netstandard1.1/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
12686+
"lib/netstandard1.1/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
1268312687
"lib/netstandard1.3/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
12688+
"lib/netstandard1.3/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
1268412689
"lib/netstandard1.3/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
1268512690
"lib/netstandard1.3/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
12691+
"lib/portable-net45+win/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll",
12692+
"lib/portable-net45+win/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml",
1268612693
"lib/portable-net45+win/Microsoft.IdentityModel.Clients.ActiveDirectory.dll",
1268712694
"lib/portable-net45+win/Microsoft.IdentityModel.Clients.ActiveDirectory.xml",
12688-
"microsoft.identitymodel.clients.activedirectory.3.16.1.nupkg.sha512",
12695+
"microsoft.identitymodel.clients.activedirectory.3.18.0.nupkg.sha512",
1268912696
"microsoft.identitymodel.clients.activedirectory.nuspec"
1269012697
]
1269112698
},
@@ -15902,13 +15909,14 @@
1590215909
"Microsoft.ApplicationInsights >= 1.0.0",
1590315910
"Microsoft.ApplicationInsights.PersistenceChannel >= 1.0.0",
1590415911
"Microsoft.ApplicationInsights.WindowsApps >= 1.0.0",
15905-
"Microsoft.IdentityModel.Clients.ActiveDirectory >= 3.16.1",
15912+
"Microsoft.IdentityModel.Clients.ActiveDirectory >= 3.18.0",
1590615913
"Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0"
1590715914
],
1590815915
"UAP,Version=v10.0.10240": []
1590915916
},
1591015917
"packageFolders": {
15911-
"C:\\Users\\jmprieur\\.nuget\\packages\\": {}
15918+
"C:\\Users\\jmprieur\\.nuget\\packages\\": {},
15919+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\": {}
1591215920
},
1591315921
"project": {
1591415922
"restore": {
@@ -15919,13 +15927,16 @@
1591915927
"packagesPath": "C:\\Users\\jmprieur\\.nuget\\packages\\",
1592015928
"outputPath": "C:\\s\\active-directory-dotnet-native-multitarget\\DirSearchClient-Universal\\obj\\",
1592115929
"projectStyle": "ProjectJson",
15930+
"fallbackFolders": [
15931+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\"
15932+
],
1592215933
"configFilePaths": [
1592315934
"C:\\Users\\jmprieur\\AppData\\Roaming\\NuGet\\NuGet.Config",
15924-
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
15935+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
15936+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
1592515937
],
1592615938
"sources": {
1592715939
"C:\\Users\\jmprieur\\Desktop\\nuget": {},
15928-
"C:\\Users\\jmprieur\\Downloads\\21901-nuget-package\\21901-nuget-package": {},
1592915940
"https://api.nuget.org/v3/index.json": {},
1593015941
"https://www.myget.org/F/aad-clients-nightly/api/v2": {}
1593115942
},
@@ -15940,11 +15951,11 @@
1594015951
}
1594115952
},
1594215953
"dependencies": {
15943-
"Microsoft.ApplicationInsights": "1.0.0",
15944-
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
15945-
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
15946-
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.16.1",
15947-
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
15954+
"Microsoft.ApplicationInsights": "[1.0.0, )",
15955+
"Microsoft.ApplicationInsights.PersistenceChannel": "[1.0.0, )",
15956+
"Microsoft.ApplicationInsights.WindowsApps": "[1.0.0, )",
15957+
"Microsoft.IdentityModel.Clients.ActiveDirectory": "[3.18.0, )",
15958+
"Microsoft.NETCore.UniversalWindowsPlatform": "[5.0.0, )"
1594815959
},
1594915960
"frameworks": {
1595015961
"uap10.0.10240": {}

‎DirSearchClient-iOS/DirSearchClient-iOS.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
<BundleResource Include="Resources\Default-568h%402x.png" />
9090
</ItemGroup>
9191
<ItemGroup>
92-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\Xamarin.iOS10\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
92+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\Xamarin.iOS10\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
9494
</Reference>
95-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\Xamarin.iOS10\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
95+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\Xamarin.iOS10\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
9797
</Reference>
9898
<Reference Include="System" />
9999
<Reference Include="System.Xml" />

‎DirSearchClient-iOS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.16.1" targetFramework="xamarinios10" />
3+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.18.0" targetFramework="xamarinios10" />
44
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="monotouch1" />
55
</packages>

‎DirectorySearcherLib/DirectorySearcherLib.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@
4646
<None Include="packages.config" />
4747
</ItemGroup>
4848
<ItemGroup>
49-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.16.1.24801, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.16.1\lib\portable-net45+win\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
49+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\portable-net45+win\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
51+
</Reference>
52+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.18.0.2306, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.18.0\lib\portable-net45+win\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
5154
</Reference>
5255
<Reference Include="Newtonsoft.Json">
5356
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll</HintPath>

0 commit comments

Comments
 (0)