Skip to content

Commit f548d2a

Browse files
oguncemusta
authored andcommitted
updated to .NET Core 3.1 (#13)
1 parent bc4f5db commit f548d2a

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

.github/workflows/dotnetcore.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v1
12-
- name: Setup .NET Core
13-
uses: actions/setup-dotnet@v1
14-
with:
15-
dotnet-version: 3.0.101
16-
- name: Run unit tests
17-
run: dotnet test --configuration Release ImageServer.Tests/
18-
- name: Run integration tests
19-
run: dotnet test --configuration Release ImageServer.Integration.Tests/
20-
- name: Install dotnet-sonarscanner
21-
run: dotnet tool install --tool-path ./bin dotnet-sonarscanner
22-
- name: SonarCloud scan begin
23-
run: ./bin/dotnet-sonarscanner begin /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /k:"cemusta_ImageServer.Core" /o:"cemusta" /d:sonar.host.url="https://sonarcloud.io"
24-
- name: Build with dotnet
25-
run: dotnet build --configuration Release
26-
- name: SonarCloud scan end
27-
run: ./bin/dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
28-
env:
29-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11+
- uses: actions/checkout@v1
12+
- name: Setup .NET Core
13+
uses: actions/setup-dotnet@v1
14+
with:
15+
dotnet-version: 3.1.100
16+
- name: Run unit tests
17+
run: dotnet test --configuration Release ImageServer.Tests/
18+
- name: Run integration tests
19+
run: dotnet test --configuration Release ImageServer.Integration.Tests/
20+
- name: Install dotnet-sonarscanner
21+
run: dotnet tool install --tool-path ./bin dotnet-sonarscanner
22+
- name: SonarCloud scan begin
23+
run: ./bin/dotnet-sonarscanner begin /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /k:"cemusta_ImageServer.Core" /o:"cemusta" /d:sonar.host.url="https://sonarcloud.io"
24+
- name: Build with dotnet
25+
run: dotnet build --configuration Release
26+
- name: SonarCloud scan end
27+
run: ./bin/dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
22
WORKDIR /app/image-server
33

44
# copy everything and build app
55
COPY ./ImageServer.Core .
66
RUN dotnet publish -c Release -o out
77

88
# build runtime image
9-
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
9+
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
1010
COPY --from=build /app/image-server/out ./app
1111
WORKDIR /app
1212
ENTRYPOINT ["dotnet", "ImageServer.Core.dll"]

ImageServer.Core/ImageServer.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>95a15d39-0882-406c-abee-2276554bb504</UserSecretsId>
66
<AssemblyName>ImageServer.Core</AssemblyName>
77
<RootNamespace>ImageServer.Core</RootNamespace>

ImageServer.Integration.Tests/ImageServer.Integration.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
10+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
911
<ItemGroup>
1012
<None Remove="nlog.config" />
1113
</ItemGroup>

ImageServer.Tests/ImageServer.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77

0 commit comments

Comments
 (0)