Skip to content

Commit 3e21e50

Browse files
andrewconnellandrewconnell
committed
Merge branch 'fy2019q4-refresh' of git://github.com/rob-windsor/msgraph-training-aspnetmvcapp into fy2019q4-refresh
2 parents 7b4859f + a29dd38 commit 3e21e50

File tree

160 files changed

+12988
-1936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+12988
-1936
lines changed

‎01 Create ASP.NET App.pptx‎

-22.8 KB
Binary file not shown.

‎02 Create AzureAD Application.pptx‎

132 KB
Binary file not shown.

‎03 Configure ASP.NET App for MS Graph.pptx‎

16.1 KB
Binary file not shown.

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

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28307.421
4+
VisualStudioVersion = 15.0.28307.106
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "graph-tutorial", "graph-tutorial\graph-tutorial.csproj", "{33BB3996-7036-4A40-A3CE-5AB3C78328A4}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "graph-tutorial", "graph-tutorial\graph-tutorial.csproj", "{2109344B-7EBC-435A-BF72-5948FA386D6A}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{33BB3996-7036-4A40-A3CE-5AB3C78328A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{33BB3996-7036-4A40-A3CE-5AB3C78328A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{33BB3996-7036-4A40-A3CE-5AB3C78328A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{33BB3996-7036-4A40-A3CE-5AB3C78328A4}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{2109344B-7EBC-435A-BF72-5948FA386D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{2109344B-7EBC-435A-BF72-5948FA386D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{2109344B-7EBC-435A-BF72-5948FA386D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{2109344B-7EBC-435A-BF72-5948FA386D6A}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {063630C1-8A68-4CF1-B472-EF3FC6A0C9B5}
23+
SolutionGuid = {FDE03EA5-AE40-4056-9C64-531A725D4C02}
2424
EndGlobalSection
2525
EndGlobal

‎Demos/01-create-app/graph-tutorial/App_Start/BundleConfig.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE in the project root for license information.
2-
using System.Web;
1+
using System.Web;
32
using System.Web.Optimization;
43

54
namespace graph_tutorial

‎Demos/01-create-app/graph-tutorial/App_Start/FilterConfig.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE in the project root for license information.
2-
using System.Web;
1+
using System.Web;
32
using System.Web.Mvc;
43

54
namespace graph_tutorial

‎Demos/01-create-app/graph-tutorial/App_Start/RouteConfig.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE in the project root for license information.
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.Linq;
54
using System.Web;

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

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

‎Demos/01-create-app/graph-tutorial/Content/Site.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
body {
1+
/*
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT license.
4+
*/
5+
6+
body {
27
padding-top: 4.5rem;
38
}
49

510
.alert-pre {
611
word-wrap: break-word;
712
word-break: break-all;
813
white-space: pre-wrap;
9-
}
14+
}

‎Demos/01-create-app/graph-tutorial/Controllers/BaseController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
3+
24
using graph_tutorial.Models;
35
using System.Collections.Generic;
46
using System.Web.Mvc;
@@ -7,7 +9,7 @@ namespace graph_tutorial.Controllers
79
{
810
public abstract class BaseController : Controller
911
{
10-
protected void Flash(string message, string debug=null)
12+
protected void Flash(string message, string debug = null)
1113
{
1214
var alerts = TempData.ContainsKey(Alert.AlertKey) ?
1315
(List<Alert>)TempData[Alert.AlertKey] :

0 commit comments

Comments
 (0)