Skip to content

Commit

Permalink
Upgrade to .NET Core 3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebazzz committed Mar 25, 2020
1 parent 095b453 commit 5144c0b
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
parallelism: 4
docker:
- image: mcr.microsoft.com/dotnet/core/sdk:3.1.200
- image: mcr.microsoft.com/dotnet/core/sdk:3.1.201
steps:
- checkout

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install .NET 3.x SDK for build
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.102'
dotnet-version: '3.1.103'

- name: Output important software versions (node)
run: node --version
Expand Down
2 changes: 1 addition & 1 deletion build.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
CAKE_VERSION=0.37.0
DOTNET_VERSION=3.1.102
DOTNET_VERSION=3.1.103
2 changes: 1 addition & 1 deletion dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "3.1.2",
"version": "3.1.3",
"commands": ["dotnet-ef"]
},
"dotnet-format": {
Expand Down
4 changes: 3 additions & 1 deletion src/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />

<!-- Fixes CS8034: Unable to load Analyzer assembly [...] Microsoft.AspNetCore.Components.Analyzers.dll : Assembly with same name is already loaded -->
<PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.3" />

<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
</ItemGroup>

<!-- Git versioning -->
Expand Down
6 changes: 3 additions & 3 deletions src/PokerTime.Application/PokerTime.Application.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.3" />

<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />

<PackageReference Include="FluentValidation" Version="8.6.2" />
<PackageReference Include="QRCoder" Version="1.3.6" />

<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/PokerTime.Common/PokerTime.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions src/PokerTime.Domain/PokerTime.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@
<ItemGroup>
<ProjectReference Include="..\PokerTime.Common\PokerTime.Common.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions src/PokerTime.Persistence/PokerTime.Persistence.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.3" />
<PackageReference Include="NSubstitute " Version="4.2.1" />
<PackageReference Include="NSubstitute.Analyzers.CSharp " Version="1.0.12" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.3" />
<PackageReference Include="Selenium.Support" Version="3.141.0" />
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="80.0.3987.10600" />
Expand Down

0 comments on commit 5144c0b

Please sign in to comment.