Skip to content

Commit 3b35ed9

Browse files
juliemturnerjuliemturner
committed
Update for .net framework 4.7.2
1 parent 2e2f354 commit 3b35ed9

File tree

18 files changed

+289
-442
lines changed

18 files changed

+289
-442
lines changed

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ build/
1212
bld/
1313
[Bb]in/
1414
[Oo]bj/
15-
[Cc]ontent/
16-
[Ss]cripts/
1715

1816
# MSTest test Results
1917
[Tt]est[Rr]esult*/
@@ -180,3 +178,9 @@ FakesAssemblies/
180178
PrivateSettings.config
181179
QSTemp/
182180
AspNetQuickStart.zip
181+
182+
# project specific
183+
**/Content/**
184+
!**/Content/Site.css
185+
Scripts/
186+

‎02 Create AzureAD Application.pptx‎

-35.1 KB
Binary file not shown.

‎Demos/01-create-app/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Completed module: Create an ASP.NET MVC web app
22

3-
The version of the project in this directory reflects completing the tutorial up through [Create an ASP.NET MVC web app](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=1). If you use this version of the project, you need to complete the rest of the tutorial starting at [Register the app in the portal](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=2).
3+
The version of the project in this directory reflects completing the tutorial up through [Create an ASP.NET MVC web app](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=1). If you use this version of the project, you need to complete the rest of the tutorial starting at [Register the app in the portal](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=2).
4+
5+
Installing NuGet packages adds content to the /packages, /Content & /Scripts folders. The files within the /Content & /Scripts folders frequently contain 3rd party libraries which do not include redistributable licenses. Therefore the files in these folders are not included in the repository. The NuGet restore process will not repopulate these folders, only a NuGet reinstall of the package will do that. Therefore you will need to reinstall all packages using the NuGet CLI to repopulate these folders if you want to run the final built solution locally. Refer to the following for more information: [Microsoft Docs – How to reinstall and update packages](https://docs.microsoft.com/en-us/nuget/consume-packages/reinstalling-and-updating-packages).”

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
body {
2+
padding-top: 4.5rem;
3+
}
4+
5+
.alert-pre {
6+
word-wrap: break-word;
7+
word-break: break-all;
8+
white-space: pre-wrap;
9+
}

‎Demos/01-create-app/graph-tutorial/Properties/AssemblyInfo.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.Reflection;
1+
using System.Reflection;
32
using System.Runtime.CompilerServices;
43
using System.Runtime.InteropServices;
54

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@
217217
<None Include="Scripts\jquery.validate-vsdoc.js" />
218218
<Content Include="Scripts\jquery.validate.js" />
219219
<Content Include="Scripts\jquery.validate.min.js" />
220-
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
221-
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
222-
<Content Include="Scripts\modernizr-2.8.3.js" />
223220
<Content Include="Scripts\popper-utils.js" />
224221
<Content Include="Scripts\popper-utils.min.js" />
225222
<Content Include="Scripts\popper.js" />

‎Demos/02-add-aad-auth/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
The version of the project in this directory reflects completing the tutorial up through [Add Azure AD authentication](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=3). If you use this version of the project, you need to complete the rest of the tutorial starting at [Get calendar data](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=4).
44

5+
Installing NuGet packages adds content to the /packages, /Content & /Scripts folders. The files within the /Content & /Scripts folders frequently contain 3rd party libraries which do not include redistributable licenses. Therefore the files in these folders are not included in the repository. The NuGet restore process will not repopulate these folders, only a NuGet reinstall of the package will do that. Therefore you will need to reinstall all packages using the NuGet CLI to repopulate these folders if you want to run the final built solution locally. Refer to the following for more information: [Microsoft Docs – How to reinstall and update packages](https://docs.microsoft.com/en-us/nuget/consume-packages/reinstalling-and-updating-packages).”
6+
57
> **Note:** It is assumed that you have already registered an application in the app registration portal as specified in [Register the app in the portal](https://docs.microsoft.com/graph/training/aspnet-tutorial?tutorial-step=2). You need to configure this version of the sample as follows:
68
>
79
> 1. Rename the `PrivateSettings.config.example` file to `PrivateSettings.config`.

‎Demos/02-add-aad-auth/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.28010.2003
4+
VisualStudioVersion = 15.0.28307.421
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "graph-tutorial", "graph-tutorial\graph-tutorial.csproj", "{5BE4C010-7F22-42E8-8500-E0A01FC0ACF7}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "graph-tutorial", "graph-tutorial\graph-tutorial.csproj", "{33BB3996-7036-4A40-A3CE-5AB3C78328A4}"
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-
{5BE4C010-7F22-42E8-8500-E0A01FC0ACF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{5BE4C010-7F22-42E8-8500-E0A01FC0ACF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{5BE4C010-7F22-42E8-8500-E0A01FC0ACF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{5BE4C010-7F22-42E8-8500-E0A01FC0ACF7}.Release|Any CPU.Build.0 = Release|Any CPU
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
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {233096A2-2324-4830-85F0-B7D66D06BB34}
23+
SolutionGuid = {063630C1-8A68-4CF1-B472-EF3FC6A0C9B5}
2424
EndGlobalSection
2525
EndGlobal

‎Demos/02-add-aad-auth/graph-tutorial/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("")]
1313
[assembly: AssemblyProduct("graph_tutorial")]
14-
[assembly: AssemblyCopyright("Copyright © 2018")]
14+
[assembly: AssemblyCopyright("Copyright © 2019")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717

@@ -21,7 +21,7 @@
2121
[assembly: ComVisible(false)]
2222

2323
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("be2725e7-0f9a-42d5-abff-4325c0373ef1")]
24+
[assembly: Guid("a47dfe0e-7809-4ce2-8621-ff09ba7f2478")]
2525

2626
// Version information for an assembly consists of the following four values:
2727
//

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

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,11 @@
1010
<add key="ClientValidationEnabled" value="true" />
1111
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1212
</appSettings>
13-
<!--
14-
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
15-
16-
The following attributes can be set on the <httpRuntime> tag.
17-
<system.Web>
18-
<httpRuntime targetFramework="4.7" />
19-
</system.Web>
20-
-->
2113
<system.web>
22-
<compilation debug="true" targetFramework="4.7" />
23-
<httpRuntime targetFramework="4.6.1" />
14+
<compilation debug="true" targetFramework="4.7.2" />
15+
<httpRuntime targetFramework="4.7.2" />
2416
<httpModules>
2517
<add name="TelemetryCorrelationHttpModule" type="Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation" />
26-
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
2718
</httpModules>
2819
</system.web>
2920
<runtime>
@@ -34,8 +25,8 @@
3425
</dependentAssembly>
3526
<dependentAssembly>
3627
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" />
37-
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
38-
</dependentAssembly>
28+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
29+
</dependentAssembly>
3930
<dependentAssembly>
4031
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
4132
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
@@ -49,56 +40,46 @@
4940
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
5041
</dependentAssembly>
5142
<dependentAssembly>
52-
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
53-
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
54-
</dependentAssembly>
55-
<dependentAssembly>
56-
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
57-
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
58-
</dependentAssembly>
59-
<dependentAssembly>
60-
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
61-
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
43+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
44+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
6245
</dependentAssembly>
6346
<dependentAssembly>
64-
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
65-
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
47+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
48+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
6649
</dependentAssembly>
6750
<dependentAssembly>
68-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
69-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
51+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
52+
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
7053
</dependentAssembly>
7154
<dependentAssembly>
72-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
73-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
55+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-5.4.0.0" newVersion="5.4.0.0" />
7457
</dependentAssembly>
7558
<dependentAssembly>
76-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
77-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
59+
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-5.4.0.0" newVersion="5.4.0.0" />
7861
</dependentAssembly>
7962
<dependentAssembly>
80-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
81-
<bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
63+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-5.4.0.0" newVersion="5.4.0.0" />
8265
</dependentAssembly>
8366
<dependentAssembly>
84-
<assemblyIdentity name="Microsoft.AspNet.TelemetryCorrelation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
85-
<bindingRedirect oldVersion="0.0.0.0-1.0.4.0" newVersion="1.0.4.0" />
67+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-5.4.0.0" newVersion="5.4.0.0" />
8669
</dependentAssembly>
8770
</assemblyBinding>
8871
</runtime>
8972
<system.webServer>
9073
<modules>
9174
<remove name="TelemetryCorrelationHttpModule" />
9275
<add name="TelemetryCorrelationHttpModule" type="Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation" preCondition="managedHandler" />
93-
<remove name="ApplicationInsightsWebTracking" />
94-
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
9576
</modules>
9677
<validation validateIntegratedModeConfiguration="false" />
9778
</system.webServer>
9879
<system.codedom>
9980
<compilers>
100-
<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" />
101-
<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+" />
81+
<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" />
82+
<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+" />
10283
</compilers>
10384
</system.codedom>
104-
</configuration>
85+
</configuration>

0 commit comments

Comments
 (0)