Skip to content

Commit

Permalink
Merge branch 'net9'
Browse files Browse the repository at this point in the history
  • Loading branch information
damienbod committed Jan 2, 2025
2 parents b4a70a5 + eaa56b5 commit 7d1a57e
Show file tree
Hide file tree
Showing 8 changed files with 253 additions and 154 deletions.
18 changes: 8 additions & 10 deletions DeviceFlowWeb/DeviceFlowWeb.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<UserSecretsId>7953929f-5999-4847-b4b8-2f6cf964f467</UserSecretsId>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<PropertyGroup>
<DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\css\site.min.css;wwwroot\css\vendor.min.css;wwwroot\js\site.min.js;wwwroot\js\vendor-validation.min.js;wwwroot\js\vendor.min.js</DefaultItemExcludes>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="IdentityModel" Version="5.0.1" />
<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
</ItemGroup>

<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('node_modules') ">
Expand Down
3 changes: 2 additions & 1 deletion DeviceFlowWeb/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<link rel="stylesheet" href="~/css/vendor.min.css" asp-append-version="true" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
<link rel="stylesheet" href="~/css/fontawesome-free-5.4.1-web/css/all.min.css" asp-append-version="true" />
<link rel="stylesheet" href="~/DeviceFlowWeb.styles.css" asp-append-version="true" />
</head>
<body>
<header>
Expand Down Expand Up @@ -54,7 +55,7 @@

<footer class="border-top footer text-muted">
<div class="container">
&copy; 2023 - Microsoft Entra ID Device Flow Web
&copy; 2025 - Microsoft Entra ID Device Flow Web
</div>
</footer>

Expand Down
48 changes: 48 additions & 0 deletions DeviceFlowWeb/Pages/Shared/_Layout.cshtml.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */

a.navbar-brand {
white-space: normal;
text-align: center;
word-break: break-all;
}

a {
color: #0077cc;
}

.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.border-top {
border-top: 1px solid #e5e5e5;
}
.border-bottom {
border-bottom: 1px solid #e5e5e5;
}

.box-shadow {
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
}

button.accept-policy {
font-size: 1rem;
line-height: inherit;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
white-space: nowrap;
line-height: 60px;
}
144 changes: 101 additions & 43 deletions DeviceFlowWeb/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions DeviceFlowWeb/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"version": "1.0.0",
"version": "5.1.3",
"name": "asp.net",
"private": true,
"devDependencies": {
"bootstrap": "4.6.0",
"jquery": "3.6.0",
"bootstrap": "5.3.3",
"jquery": "3.7.1",
"jquery-ajax-unobtrusive": "3.2.6",
"jquery-validation": "1.19.3",
"jquery-validation-unobtrusive": "3.2.12"
},
"dependencies": {
"popper.js": "^1.16.1"
"jquery-validation": "1.21.0",
"jquery-validation-unobtrusive": "4.0.0",
"popper.js": "^1.16.1",
"sweetalert2": "^11.6.16"
}
}
9 changes: 4 additions & 5 deletions DeviceFlowWeb/wwwroot/css/vendor.min.css

Large diffs are not rendered by default.

160 changes: 78 additions & 82 deletions DeviceFlowWeb/wwwroot/js/vendor-validation.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions DeviceFlowWeb/wwwroot/js/vendor.min.js

Large diffs are not rendered by default.

0 comments on commit 7d1a57e

Please sign in to comment.