Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from .NET 6 to .NET 8 #551

Merged
merged 18 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions .github/workflows/dotnet-build-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@ name: .NET build validation

on:
push:
branches: [ develop ]
branches: [develop]
pull_request:
branches: [ develop ]
branches: [develop]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore ./ShareBook/ShareBook.sln
- name: Build
run: dotnet build ./ShareBook/ShareBook.sln --no-restore
- name: Test
run: dotnet test ./ShareBook/ShareBook.sln --no-build --verbosity normal
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore ./ShareBook/ShareBook.sln
- name: Build
run: dotnet build ./ShareBook/ShareBook.sln --no-restore
- name: Test
run: dotnet test ./ShareBook/ShareBook.sln --no-build --verbosity normal
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,36 @@ https://trello.com/invite/sharebook6/928f21ef82592b5edafde06f171d338b

</br>

## **4 - GITHUB**
## **4 - GITHUB**

- **4.1 FAÇA UM FORK DO REPOSITÓRIO:** https://github.com/SharebookBR/sharebook-backend
- **4.1 FAÇA UM FORK DO REPOSITÓRIO:** https://github.com/SharebookBR/sharebook-backend

- **4.2 Crie uma branch baseada na branch original `develop`**
- **4.2 Crie uma branch baseada na branch original `develop`**

(experimente: `git checkout develop && git checkout -b nomeDaSuaNovaBranch`)
(experimente: `git checkout develop && git checkout -b nomeDaSuaNovaBranch`)

- **4.3 Escreva seu código** ❤️

**Nota:** Não esqueça de garantir que todos os testes unitários continuem sendo executados corretamente.
**Nota:** Não esqueça de garantir que todos os testes unitários continuem sendo executados corretamente.

- **4.4 Crie sua PR apontando para a branch base `develop`** (conforme imagem abaixo)

![image](https://user-images.githubusercontent.com/51380783/145312556-54b67a73-e62d-48c0-9a6f-1932901f8409.png)

- **4.5 Aguarde/acompanhe o status do seu PR**
- **4.5 Aguarde/acompanhe o status do seu PR**

- **4.6 Compartilhe/convide um amigo para contribuir com o ShareBook**
- **4.6 Compartilhe/convide um amigo para contribuir com o ShareBook**

</br>

## **---> ❤️ MISSÃO CUMPRIDA. VOCÊ AJUDOU O PROJETO. ❤️ <---**
## **---> ❤️ MISSÃO CUMPRIDA. VOCÊ AJUDOU O PROJETO. ❤️ <---**

</br>

## **6 - Rodar o app pela primeira vez?**
- Instalar o .NET SDK 6 (stable)
https://github.com/SharebookBR/sharebook-backend/wiki/Como-rodar-o-projeto%3F

- Instalar o .NET SDK 8 (stable)
https://github.com/SharebookBR/sharebook-backend/wiki/Como-rodar-o-projeto%3F

## **7 - Dicas Visual Studio Code**

Expand Down Expand Up @@ -83,4 +84,4 @@ dotnet test ./ShareBook/ShareBook.Test.Unit/ShareBook.Test.Unit.csproj

# clean
dotnet clean ./ShareBook/ShareBook.Api/ShareBook.Api.csproj --verbosity quiet
```
```
12 changes: 12 additions & 0 deletions ShareBook/ShareBook.Api/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "8.0.6",
"commands": [
"dotnet-ef"
]
}
}
}
4 changes: 2 additions & 2 deletions ShareBook/ShareBook.Api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["ShareBook.Api/ShareBook.Api.csproj", "ShareBook.Api/"]
COPY ["ShareBook.Service/ShareBook.Service.csproj", "ShareBook.Service/"]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://dev.sharebook.com.br/swagger/index.html</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>384db7ac-4918-4abd-9c12-5f673ffb200d</ProjectGuid>
<SelfContained>false</SelfContained>
<MSDeployServiceURL>https://win5202.site4now.net:8172/MsDeploy.axd?site=raffacabofrio-001-site2</MSDeployServiceURL>
<DeployIisAppPath>raffacabofrio-001-site2</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
<UserName>raffacabofrio-001</UserName>
<_SavePWD>true</_SavePWD>
<_TargetId>IISWebDeploy</_TargetId>
</PropertyGroup>
</Project>

This file was deleted.

151 changes: 144 additions & 7 deletions ShareBook/ShareBook.Api/ShareBook.Api.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<PropertyGroup>
<SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyy-MM-ddTHH:mm:ss:fffZ"))</SourceRevisionId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="5.0.3" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -30,4 +29,142 @@
<ProjectReference Include="..\ShareBook.Service\ShareBook.Service.csproj" />
<ProjectReference Include="..\Sharebook.Jobs\Sharebook.Jobs.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="wwwroot\Images\Books\100-segredos-das-pessoas-felizes.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-cabana.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-furia-dos-reis.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-hora-do-vampiro.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-irmandade-do-anel.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-maldicao-do-cigano.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-menina-que-roubava-livros.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\a-passagem.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\anjos-e-demonios.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\antologia-poetica.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\as-duas-torres.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\as-provacoes-de-apolo.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\c-sharp-programao-em-camada.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\cronicas-gelo-e-fogo.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\direito-e-justiça.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\direito-penal-rideel.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\fantasia-1.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\guerra-civil.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\harry-potter-e-as-reliquias-da-morte.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\harry-potter-prisioneiro-de-askaban.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\homem-aranha.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\introducao-a-programacao.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\novelas-nada-exemplares.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\num-vento-diferente.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\nunca-jamais.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\o-cortico.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\o-festim-dos-corvos.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\o-pequeno-principe.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\o-retorno-do-rei.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\o-segredo-das-sombras.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\orgulho-e-preconceito.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\os-sete.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\os-vingadores.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\percy-jackson-e-os-olimpianos.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\programacao-de-jogo-android.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\programacao-de-redes-com-python.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\programando-o-android.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\se-venden-gorras.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\senhor-dos-aneis.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\star-wars.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\teoria-discursiva-do-direito.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\the-book-of-jonah.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\the-hobbit-there-and-back-again.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\the-hobbit.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Images\Books\volta-ao-mundo-em-80-dias.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ShareBook/ShareBook.Api/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"ConnectionStrings": {
"DefaultConnection": ""
"DefaultConnection": "Server=127.0.0.1;Database=master;User=sa;Password=weWkh]6qA3jk;TrustServerCertificate=True;"
},
"TokenConfigurations": {
"Audience": "",
"Issuer": "",
"Seconds": 3600,
"SecretJwtKey": ""
"SecretJwtKey": "FakeValue"
},
"Logging": {
"LogLevel": {
Expand Down
Loading
Loading