Skip to content

Commit c3e7399

Browse files
ChrisMcKeeChrisMcKee
committed
v4.2.0
* Remove dotnet 2 and 3.5 (microsoft removed them from OS features) * Rename assembly to remove dots stopping PRI249 warning on WPF apps
1 parent 1772bb7 commit c3e7399

8 files changed

Lines changed: 26 additions & 53 deletions

File tree

‎dists/BCrypt.Net-Next.4.2.0.nupkg‎

140 KB
Binary file not shown.

‎dists/BCrypt.Net-Next.StrongName.4.2.0.nupkg‎

140 KB
Binary file not shown.

‎src/BCrypt.Net.MainPackage/BCrypt.Net.Package.csproj‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<AssemblyTitle>BCrypt.Net-Next</AssemblyTitle>
5-
<AssemblyName>BCrypt.Net-Next</AssemblyName>
4+
<AssemblyTitle>BCrypt-Net-Next</AssemblyTitle>
5+
<AssemblyName>BCrypt-Net-Next</AssemblyName>
66
<PackageId>BCrypt.Net-Next</PackageId>
77
<Title>BCrypt .Net</Title>
88

9-
<TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net462;net472;net48;net10.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net48;net10.0</TargetFrameworks>
1010
<OutputTypeEx>Library</OutputTypeEx>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<IncludeSource>false</IncludeSource>
@@ -24,7 +24,7 @@
2424
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
2525
<AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
2626

27-
<Version>4.1.0</Version>
27+
<Version>4.2.0</Version>
2828
<PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
2929
<Configurations>Debug;Release</Configurations>
3030
</PropertyGroup>
@@ -37,32 +37,21 @@
3737
<Compile Include="..\BCrypt.Net\**\*.cs" Exclude="..\BCrypt.Net\obj\**\*.cs" />
3838
</ItemGroup>
3939

40-
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
41-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
42-
</PropertyGroup>
43-
44-
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
45-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
46-
</PropertyGroup>
4740

4841
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
4942
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
5043
</PropertyGroup>
5144

52-
<ItemGroup Condition="'$(TargetFramework)' == 'net20'&#xD;&#xA; or '$(TargetFramework)' == 'net35'">
53-
<Reference Include="System" />
54-
</ItemGroup>
55-
56-
<ItemGroup Condition="'$(TargetFramework)' == 'net452'&#xD;&#xA; or '$(TargetFramework)' == 'net462'">
45+
<ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net462'">
5746
<Reference Include="System" />
5847
</ItemGroup>
5948

60-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'net462'&#xD;&#xA; or '$(TargetFramework)' == 'net472'&#xD;&#xA; or '$(TargetFramework)' == 'net48'">
49+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
6150
<PackageReference Include="System.Memory" Version="4.6.3" />
6251
</ItemGroup>
6352

6453

65-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'net472'&#xD;&#xA; or '$(TargetFramework)' == 'net48'&#xD;&#xA; or '$(TargetFramework)' == 'net10.0'">
54+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net10.0'">
6655
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
6756
</PropertyGroup>
6857

‎src/BCrypt.Net.StrongName/BCrypt.Net.StrongName.csproj‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<AssemblyTitle>BCrypt.Net-Next.StrongName</AssemblyTitle>
5-
<AssemblyName>BCrypt.Net-Next.StrongName</AssemblyName>
4+
<AssemblyTitle>BCrypt.Net-Next-StrongName</AssemblyTitle>
5+
<AssemblyName>BCrypt.Net-Next-StrongName</AssemblyName>
66
<PackageId>BCrypt.Net-Next.StrongName</PackageId>
77
<Title>BCrypt .Net (Strong Named)</Title>
88

9-
<TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net462;net472;net48;net10.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net48;net10.0</TargetFrameworks>
1010
<OutputTypeEx>Library</OutputTypeEx>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<IncludeSource>false</IncludeSource>
@@ -24,7 +24,7 @@
2424
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
2525
<AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
2626

27-
<Version>4.1.0</Version>
27+
<Version>4.2.0</Version>
2828
<PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
2929
<Configurations>Debug;Release</Configurations>
3030
</PropertyGroup>
@@ -37,32 +37,21 @@
3737
<Compile Include="..\BCrypt.Net\**\*.cs" Exclude="..\BCrypt.Net\obj\**\*.cs" />
3838
</ItemGroup>
3939

40-
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
41-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
42-
</PropertyGroup>
43-
44-
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
45-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
46-
</PropertyGroup>
4740

4841
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
4942
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
5043
</PropertyGroup>
5144

52-
<ItemGroup Condition="'$(TargetFramework)' == 'net20'&#xD;&#xA; or '$(TargetFramework)' == 'net35'">
53-
<Reference Include="System" />
54-
</ItemGroup>
55-
56-
<ItemGroup Condition="'$(TargetFramework)' == 'net452'&#xD;&#xA; or '$(TargetFramework)' == 'net462'">
45+
<ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net462'">
5746
<Reference Include="System" />
5847
</ItemGroup>
5948

60-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'net462'&#xD;&#xA; or '$(TargetFramework)' == 'net472'&#xD;&#xA; or '$(TargetFramework)' == 'net48'">
49+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
6150
<PackageReference Include="System.Memory" Version="4.6.3" />
6251
</ItemGroup>
6352

6453

65-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'net472'&#xD;&#xA; or '$(TargetFramework)' == 'net48'&#xD;&#xA; or '$(TargetFramework)' == 'net10.0'">
54+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net10.0'">
6655
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
6756
</PropertyGroup>
6857

‎src/BCrypt.Net.UnitTests/BCrypt.Net.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1919
<PrivateAssets>all</PrivateAssets>

‎src/BCrypt.Net/BCrypt.Net.csproj‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>BCrypt.Net-Next</PackageId>
77
<Title>BCrypt .Net</Title>
88

9-
<TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net462;net472;net48;net10.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net48;net10.0</TargetFrameworks>
1010
<OutputTypeEx>Library</OutputTypeEx>
1111
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1212
<IncludeSource>false</IncludeSource>
@@ -28,23 +28,11 @@
2828
<Deterministic>false</Deterministic>
2929
</PropertyGroup>
3030

31-
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
32-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
33-
</PropertyGroup>
34-
35-
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
36-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
37-
</PropertyGroup>
38-
3931
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
4032
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
4133
</PropertyGroup>
4234

43-
<ItemGroup Condition="'$(TargetFramework)' == 'net20' or '$(TargetFramework)' == 'net35'">
44-
<Reference Include="System" />
45-
</ItemGroup>
46-
47-
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net462'">
35+
<ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net462'">
4836
<Reference Include="System" />
4937
</ItemGroup>
5038

‎src/Benchmark/Benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net48;net472;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net48;net472;net10.0</TargetFrameworks>
66
<Configurations>Benchmark</Configurations>
77
</PropertyGroup>
88

@@ -24,7 +24,7 @@
2424
<ProjectReference Include="..\BCrypt.Net\BCrypt.Net.csproj" />
2525
</ItemGroup>
2626

27-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' ">
27+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net10.0' ">
2828
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
2929
</PropertyGroup>
3030

‎src/global.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
6+
}
7+
}

0 commit comments

Comments
 (0)