Skip to content

Commit 3da4b80

Browse files
Target the CI frameworks in the font generator
The CI builds the solution with -f net11.0. The generator targeted only net10.0, so its restore had no net11.0 target and the build failed with NETSDK1005. It now uses the framework choice of the other executable projects. Also remove a double blank line (SA1507) in the PZN tests.
1 parent 69b75ac commit 3da4b80

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

‎src/ImageSharp.Drawing.FontGenerator/ImageSharp.Drawing.FontGenerator.csproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,25 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
65
<Nullable>enable</Nullable>
76
<IsPackable>false</IsPackable>
87
<AssemblyName>ImageSharp.Drawing.FontGenerator</AssemblyName>
98
<RootNamespace>SixLabors.ImageSharp.Drawing.FontGenerator</RootNamespace>
109
</PropertyGroup>
1110

11+
<Choose>
12+
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
13+
<PropertyGroup>
14+
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
15+
</PropertyGroup>
16+
</When>
17+
<Otherwise>
18+
<PropertyGroup>
19+
<TargetFrameworks>net10.0</TargetFrameworks>
20+
</PropertyGroup>
21+
</Otherwise>
22+
</Choose>
23+
1224
<ItemGroup>
1325
<ProjectReference Include="..\ImageSharp.Drawing\ImageSharp.Drawing.csproj" />
1426
</ItemGroup>

‎tests/ImageSharp.Drawing.Tests/Barcodes/PznSymbologyTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public void DefaultsTheModuleWidthToTheNominalModuleWidth()
9595
SymbolEncoder.Read(new Pzn8Symbology(), "03752864", new BarcodeOptions(), static (ref symbol) => symbol.XDimension),
9696
1e-12);
9797

98-
9998
Assert.Equal(0.25, XDimensionAt(null), 1e-9);
10099
Assert.Equal(0.4, XDimensionAt(0.4), 1e-9);
101100
Assert.Equal(0.187, XDimensionAt(0.15), 1e-9);

0 commit comments

Comments
 (0)