Skip to content

Add net 5.0 as a target, with updated dependencies #203

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.

Sign up for GitHub

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

Merged
Turnerj merged 3 commits into from
Dec 3, 2020
Merged

Add net 5.0 as a target, with updated dependencies #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aefc13
Add net 5.0 as a target, with updated dependencies
JohnCampionJr Nov 20, 2020
ea74834
First try at 5.0 testing in CI
JohnCampionJr Nov 20, 2020
768a63a
Get all 3 versions side by side for full testing
JohnCampionJr Nov 20, 2020
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
13 changes: 12 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,18 @@ jobs:

- name: Checkout
uses: actions/checkout@v2

- name: Setup dotnet 2.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: '2.1.x'
- name: Setup dotnet 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
- name: Setup dotnet 5.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
<AssemblyName>MongoFramework.Profiling.MiniProfiler</AssemblyName>
<Title>MiniProfiler for MongoFramework</Title>
<Description>MongoFramework integration for MiniProfiler</Description>
Expand Down
25 changes: 20 additions & 5 deletions src/MongoFramework/MongoFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
<AssemblyName>MongoFramework</AssemblyName>
<Title>MongoFramework</Title>
<Description>An "Entity Framework"-like interface for the MongoDB C# Driver</Description>
Expand All @@ -11,10 +11,25 @@

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.11.4" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Include="System.Linq.Async" Version="4.1.1" />
</ItemGroup>

<Choose>
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Include="System.Linq.Async" Version="4.1.1" />
</ItemGroup>
</Otherwise>
</Choose>

</Project>
17 changes: 15 additions & 2 deletions tests/MongoFramework.Tests/MongoFramework.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>MongoFramework.Tests</AssemblyName>
<RootNamespace>MongoFramework.Tests</RootNamespace>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -12,14 +12,27 @@
<PackageReference Include="Moq" Version="4.15.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="System.Linq.Async" Version="4.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
</ItemGroup>

<Choose>
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="4.1.1" />
</ItemGroup>
</Otherwise>
</Choose>


<ItemGroup>
<ProjectReference Include="..\..\src\MongoFramework.Profiling.MiniProfiler\MongoFramework.Profiling.MiniProfiler.csproj" />
<ProjectReference Include="..\..\src\MongoFramework\MongoFramework.csproj" />
Expand Down