-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix build warnings and add net6 samples (#1676)
* Fix build warning * Update docs * Fix build failure * Fix test failure
- Loading branch information
Showing
56 changed files
with
44,332 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| *.min.css | ||
| *.rtl.css | ||
| *.esm.js | ||
| *.js.map | ||
| *.bundle.js | ||
| *.map |
13 changes: 13 additions & 0 deletions
13
samples/ChatSample/ChatSample.Net60/ChatSample.Net60.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\Microsoft.Azure.SignalR\Microsoft.Azure.SignalR.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using Microsoft.AspNetCore.SignalR; | ||
|
|
||
| namespace ChatSample.Net60.Hubs | ||
| { | ||
| public class ChatHub : Hub | ||
| { | ||
| public async Task SendMessage(string user, string message) | ||
| { | ||
| await Clients.All.SendAsync("ReceiveMessage", user, message); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| @page | ||
| @model ErrorModel | ||
| @{ | ||
| ViewData["Title"] = "Error"; | ||
| } | ||
|
|
||
| <h1 class="text-danger">Error.</h1> | ||
| <h2 class="text-danger">An error occurred while processing your request.</h2> | ||
|
|
||
| @if (Model.ShowRequestId) | ||
| { | ||
| <p> | ||
| <strong>Request ID:</strong> <code>@Model.RequestId</code> | ||
| </p> | ||
| } | ||
|
|
||
| <h3>Development Mode</h3> | ||
| <p> | ||
| Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred. | ||
| </p> | ||
| <p> | ||
| <strong>The Development environment shouldn't be enabled for deployed applications.</strong> | ||
| It can result in displaying sensitive information from exceptions to end users. | ||
| For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong> | ||
| and restarting the app. | ||
| </p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using System.Diagnostics; | ||
|
|
||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace ChatSample.Net60.Pages | ||
| { | ||
| [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] | ||
| [IgnoreAntiforgeryToken] | ||
| public class ErrorModel : PageModel | ||
| { | ||
| public string? RequestId { get; set; } | ||
|
|
||
| public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); | ||
|
|
||
| private readonly ILogger<ErrorModel> _logger; | ||
|
|
||
| public ErrorModel(ILogger<ErrorModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
| RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| @page | ||
| <div class="container"> | ||
| <div class="row"> </div> | ||
| <div class="row"> | ||
| <div class="col-2">User</div> | ||
| <div class="col-4"><input type="text" id="userInput" /></div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-2">Message</div> | ||
| <div class="col-4"><input type="text" id="messageInput" /></div> | ||
| </div> | ||
| <div class="row"> </div> | ||
| <div class="row"> | ||
| <div class="col-6"> | ||
| <input type="button" id="sendButton" value="Send Message" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-12"> | ||
| <hr /> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-6"> | ||
| <ul id="messagesList"></ul> | ||
| </div> | ||
| </div> | ||
| <script src="~/js/signalr/dist/browser/signalr.js"></script> | ||
| <script src="~/js/chat.js"></script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace ChatSample.Net60.Pages | ||
| { | ||
| public class IndexModel : PageModel | ||
| { | ||
| private readonly ILogger<IndexModel> _logger; | ||
|
|
||
| public IndexModel(ILogger<IndexModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| @page | ||
| @model PrivacyModel | ||
| @{ | ||
| ViewData["Title"] = "Privacy Policy"; | ||
| } | ||
| <h1>@ViewData["Title"]</h1> | ||
|
|
||
| <p>Use this page to detail your site's privacy policy.</p> |
19 changes: 19 additions & 0 deletions
19
samples/ChatSample/ChatSample.Net60/Pages/Privacy.cshtml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace ChatSample.Net60.Pages | ||
| { | ||
| public class PrivacyModel : PageModel | ||
| { | ||
| private readonly ILogger<PrivacyModel> _logger; | ||
|
|
||
| public PrivacyModel(ILogger<PrivacyModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
| } | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
samples/ChatSample/ChatSample.Net60/Pages/Shared/_Layout.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - ChatSample.Net60</title> | ||
| <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" /> | ||
| <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" /> | ||
| <link rel="stylesheet" href="~/ChatSample.Net60.styles.css" asp-append-version="true" /> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> | ||
| <div class="container"> | ||
| <a class="navbar-brand" asp-area="" asp-page="/Index">ChatSample.Net60</a> | ||
| <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent" | ||
| aria-expanded="false" aria-label="Toggle navigation"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
| <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between"> | ||
| <ul class="navbar-nav flex-grow-1"> | ||
| <li class="nav-item"> | ||
| <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
| </header> | ||
| <div class="container"> | ||
| <main role="main" class="pb-3"> | ||
| @RenderBody() | ||
| </main> | ||
| </div> | ||
|
|
||
| <footer class="border-top footer text-muted"> | ||
| <div class="container"> | ||
| © 2022 - ChatSample.Net60 - <a asp-area="" asp-page="/Privacy">Privacy</a> | ||
| </div> | ||
| </footer> | ||
|
|
||
| <script src="~/lib/jquery/dist/jquery.min.js"></script> | ||
| <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script> | ||
| <script src="~/js/site.js" asp-append-version="true"></script> | ||
|
|
||
| @await RenderSectionAsync("Scripts", required: false) | ||
| </body> | ||
| </html> |
48 changes: 48 additions & 0 deletions
48
samples/ChatSample/ChatSample.Net60/Pages/Shared/_Layout.cshtml.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* Please see documentation at https://docs.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; | ||
| } |
Oops, something went wrong.