Skip to content

Multi-target .NET 6 and .NET 7 #103

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
mauroservienti merged 2 commits into from
Dec 14, 2022
Merged

Multi-target .NET 6 and .NET 7 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06ad8d8
Multi-target .NET 6 and .NET 7
mauroservienti Dec 14, 2022
b0c3517
Add all required target frameworks
mauroservienti Dec 14, 2022
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: |
6.0.x
7.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Tests
Expand Down
7 changes: 2 additions & 5 deletions src/ServiceComposer.AspNetCore.Testing/SelfContainedWebApplicationFactoryWithHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#if NET5_0 || NETCOREAPP

using System;
using System;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
Expand Down Expand Up @@ -49,5 +47,4 @@ protected override IHostBuilder CreateHostBuilder()
return hostBuilder;
}
}
}
#endif
}
19 changes: 13 additions & 6 deletions src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.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>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -21,16 +21,23 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\assets\ServiceComposer.png" Pack="true" PackagePath="\"/>
<None Include="..\..\assets\ServiceComposer.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.0, 8.0.0)"/>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.12, 7.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.1, 8.0.0)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down