Skip to content

Multi-target net8.0 and net10.0 #7

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

Closed
henrikottesorensen wants to merge 1 commit into from
+31 −14
Closed

Multi-target net8.0 and net10.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ jobs:

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: |
8.0.x
10.0.x

- name: Build and pack
run: sh ./build/build_runtime_macos_packages.sh
Expand Down Expand Up @@ -80,7 +82,9 @@ jobs:

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: |
8.0.x
10.0.x

- name: Collect runtime packages into a local feed
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -115,7 +119,9 @@ jobs:

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: |
8.0.x
10.0.x

- name: Collect runtime packages into a local feed
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -152,7 +158,9 @@ jobs:
steps:
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: |
8.0.x
10.0.x

- uses: actions/download-artifact@v4
with:
Expand Down
7 changes: 4 additions & 3 deletions LibLouis.NET.Test/LibLouis.NET.Test.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>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
Expand All @@ -12,8 +12,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
22 changes: 15 additions & 7 deletions LibLouis.NET/LibLouis.NET.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>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Nota</Authors>
Expand All @@ -20,8 +20,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<!-- Track the extensions packages to the target framework rather than pinning every target to
the net8.0 versions, so a net10.0 consumer does not drag an older set into its graph. -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" Condition="'$(TargetFramework)' == 'net10.0'" />
<!--
Lower bound is the version this repository currently builds, so restore does not warn about
a non-existent 3.0.0 (NU1603). LiblouisPackageVersion comes from Directory.Build.props.
Expand All @@ -30,10 +34,14 @@
</ItemGroup>

<ItemGroup>
<None Update="LICENSE">
<PackagePath>\</PackagePath>
<Pack>True</Pack>
</None>
<!--
Two forms on purpose. Packing a multi-targeted project runs the cross-targeting outer build,
which has no default None items, so Update there matches nothing and the licence silently
never reaches the package (NU5030). The inner builds do have the item, where a second Include
would be a duplicate.
-->
<None Include="LICENSE" Pack="True" PackagePath="\" Condition="'$(TargetFramework)' == ''" />
<None Update="LICENSE" Pack="True" PackagePath="\" Condition="'$(TargetFramework)' != ''" />
</ItemGroup>

</Project>
Loading