Skip to content

Commit

Permalink
.net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
joaofx committed Feb 22, 2024
1 parent 0753a07 commit 1de7f99
Show file tree
Hide file tree
Showing 82 changed files with 1,753 additions and 1,892 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: "7.0.404"
dotnet-version: "8.0.201"

- name: Build & Test
run: ./build test-ci
Expand All @@ -40,7 +40,7 @@ jobs:
# - name: Setup .NET
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: "7.0.404"
# dotnet-version: "8.0.201"
#
# - name: Setup Firefox
# uses: browser-actions/setup-firefox@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: "7.0.404"
dotnet-version: "8.0.201"

- name: Build & Publish
env:
Expand Down
14 changes: 0 additions & 14 deletions Miru.sln
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Miru.Redis", "src\Miru.Redi
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiruNext", "MiruNext", "{AA7CF007-C9C2-456F-9B0B-A0C7F4C12EAC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiruNext", "samples\MiruNext\src\MiruNext\MiruNext.csproj", "{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiruNext.Tests", "samples\MiruNext\tests\MiruNext.Tests\MiruNext.Tests.csproj", "{ACC4E197-44EE-40B3-8848-20F40BE22785}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -176,14 +172,6 @@ Global
{6C5D7514-60BF-4842-AABE-4BF618F05FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C5D7514-60BF-4842-AABE-4BF618F05FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C5D7514-60BF-4842-AABE-4BF618F05FFF}.Release|Any CPU.Build.0 = Release|Any CPU
{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55}.Release|Any CPU.Build.0 = Release|Any CPU
{ACC4E197-44EE-40B3-8848-20F40BE22785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACC4E197-44EE-40B3-8848-20F40BE22785}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACC4E197-44EE-40B3-8848-20F40BE22785}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACC4E197-44EE-40B3-8848-20F40BE22785}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -199,8 +187,6 @@ Global
{71AB9346-094B-4AC9-BAE3-E061F0742417} = {746A369D-7988-447F-BE6B-29CEC5D32C36}
{659708D1-CCCE-4994-AC66-4D0DCCC63295} = {746A369D-7988-447F-BE6B-29CEC5D32C36}
{B3920A7E-5A82-4122-ACFE-CA04ABEAB9DF} = {82032D85-4BA1-4F07-89CE-F95685393764}
{B33EB4D8-5F4D-4360-AAD8-F663B59A4E55} = {AA7CF007-C9C2-456F-9B0B-A0C7F4C12EAC}
{ACC4E197-44EE-40B3-8848-20F40BE22785} = {AA7CF007-C9C2-456F-9B0B-A0C7F4C12EAC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {61193018-93E9-471E-B8AE-1A5B27D527F3}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.404"
"version": "8.0.201"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

Expand All @@ -12,7 +12,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />

<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="115.0.5790.10200" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="121.0.6167.8500" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

Expand Down
14 changes: 0 additions & 14 deletions samples/MiruNext/src/MiruNext/Features/Home/HomeIndex.cs

This file was deleted.

26 changes: 26 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Home/HomeShow.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using MiruNext.Framework;

namespace MiruNext.Features.Home;

public class HomeShow
{
[AllowAnonymous]
[HttpGet("/")]
public class Handler : EndpointWithoutRequest
{
public override async Task HandleAsync(CancellationToken ct)
{
await this.View<Show>();
}
}

[AllowAnonymous]
[HttpGet("/2")]
public class Handler2 : EndpointWithoutRequest
{
public override async Task HandleAsync(CancellationToken ct)
{
await this.View<Show2>();
}
}
}
5 changes: 5 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Home/Show.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@layout MainLayout

<div class="text-center">
Welcome to Miru Next!
</div>
6 changes: 6 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Home/Show2.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@* @inherits Framework.Views.XComponent *@
@layout MainLayout

<div class="text-center">
Welcome to Miru Next!
</div>
57 changes: 57 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Layouts/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
@inherits LayoutComponentBase

<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8" />
<meta charset="utf-8" />
<meta content="ie=edge" http-equiv="x-ua-compatible" />
<meta name="handheldfriendly" content="true" />
<meta name="viewport" content="initial-scale=1, width=device-width" />
<link rel="icon" href="/images/icon.png" sizes="32x32" />

<link href="/css/app.css" rel="stylesheet" as="style" asp-append-version="true" />
<script src="/js/app.js" defer async="async" asp-append-version="true"></script>

</head>

<body class="d-flex flex-column min-vh-100 bg-white">

<nav class="navbar navbar-expand-lg bg-body-tertiary rounded" aria-label="Thirteenth navbar example">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarsExample11" aria-controls="navbarsExample11" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse d-lg-flex" id="navbarsExample11">
<a class="navbar-brand col-lg-3 me-0" href="#">Centered nav</a>
<ul class="navbar-nav col-lg-6 justify-content-lg-center">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" aria-disabled="true">Disabled</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Dropdown</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</li>
</ul>
<div class="d-lg-flex col-lg-3 justify-content-lg-end">
<button class="btn btn-primary">Button</button>
</div>
</div>
</div>
</nav>

@Body

</body>
</html>
9 changes: 0 additions & 9 deletions samples/MiruNext/src/MiruNext/Features/MiruEndpoint.cs

This file was deleted.

26 changes: 0 additions & 26 deletions samples/MiruNext/src/MiruNext/Features/Orders/List.cshtml

This file was deleted.

44 changes: 0 additions & 44 deletions samples/MiruNext/src/MiruNext/Features/Orders/OrderList.cs

This file was deleted.

45 changes: 0 additions & 45 deletions samples/MiruNext/src/MiruNext/Features/Shared/_Layout.cshtml

This file was deleted.

26 changes: 0 additions & 26 deletions samples/MiruNext/src/MiruNext/Features/Todos/List.cshtml

This file was deleted.

3 changes: 0 additions & 3 deletions samples/MiruNext/src/MiruNext/Features/Todos/New.cshtml

This file was deleted.

Loading

0 comments on commit 1de7f99

Please sign in to comment.