Skip to content

Commit 867a062

Browse files
jasonjohjasonjoh
authored
Merge pull request #55 from andrewconnell/refresh-fy20q4-msgraph-aspnetmvcapp
[fy20q4 module refresh]
2 parents 62a0c23 + 9a124ac commit 867a062

File tree

17 files changed

+80
-63
lines changed

17 files changed

+80
-63
lines changed

‎01 Create ASP.NET App.pptx‎

14 Bytes
Binary file not shown.

‎Demos/01-create-app/graph-tutorial/Web.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
https://go.microsoft.com/fwlink/?LinkId=301880
55
-->
66
<configuration>
7-
<appSettings>
7+
<appSettings file="PrivateSettings.config">
88
<add key="webpages:Version" value="3.0.0.0" />
99
<add key="webpages:Enabled" value="false" />
1010
<add key="ClientValidationEnabled" value="true" />
@@ -52,8 +52,8 @@
5252
</runtime>
5353
<system.codedom>
5454
<compilers>
55-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
56-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
55+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
56+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
5757
</compilers>
5858
</system.codedom>
5959
</configuration>

‎Demos/01-create-app/graph-tutorial/graph-tutorial.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
4-
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
4+
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,7 +26,7 @@
2626
<UseGlobalApplicationHostFile />
2727
<NuGetPackageImportStamp>
2828
</NuGetPackageImportStamp>
29-
<TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
29+
<TypeScriptToolsVersion>3.8</TypeScriptToolsVersion>
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3232
<DebugSymbols>true</DebugSymbols>
@@ -184,7 +184,7 @@
184184
</ItemGroup>
185185
<ItemGroup>
186186
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
187-
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
187+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
188188
</Reference>
189189
</ItemGroup>
190190
<ItemGroup>
@@ -388,7 +388,7 @@
388388
<PropertyGroup>
389389
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
390390
</PropertyGroup>
391-
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
391+
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
392392
</Target>
393393
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
394394
Other similar extension points exist, see Microsoft.Common.targets.

‎Demos/01-create-app/graph-tutorial/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Antlr" version="3.5.0.2" targetFramework="net472" />
4-
<package id="bootstrap" version="4.4.1" targetFramework="net472" />
4+
<package id="bootstrap" version="4.5.0" targetFramework="net472" />
55
<package id="jQuery" version="3.4.1" targetFramework="net472" />
66
<package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
77
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
88
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
99
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
1010
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
11-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net472" />
12-
<package id="Microsoft.Graph" version="1.21.0" targetFramework="net472" />
13-
<package id="Microsoft.Graph.Core" version="1.19.0" targetFramework="net472" />
14-
<package id="Microsoft.Identity.Client" version="4.9.0" targetFramework="net472" />
11+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
12+
<package id="Microsoft.Graph" version="3.6.0" targetFramework="net472" />
13+
<package id="Microsoft.Graph.Core" version="1.20.1" targetFramework="net472" />
14+
<package id="Microsoft.Identity.Client" version="4.14.0" targetFramework="net472" />
1515
<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.3.0" targetFramework="net472" />
1616
<package id="Microsoft.IdentityModel.Logging" version="5.3.0" targetFramework="net472" />
1717
<package id="Microsoft.IdentityModel.Protocols" version="5.3.0" targetFramework="net472" />

‎Demos/02-add-aad-auth/graph-tutorial/Helpers/GraphHelper.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4+
using graph_tutorial.Models;
45
using Microsoft.Graph;
56
using System.Net.Http.Headers;
67
using System.Threading.Tasks;
@@ -9,7 +10,7 @@ namespace graph_tutorial.Helpers
910
{
1011
public static class GraphHelper
1112
{
12-
public static async Task<User> GetUserDetailsAsync(string accessToken)
13+
public static async Task<CachedUser> GetUserDetailsAsync(string accessToken)
1314
{
1415
var graphClient = new GraphServiceClient(
1516
new DelegateAuthenticationProvider(

‎Demos/02-add-aad-auth/graph-tutorial/Models/CachedUser.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
3+
4+
namespace graph_tutorial.Models
5+
{
6+
// Simple class to serialize user details
7+
public class CachedUser
8+
{
9+
public string DisplayName { get; set; }
10+
public string Email { get; set; }
11+
public string Avatar { get; set; }
12+
}
13+
}

‎Demos/02-add-aad-auth/graph-tutorial/TokenStorage/SessionTokenStore.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4+
using graph_tutorial.Models;
45
using Microsoft.Identity.Client;
56
using Newtonsoft.Json;
67
using System.Security.Claims;
@@ -9,14 +10,6 @@
910

1011
namespace graph_tutorial.TokenStorage
1112
{
12-
// Simple class to serialize into the session
13-
public class CachedUser
14-
{
15-
public string DisplayName { get; set; }
16-
public string Email { get; set; }
17-
public string Avatar { get; set; }
18-
}
19-
2013
public class SessionTokenStore
2114
{
2215
private static readonly ReaderWriterLockSlim sessionLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);

‎Demos/02-add-aad-auth/graph-tutorial/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
</runtime>
5353
<system.codedom>
5454
<compilers>
55-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
56-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
55+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
56+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
5757
</compilers>
5858
</system.codedom>
5959
</configuration>

‎Demos/02-add-aad-auth/graph-tutorial/graph-tutorial.csproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
4-
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
4+
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,7 +26,7 @@
2626
<UseGlobalApplicationHostFile />
2727
<NuGetPackageImportStamp>
2828
</NuGetPackageImportStamp>
29-
<TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
29+
<TypeScriptToolsVersion>3.8</TypeScriptToolsVersion>
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3232
<DebugSymbols>true</DebugSymbols>
@@ -48,14 +48,14 @@
4848
</PropertyGroup>
4949
<ItemGroup>
5050
<Reference Include="Microsoft.CSharp" />
51-
<Reference Include="Microsoft.Graph, Version=1.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.Graph.1.21.0\lib\net45\Microsoft.Graph.dll</HintPath>
51+
<Reference Include="Microsoft.Graph, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.Graph.3.6.0\lib\net461\Microsoft.Graph.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Graph.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microsoft.Graph.Core.1.19.0\lib\net45\Microsoft.Graph.Core.dll</HintPath>
54+
<Reference Include="Microsoft.Graph.Core, Version=1.20.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Microsoft.Graph.Core.1.20.1\lib\net45\Microsoft.Graph.Core.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Microsoft.Identity.Client, Version=4.9.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Microsoft.Identity.Client.4.9.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
57+
<Reference Include="Microsoft.Identity.Client, Version=4.14.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Microsoft.Identity.Client.4.14.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.5.3.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
@@ -184,7 +184,7 @@
184184
</ItemGroup>
185185
<ItemGroup>
186186
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
187-
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
187+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
188188
</Reference>
189189
</ItemGroup>
190190
<ItemGroup>
@@ -200,6 +200,7 @@
200200
</Compile>
201201
<Compile Include="Helpers\GraphHelper.cs" />
202202
<Compile Include="Models\Alert.cs" />
203+
<Compile Include="Models\CachedUser.cs" />
203204
<Compile Include="Properties\AssemblyInfo.cs" />
204205
<Compile Include="Startup.cs" />
205206
<Compile Include="TokenStorage\SessionTokenStore.cs" />
@@ -394,7 +395,7 @@
394395
<PropertyGroup>
395396
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
396397
</PropertyGroup>
397-
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
398+
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
398399
</Target>
399400
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
400401
Other similar extension points exist, see Microsoft.Common.targets.

‎Demos/02-add-aad-auth/graph-tutorial/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Antlr" version="3.5.0.2" targetFramework="net472" />
4-
<package id="bootstrap" version="4.4.1" targetFramework="net472" />
4+
<package id="bootstrap" version="4.5.0" targetFramework="net472" />
55
<package id="jQuery" version="3.4.1" targetFramework="net472" />
66
<package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
77
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
88
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
99
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
1010
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
11-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net472" />
12-
<package id="Microsoft.Graph" version="1.21.0" targetFramework="net472" />
13-
<package id="Microsoft.Graph.Core" version="1.19.0" targetFramework="net472" />
14-
<package id="Microsoft.Identity.Client" version="4.9.0" targetFramework="net472" />
11+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
12+
<package id="Microsoft.Graph" version="3.6.0" targetFramework="net472" />
13+
<package id="Microsoft.Graph.Core" version="1.20.1" targetFramework="net472" />
14+
<package id="Microsoft.Identity.Client" version="4.14.0" targetFramework="net472" />
1515
<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.3.0" targetFramework="net472" />
1616
<package id="Microsoft.IdentityModel.Logging" version="5.3.0" targetFramework="net472" />
1717
<package id="Microsoft.IdentityModel.Protocols" version="5.3.0" targetFramework="net472" />

0 commit comments

Comments
 (0)