Mark for 3.3

BcryptNet · Mar 9, 2020 · d3e2d6e · d3e2d6e
1 parent 00b5cfe
commit d3e2d6e
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 38 deletions.
diff --git a/dists/BCrypt.Net-Next.3.3.0.nupkg b/dists/BCrypt.Net-Next.3.3.0.nupkg
diff --git a/dists/BCrypt.Net-Next.StrongName.3.3.0.nupkg b/dists/BCrypt.Net-Next.StrongName.3.3.0.nupkg
diff --git a/src/BCrypt.Net.MainPackage/BCrypt.Net.Package.csproj b/src/BCrypt.Net.MainPackage/BCrypt.Net.Package.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net40;net452;net462;net472</TargetFrameworks>
     <OutputTypeEx>Library</OutputTypeEx>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IncludeSource>true</IncludeSource>
+    <IncludeSource>false</IncludeSource>
 
     <PackageId>BCrypt.Net-Next</PackageId>
     <Title>BCrypt .Net</Title>
@@ -22,7 +22,7 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
 
-    <Version>3.2.1</Version>
+    <Version>3.3.0</Version>
     <PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
@@ -36,40 +36,48 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net20|net35|net40'">
     <Reference Include="System" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452|net462|net472'">
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <Reference Include="System" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0|net452|net462|net472'">
+    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
+    <DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
+  </PropertyGroup>
+
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
   </PropertyGroup>
 
-</Project>
+
+  <ItemGroup>
+    <Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+
+
+
+  <ItemGroup>
+    <PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BCrypt.Net.StrongName/BCrypt.Net.StrongName.csproj b/src/BCrypt.Net.StrongName/BCrypt.Net.StrongName.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net20;net35;net40;net452;net462;net472</TargetFrameworks>
     <OutputTypeEx>Library</OutputTypeEx>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IncludeSource>true</IncludeSource>
+    <IncludeSource>false</IncludeSource>
 
     <PackageId>BCrypt.Net-Next.StrongName</PackageId>
     <Title>BCrypt .Net (Strong Named)</Title>
@@ -22,7 +22,7 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>../bcrypt.pfx</AssemblyOriginatorKeyFile>
 
-    <Version>3.2.1</Version>
+    <Version>3.3.0</Version>
     <PackageTags>bcrypt;BCrypt.Net;cryptography;hashing;password;security,hash;crypto;blowfish;gdpr</PackageTags>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
@@ -36,40 +36,46 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);LEGACY</DefineConstants>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);NET2_1</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net20|net35|net40'">
     <Reference Include="System" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452|net462|net472'">
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <Reference Include="System" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0|net452|net462|net472'">
+    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
+    <DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
+  </PropertyGroup>
+
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
   </PropertyGroup>
 
-</Project>
+
+  <ItemGroup>
+    <Compile Remove="..\BCrypt.Net\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BCrypt.Net.sln b/src/BCrypt.Net.sln
@@ -66,7 +66,6 @@ Global
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|x86.Build.0 = Debug|Any CPU
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x64.ActiveCfg = Release|Any CPU
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x64.Build.0 = Release|Any CPU
 		{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|x86.ActiveCfg = Release|Any CPU
@@ -118,7 +117,6 @@ Global
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|x86.ActiveCfg = Benchmark|Any CPU
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|x86.Build.0 = Benchmark|Any CPU
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.ActiveCfg = Benchmark|Any CPU
-		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.Build.0 = Benchmark|Any CPU
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x64.ActiveCfg = Benchmark|Any CPU
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x64.Build.0 = Benchmark|Any CPU
 		{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|x86.ActiveCfg = Benchmark|Any CPU

diff --git a/src/BCrypt.Net/BCrypt.Net.csproj b/src/BCrypt.Net/BCrypt.Net.csproj
@@ -19,7 +19,7 @@
     <License>https://github.com/BcryptNet/bcrypt.net/blob/master/licence.txt</License>
     <PackageLicenseUrl>https://github.com/BcryptNet/bcrypt.net/blob/master/licence.txt</PackageLicenseUrl>
 
-    <Version>3.2.1</Version>
+    <Version>3.3.0</Version>
 
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
@@ -54,7 +54,7 @@
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1|netstandard2.0|net452|net462|net472'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1|netstandard2.1|netstandard2.0|net452|net462|net472'">
     <DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
   </PropertyGroup>
 
@@ -63,8 +63,6 @@
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\BCrypt.Net-Next.xml</DocumentationFile>
   </PropertyGroup>
 
-
-
   <ItemGroup>
     <PackageReference Update="SourceLink.Create.GitHub" Version="2.8.3" />
   </ItemGroup>