Skip to content

Commit cb07bb5

Browse files
authored
Merge pull request #1110 from LiorBanai/master
Remove end of life target frameworks
2 parents 915223d + b01cd36 commit cb07bb5

File tree

9 files changed

+43
-28
lines changed

9 files changed

+43
-28
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ _ReSharper*/
4646
#Ignore lock files
4747
*.lock.json
4848
.idea/
49+
/src/*.DotSettings

src/NetMQ.Tests/NetMQ.Tests.csproj

+8-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,20 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
43-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
42+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
43+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
44+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
4445
<PackageReference Include="xunit" Version="2.4.2-pre.13" />
4546
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
4647
</ItemGroup>
4748

4849
<ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
4950
<PackageReference Include="ZeroMQ" Version="4.1.0.31" />
5051
</ItemGroup>
52+
53+
<ItemGroup>
54+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
55+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
56+
</ItemGroup>
5157

5258
</Project>

src/NetMQ.sln.DotSettings

-22
This file was deleted.

src/NetMQ/NetMQ.csproj

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>A 100% native C# port of the lightweight high performance messaging library ZeroMQ</Description>
55
<Version>4.0.0.0</Version>
6-
<TargetFrameworks>net45;net47;netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<TargetFrameworks>net47;netstandard2.1</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyOriginatorKeyFile>./NetMQ.snk</AssemblyOriginatorKeyFile>
99
<SignAssembly>true</SignAssembly>
@@ -39,18 +39,23 @@
3939
</ItemGroup>
4040

4141
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
42-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
42+
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.1" />
4343
</ItemGroup>
4444

4545
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
46-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
46+
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.1" />
4747
</ItemGroup>
4848

4949
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
5050
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
51-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
51+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
5252
<Reference Include="System.ServiceModel" />
5353
<Reference Include="System" />
5454
<Reference Include="Microsoft.CSharp" />
5555
</ItemGroup>
56+
57+
<ItemGroup>
58+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
59+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
60+
</ItemGroup>
5661
</Project>

src/Performance/NetMQ.SimpleTests/NetMQ.SimpleTests.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
16+
1217
</Project>

src/Performance/local_lat/local_lat.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
16+
1217
</Project>

src/Performance/local_thr/local_thr.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
16+
1217
</Project>

src/Performance/remote_lat/remote_lat.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@
88
<ItemGroup>
99
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
1010
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
1116

1217
</Project>

src/Performance/remote_thr/remote_thr.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
15+
</ItemGroup>
16+
1217
</Project>

0 commit comments

Comments
 (0)