Skip to content

Commit

Permalink
Merge pull request #3 from polyadic/update-sdk
Browse files Browse the repository at this point in the history
Update .NET SDK and Lang Version
  • Loading branch information
Ruben Schmidmeister authored Jan 13, 2021
2 parents cd48bdb + f191598 commit 56aa427
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Build

env:
DOTNET_NOLOGO: 1

on:
push:
branches: [ master ]
Expand All @@ -11,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
efcore: ['lowestSupported', '3.1.8', '5.0.0']
efcore: ['lowestSupported', '3.1.8', '5.0.2']
env:
EntityFrameworkCoreVersion: ${{matrix.efcore}}
steps:
Expand All @@ -20,6 +23,6 @@ jobs:
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
run: dotnet build --configuration Release --no-restore /p:TreatWarningsAsErrors=true
- name: Run Tests
run: dotnet test --no-restore --verbosity normal
run: dotnet test --configuration Release --no-build
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework Condition="'$(EntityFrameworkCoreVersion)' == '5.0.0'">netstandard2.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<TargetFramework Condition="'$(EntityFrameworkCoreVersion)' == '5.0.2'">netstandard2.1</TargetFramework>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Product>Interoperability between Funcky and EF Core</Product>
<Description>Interoperability between Funcky and EF Core</Description>
<PackageTags>Functional Monad EFCore EntityFramework</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="[3.1.0, 6)" Condition="'$(EntityFrameworkCoreVersion)' == '' Or '$(EntityFrameworkCoreVersion)' == 'lowestSupported'" />
</ItemGroup>
<ItemGroup Label="Build Dependencies">
<PackageReference Update="Messerli.CodeStyle" Version="1.2.1" />
<PackageReference Update="Messerli.CodeStyle" Version="2.0.0-rc.3" />
<PackageReference Update="Equals.Fody" Version="4.0.1" />
<PackageReference Update="Fody" Version="6.2.6" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "3.1.402",
"version": "5.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
Expand Down

0 comments on commit 56aa427

Please sign in to comment.