Skip to content

Target frameworks updated, NuGet packages modified, Build version inc… #1

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

Open
psycrush wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Target frameworks updated, NuGet packages modified, Build version inc… #1

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
72eb3f7
Target frameworks updated, NuGet packages modified, Build version inc…
psycrush Mar 27, 2026
f25f271
Put net461 back in
psycrush Mar 27, 2026
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
22 changes: 11 additions & 11 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
- name: Restore dependencies
run: dotnet restore source/DataMatrix.NetCore.sln
- name: Build
run: dotnet build --no-restore source/DataMatrix.NetCore.sln
- name: Test
run: dotnet test --no-build --verbosity normal source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore source/DataMatrix.NetCore.sln
- name: Build
run: dotnet build --no-restore source/DataMatrix.NetCore.sln
- name: Test
run: dotnet test --no-build --verbosity normal source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
17 changes: 10 additions & 7 deletions source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>DataMatrix.NetCore</PackageId>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>DataMatrix.NetCore</PackageId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
<!-- On .NET Framework the System.Drawing types come from the framework assembly
including the NuGet package causes duplicate type errors (System.Drawing vs System.Drawing.Common).
Only reference System.Drawing.Common for non-.NET Framework targets. -->
<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion source/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>0.4.2</Version>
<Version>0.4.3</Version>
<Description>Encode and Decode DataMatrix strings and images.</Description>
<Authors>Scott Downing, Michael Faschinger</Authors>
<Company>Figz International UG</Company>
Expand Down
46 changes: 23 additions & 23 deletions source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<None Remove="Resources\encodedMosaicImg.png" />
<None Remove="Resources\gs1DataMatrix1.png" />
<None Remove="Resources\gs1DataMatrix2.gif" />
<None Remove="Resources\helloWorld.png" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\encodedMosaicImg.png" />
<None Remove="Resources\gs1DataMatrix1.png" />
<None Remove="Resources\gs1DataMatrix2.gif" />
<None Remove="Resources\helloWorld.png" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\encodedMosaicImg.png" />
<EmbeddedResource Include="Resources\gs1DataMatrix1.png" />
<EmbeddedResource Include="Resources\gs1DataMatrix2.gif" />
<EmbeddedResource Include="Resources\helloWorld.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\encodedMosaicImg.png" />
<EmbeddedResource Include="Resources\gs1DataMatrix1.png" />
<EmbeddedResource Include="Resources\gs1DataMatrix2.gif" />
<EmbeddedResource Include="Resources\helloWorld.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DataMatrix.NetCore\DataMatrix.NetCore.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DataMatrix.NetCore\DataMatrix.NetCore.csproj" />
</ItemGroup>

</Project>