Skip to content

Commit d3e2d6e

Browse files
ChrisMcKeeChrisMcKee
committed
Mark for 3.3
1 parent 00b5cfe commit d3e2d6e

6 files changed

Lines changed: 48 additions & 38 deletions

File tree

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

163 KB
Binary file not shown.

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

164 KB
Binary file not shown.

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

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net40;net452;net462;net472</TargetFrameworks>
88
<OutputTypeEx>Library</OutputTypeEx>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<IncludeSource>true</IncludeSource>
10+
<IncludeSource>false</IncludeSource>
1111

1212
<PackageId>BCrypt.Net-Next</PackageId>
1313
<Title>BCrypt .Net</Title>
@@ -22,7 +22,7 @@
2222
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
2323
<AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
2424

25-
<Version>3.2.1</Version>
25+
<Version>3.3.0</Version>
2626
<PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
2727
<Configurations>Debug;Release</Configurations>
2828
</PropertyGroup>
@@ -36,40 +36,48 @@
3636
</ItemGroup>
3737

3838
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
39-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
4039
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
4140
</PropertyGroup>
41+
4242
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
43-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
4443
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
4544
</PropertyGroup>
46-
<PropertyGroup Condition="'$(TargetFramework)' == 'net40' ">
47-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
45+
46+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
47+
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
4848
</PropertyGroup>
4949

5050
<ItemGroup Condition="'$(TargetFramework)' == 'net20|net35|net40'">
5151
<Reference Include="System" />
5252
</ItemGroup>
5353

5454
<ItemGroup Condition="'$(TargetFramework)' == 'net452|net462|net472'">
55-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
5655
<Reference Include="System" />
5756
</ItemGroup>
5857

59-
<ItemGroup>
60-
<Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
61-
</ItemGroup>
6258

63-
<ItemGroup>
64-
<PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
59+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0|net452|net462|net472'">
60+
<PackageReference Include="System.Memory" Version="4.5.3" />
6561
</ItemGroup>
6662

67-
<ItemGroup>
68-
<Folder Include="Properties\" />
69-
</ItemGroup>
63+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
64+
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
65+
</PropertyGroup>
66+
7067

7168
<PropertyGroup Condition="'$(Configuration)'=='Release'">
7269
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
7370
</PropertyGroup>
7471

75-
</Project>
72+
73+
<ItemGroup>
74+
<Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
75+
</ItemGroup>
76+
77+
78+
79+
<ItemGroup>
80+
<PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
81+
</ItemGroup>
82+
83+
</Project>

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net40;net452;net462;net472</TargetFrameworks>
88
<OutputTypeEx>Library</OutputTypeEx>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<IncludeSource>true</IncludeSource>
10+
<IncludeSource>false</IncludeSource>
1111

1212
<PackageId>BCrypt.Net-Next.StrongName</PackageId>
1313
<Title>BCrypt .Net (Strong Named)</Title>
@@ -22,7 +22,7 @@
2222
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
2323
<AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
2424

25-
<Version>3.2.1</Version>
25+
<Version>3.3.0</Version>
2626
<PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
2727
<Configurations>Debug;Release</Configurations>
2828
</PropertyGroup>
@@ -36,40 +36,46 @@
3636
</ItemGroup>
3737

3838
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
39-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
4039
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
4140
</PropertyGroup>
41+
4242
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
43-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
4443
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
4544
</PropertyGroup>
46-
<PropertyGroup Condition="'$(TargetFramework)' == 'net40' ">
47-
<DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
45+
46+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
47+
<DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
4848
</PropertyGroup>
4949

5050
<ItemGroup Condition="'$(TargetFramework)' == 'net20|net35|net40'">
5151
<Reference Include="System" />
5252
</ItemGroup>
5353

5454
<ItemGroup Condition="'$(TargetFramework)' == 'net452|net462|net472'">
55-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
5655
<Reference Include="System" />
5756
</ItemGroup>
5857

59-
<ItemGroup>
60-
<Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
61-
</ItemGroup>
6258

63-
<ItemGroup>
64-
<PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
59+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0|net452|net462|net472'">
60+
<PackageReference Include="System.Memory" Version="4.5.3" />
6561
</ItemGroup>
6662

67-
<ItemGroup>
68-
<Folder Include="Properties\" />
69-
</ItemGroup>
63+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
64+
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
65+
</PropertyGroup>
66+
7067

7168
<PropertyGroup Condition="'$(Configuration)'=='Release'">
7269
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
7370
</PropertyGroup>
7471

75-
</Project>
72+
73+
<ItemGroup>
74+
<Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
75+
</ItemGroup>
76+
77+
<ItemGroup>
78+
<PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
79+
</ItemGroup>
80+
81+
</Project>

‎src/BCrypt.Net.sln‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ Global
6666
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|x86.ActiveCfg = Debug|Any CPU
6767
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|x86.Build.0 = Debug|Any CPU
6868
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
69-
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.Build.0 = Release|Any CPU
7069
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x64.ActiveCfg = Release|Any CPU
7170
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x64.Build.0 = Release|Any CPU
7271
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x86.ActiveCfg = Release|Any CPU
@@ -118,7 +117,6 @@ Global
118117
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|x86.ActiveCfg = Benchmark|Any CPU
119118
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|x86.Build.0 = Benchmark|Any CPU
120119
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.ActiveCfg = Benchmark|Any CPU
121-
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.Build.0 = Benchmark|Any CPU
122120
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x64.ActiveCfg = Benchmark|Any CPU
123121
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x64.Build.0 = Benchmark|Any CPU
124122
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x86.ActiveCfg = Benchmark|Any CPU

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<License>https://github.com/BcryptNet/bcrypt.net/blob/master/licence.txt</License>
2020
<PackageLicenseUrl>https://github.com/BcryptNet/bcrypt.net/blob/master/licence.txt</PackageLicenseUrl>
2121

22-
<Version>3.2.1</Version>
22+
<Version>3.3.0</Version>
2323

2424
<Configurations>Debug;Release</Configurations>
2525
</PropertyGroup>
@@ -54,7 +54,7 @@
5454
<PackageReference Include="System.Memory" Version="4.5.3" />
5555
</ItemGroup>
5656

57-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1|netstandard2.0|net452|net462|net472'">
57+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
5858
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
5959
</PropertyGroup>
6060

@@ -63,8 +63,6 @@
6363
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
6464
</PropertyGroup>
6565

66-
67-
6866
<ItemGroup>
6967
<PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
7068
</ItemGroup>

0 commit comments

Comments
 (0)