Skip to content

Commit 1ed72f8

Browse files
pranavkmpranavkm
authored
Merge pull request #23631 from dotnet/prkrishn/merge-p7
Merge branch 'release/5.0-preview7' => 'master'
2 parents 035ab19 + c67ecd2 commit 1ed72f8

File tree

593 files changed

+2204
-788
lines changed

Some content is hidden

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

593 files changed

+2204
-788
lines changed

‎.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ indent_size = 4
3535
[*.sh]
3636
indent_size = 4
3737
end_of_line = lf
38+
39+
[*.{razor,cshtml}]
40+
charset = utf-8-bom

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "5.0.100-preview.6.20310.4"
3+
"version": "5.0.100-preview.7.20330.3"
44
},
55
"tools": {
6-
"dotnet": "5.0.100-preview.6.20310.4",
6+
"dotnet": "5.0.100-preview.7.20330.3",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.18",

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model AccessDeniedModel
33
@{
44
ViewData["Title"] = "Access denied";

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model ErrorModel
33
@{
44
ViewData["Title"] = "Error";

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model SignedOutModel
33
@{
44
ViewData["Title"] = "Signed out";

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@using Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal
1+
@using Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal
22
@namespace Microsoft.AspNetCore.Authentication.AzureAD.UI.Pages.Internal

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@using Microsoft.AspNetCore.Hosting
1+
@using Microsoft.AspNetCore.Hosting
22
@using Microsoft.AspNetCore.Mvc.ViewEngines
33

44
@inject IWebHostEnvironment Environment

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model AccessDeniedModel
33
@{
44
ViewData["Title"] = "Access denied";

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model ErrorModel
33
@{
44
ViewData["Title"] = "Error";

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page
1+
@page
22
@model SignedOutModel
33
@{
44
ViewData["Title"] = "Signed out";

0 commit comments

Comments
 (0)