Merge pull request #28 from gplumb/dev

Fixed conflict with System.ValueTuple package
gplumb · Mar 7, 2020 · 4f5bfe6 · 4f5bfe6
2 parents 8671a5c + 234a6b2
commit 4f5bfe6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/NetCrawlerDetect/NetCrawlerDetect.Tests/NetCrawlerDetect.Tests.csproj b/NetCrawlerDetect/NetCrawlerDetect.Tests/NetCrawlerDetect.Tests.csproj
@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>1.2.94</ReleaseVersion>
+    <ReleaseVersion>1.2.941</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NetCrawlerDetect/NetCrawlerDetect.sln b/NetCrawlerDetect/NetCrawlerDetect.sln
@@ -22,7 +22,7 @@ Global
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		description = A .net standard port of JayBizzle's CrawlerDetect project (https://github.com/JayBizzle/Crawler-Detect).
-		version = 1.2.94
+		version = 1.2.941
 		Policies = $0
 		$0.VersionControlPolicy = $1
 		$0.DotNetNamingPolicy = $2

diff --git a/NetCrawlerDetect/NetCrawlerDetect/NetCrawlerDetect.csproj b/NetCrawlerDetect/NetCrawlerDetect/NetCrawlerDetect.csproj
@@ -2,29 +2,25 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <ReleaseVersion>1.2.94</ReleaseVersion>
-    <PackageVersion>1.2.94</PackageVersion>
+    <ReleaseVersion>1.2.941</ReleaseVersion>
+    <PackageVersion>1.2.941</PackageVersion>
     <Authors>Graham "Gee" Plumb</Authors>
     <PackageLicenseUrl>https://github.com/gplumb/NetCrawlerDetect/blob/master/LICENSE</PackageLicenseUrl>
     <Owners>Graham "Gee" Plumb</Owners>
     <PackageProjectUrl>https://github.com/gplumb/NetCrawlerDetect</PackageProjectUrl>
     <Title>NetCrawlerDetect</Title>
     <Description>A .net standard port of JayBizzle's CrawlerDetect project (https://github.com/JayBizzle/Crawler-Detect).</Description>
-    <PackOnBuild>true</PackOnBuild>
     <PackageId>NetCrawlerDetect</PackageId>
-    <PackageReleaseNotes>Fixed http header issue. Synchronized agents and devices to v1.2.94 of CrawlerDetect</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug fix when using the package from .net 4.7.x</PackageReleaseNotes>
     <Summary>A .net standard port of JayBizzle's CrawlerDetect project (https://github.com/JayBizzle/Crawler-Detect).</Summary>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType></DebugType>
   </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="Fixtures\" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NuGet.Build.Packaging" Version="0.2.2"><PrivateAssets>all</PrivateAssets>
-<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-</PackageReference>
-  </ItemGroup>
+
 </Project>