Skip to content

Commit fe3c323

Browse files
committed
remove zlib and work on package
1 parent 14edd3c commit fe3c323

22 files changed

+8
-5817
lines changed

src/S7CommPlusDriver.slnx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
<Project Path="DriverTest\DriverTest.csproj" />
33
<Project Path="S7CommPlusDriver\S7CommPlusDriver.csproj" />
44
<Project Path="S7CommPlusGUIBrowser\S7CommPlusGUIBrowser.csproj" />
5-
<Project Path="Zlib.net\Zlib.net.csproj" />
65
</Solution>

src/S7CommPlusDriver/S7CommPlusConnection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ private UInt32 GetNextIntegrityId(ushort functioncode)
116116

117117
private void WaitForNewS7plusReceived(int Timeout)
118118
{
119+
//TODO: Tickcount overflows!!!!
119120
bool Expired = false;
120121
int Elapsed = Environment.TickCount;
121122
bool done = false;

src/S7CommPlusDriver/S7CommPlusDriver.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
1313
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
14-
</ItemGroup>
15-
<ItemGroup>
16-
<ProjectReference Include="..\Zlib.net\Zlib.net.csproj" />
14+
<PackageReference Include="zlib.net-mutliplatform" Version="1.0.8" />
1715
</ItemGroup>
1816
<ItemGroup>
1917
<Content Include="runtimes\**\*">
@@ -33,9 +31,14 @@
3331
<PropertyGroup>
3432
<AssemblyTitle>S7CommPlusDriver</AssemblyTitle>
3533
<Product>S7CommPlusDriver</Product>
36-
<Copyright>Copyright © 2023, Thomas Wiens</Copyright>
34+
<Copyright>Copyright © 2025, DotNetProjects, Thomas Wiens</Copyright>
3735
<AssemblyVersion>0.1.0.0</AssemblyVersion>
3836
<FileVersion>0.1.0.0</FileVersion>
3937
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
38+
<Title>DotNetProjects.$(AssemblyName)</Title>
39+
<PackageId>DotNetProjects.$(AssemblyName)</PackageId>
40+
<Company>DotNetProjects</Company>
41+
<PackageProjectUrl>https://github.com/dotnetprojects/S7CommPlusDriver</PackageProjectUrl>
42+
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
4043
</PropertyGroup>
4144
</Project>

src/Zlib.net/Adler32.cs

Lines changed: 0 additions & 108 deletions
This file was deleted.

src/Zlib.net/AssemblyInfo.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)