Skip to content

Commit

Permalink
Merge pull request #1110 from LiorBanai/master
Browse files Browse the repository at this point in the history
Remove end of life target frameworks
  • Loading branch information
somdoron authored Dec 19, 2024
2 parents 915223d + b01cd36 commit cb07bb5
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 28 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ _ReSharper*/
#Ignore lock files
*.lock.json
.idea/
/src/*.DotSettings
10 changes: 8 additions & 2 deletions src/NetMQ.Tests/NetMQ.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,20 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
<PackageReference Include="xunit" Version="2.4.2-pre.13" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
<PackageReference Include="ZeroMQ" Version="4.1.0.31" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions src/NetMQ.sln.DotSettings

This file was deleted.

13 changes: 9 additions & 4 deletions src/NetMQ/NetMQ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>A 100% native C# port of the lightweight high performance messaging library ZeroMQ</Description>
<Version>4.0.0.0</Version>
<TargetFrameworks>net45;net47;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net47;netstandard2.1</TargetFrameworks>
<DebugType>portable</DebugType>
<AssemblyOriginatorKeyFile>./NetMQ.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -39,18 +39,23 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
<Reference Include="System.ServiceModel" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/Performance/NetMQ.SimpleTests/NetMQ.SimpleTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/Performance/local_lat/local_lat.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/Performance/local_thr/local_thr.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/Performance/remote_lat/remote_lat.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@
<ItemGroup>
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/Performance/remote_thr/remote_thr.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
<ProjectReference Include="..\..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>

0 comments on commit cb07bb5

Please sign in to comment.