Skip to content

Commit

Permalink
Merge branch 'net6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dotWee committed Mar 19, 2022
2 parents 434e685 + 58ad85d commit a48ee74
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net5.0/WhatTheFuckShouldLukasHaveForLunch.dll",
"program": "${workspaceFolder}/bin/Debug/net6.0/WhatTheFuckShouldLukasHaveForLunch.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://hub.docker.com/_/microsoft-dotnet-sdk
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /app

# copy csproj and restore as distinct layers
Expand All @@ -14,7 +14,7 @@ RUN dotnet publish -c Release -o out

# final stage/image
# https://hub.docker.com/_/microsoft-dotnet-aspnet
FROM mcr.microsoft.com/dotnet/aspnet:5.0
FROM mcr.microsoft.com/dotnet/aspnet:6.0
WORKDIR /app

COPY --from=build-env /app/out .
Expand Down
2 changes: 1 addition & 1 deletion Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<footer class="mastfoot mt-auto border-top">
<div class="inner">
<p>Copyright &copy; 2021 - <a href="https://lukas.wolfsteiner.media">Lukas Wolfsteiner</a></p>
<p>Copyright &copy; 2022 - <a href="https://lukas.wolfsteiner.media">Lukas Wolfsteiner</a></p>
</div>
</footer>
</div>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _what the fuck should lukas have for lunch*?_

<sub>* at the regensburg university of applied sciences canteen </sub>

this repository contains the source code of [whatthefuckshouldlukashaveforlunch](https://whatthefuckshouldlukashaveforlunch.com/), written in some `c#` using the `.net 5` framework.
this repository contains the source code of [whatthefuckshouldlukashaveforlunch](https://whatthefuckshouldlukashaveforlunch.com/), written in some `c#` using the `.net 6` framework.

![screenshot.png](https://github.com/dotWee/whatthefuckshouldlukashaveforlunch.com/raw/master/art/screenshot.png)

Expand All @@ -16,7 +16,7 @@ this repository contains the source code of [whatthefuckshouldlukashaveforlunch]
## [setup](#setup)

1. get the [.net 5.0 sdk](https://dotnet.microsoft.com/download/) for your platform
1. get the [.net 6.0 sdk](https://dotnet.microsoft.com/download/) for your platform

2. clone this git repository and change into the repo directory:

Expand Down
2 changes: 1 addition & 1 deletion Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

app.UseRouting();

app.UseAuthorization();
// app.UseAuthorization();

app.UseEndpoints(endpoints =>
{
Expand Down
2 changes: 1 addition & 1 deletion WhatTheFuckShouldLukasHaveForLunch.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

</Project>
5 changes: 2 additions & 3 deletions appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
3 changes: 1 addition & 2 deletions appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
Expand Down

0 comments on commit a48ee74

Please sign in to comment.