Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
dotnet-version: [ '6.0.x', '7.0.x' ]
dotnet-version: [ '8.0.x' ]
os: [ubuntu-latest, windows-latest]

steps:
Expand All @@ -27,4 +27,4 @@ jobs:
- name: Build
run: dotnet build BarcodeStandard/BarcodeStandard.csproj --configuration Release --no-restore
- name: Test
run: dotnet test --framework net7.0 --no-restore --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}"
run: dotnet test --framework net8.0 --no-restore --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}"
4 changes: 2 additions & 2 deletions BarcodeStandard/BarcodeStandard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Product>BarcodeLib</Product>
<Authors>Brad Barnhill</Authors>
<Description>This library was designed to give an easy class for developers to use when they need to generate barcode images from a string of data.</Description>
<Copyright>Copyright 2007-2024 Brad Barnhill</Copyright>
<Copyright>Copyright 2007-2025 Brad Barnhill</Copyright>
<PackageProjectUrl>https://github.com/barnhill/barcodelib</PackageProjectUrl>
<RepositoryUrl>https://github.com/barnhill/barcodelib.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand All @@ -35,7 +35,7 @@
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>

<ItemGroup>
Expand Down
76 changes: 40 additions & 36 deletions BarcodeStandardExample/TestApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -292,39 +292,40 @@ private void LoadFromSaveData(SaveData saveData)
btnBackColor.BackColor = ColorTranslator.FromHtml(saveData.Backcolor);
txtWidth.Text = saveData.ImageWidth.ToString();
txtHeight.Text = saveData.ImageHeight.ToString();

//,
// , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,
switch (saveData.Type)
{
case "UCC12":
case "UPCA":
case "Ucc12":
case "UpcA":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("UPC-A");
break;
case "UCC13":
case "EAN13":
case "Ucc13":
case "Ean13":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("EAN-13");
break;
case "Interleaved2of5_Mod10":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Interleaved 2 of 5 Mod 10");
case "Standard2Of5Mod10":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Standard 2 of 5 Mod 10");
break;
case "Interleaved2of5":
case "Interleaved2Of5":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Interleaved 2 of 5");
break;
case "Standard2of5_Mod10":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Standard 2 of 5 Mod 10");
case "Interleaved2Of5Mod10":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Interleaved 2 of 5 Mod 10");
break;
case "Standard2of5":
case "Standard2Of5":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Standard 2 of 5");
break;
case "LOGMARS":
case "Logmars":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("LOGMARS");
break;
case "CODE39":
case "Code39":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 39");
break;
case "CODE39Extended":
case "Code39Extended":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 39 Extended");
break;
case "CODE39_Mod43":
case "Code39Mod43":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 39 Mod 43");
break;
case "Codabar":
Expand All @@ -333,55 +334,55 @@ private void LoadFromSaveData(SaveData saveData)
case "PostNet":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("PostNet");
break;
case "ISBN":
case "BOOKLAND":
case "Isbn":
case "Bookland":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Bookland/ISBN");
break;
case "JAN13":
case "Jan13":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("JAN-13");
break;
case "UPC_SUPPLEMENTAL_2DIGIT":
case "UpcSupplemental2Digit":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("UPC 2 Digit Ext.");
break;
case "MSI_Mod10":
case "MSI_2Mod10":
case "MSI_Mod11":
case "MSI_Mod11_Mod10":
case "Modified_Plessey":
case "MsiMod10":
case "Msi2Mod10":
case "MsiMod11":
case "MsiMod11Mod10":
case "ModifiedPlessey":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("MSI");
break;
case "UPC_SUPPLEMENTAL_5DIGIT":
case "UpcSupplemental5Digit":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("UPC 5 Digit Ext.");
break;
case "UPCE":
case "UpcE":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("UPC-E");
break;
case "EAN8":
case "Ean8":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("EAN-8");
break;
case "USD8":
case "CODE11":
case "Usd8":
case "Code11":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 11");
break;
case "CODE128":
case "Code128":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 128");
break;
case "CODE128A":
case "Code128A":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 128-A");
break;
case "CODE128B":
case "Code128B":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 128-B");
break;
case "CODE128C":
case "Code128C":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 128-C");
break;
case "ITF14":
case "Itf14":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("ITF-14");
break;
case "CODE93":
case "Code93":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Code 93");
break;
case "FIM":
case "Fim":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("FIM");
break;
case "Pharmacode":
Expand All @@ -390,6 +391,9 @@ private void LoadFromSaveData(SaveData saveData)
case "IATA2of5":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("IATA2of5");
break;
case "Telepen":
cbEncodeType.SelectedIndex = cbEncodeType.FindString("Telepen");
break;

default: throw new Exception("ELOADXML-1: Unsupported encoding type in XML.");
}
Expand Down
2 changes: 1 addition & 1 deletion BarcodeStandardTests/BarcodeStandardTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<LangVersion>latest</LangVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ If you find this or any of my software useful and decide its worth supporting.

## Copyright and license

Copyright 2007-2024 Brad Barnhill. Code released under the [Apache License, Version 2.0](https://github.com/bbarnhill/barcodelib/blob/master/LICENSE).
Copyright 2007-2025 Brad Barnhill. Code released under the [Apache License, Version 2.0](https://github.com/bbarnhill/barcodelib/blob/master/LICENSE).
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.0",
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
Expand Down