fixing cicd errors 01

GowenGit · Sep 19, 2020 · 6312080 · 6312080
1 parent 1924047
commit 6312080
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
@@ -15,6 +15,7 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: lucene
         ports:
         - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s 

diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml
@@ -12,6 +12,7 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: lucene
         ports:
         - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s 

diff --git a/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj b/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj
@@ -24,6 +24,8 @@
 
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
+
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeReferenceAssets</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
@@ -43,4 +45,10 @@
   <ItemGroup>
     <None Include="../assets/icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
+
+  <Target Name="IncludeReferenceAssets">
+    <ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)Lucene.Net.Sql.dll" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/Lucene.Net.Sql.Performance/Lucene.Net.Sql.Performance.csproj b/Lucene.Net.Sql.Performance/Lucene.Net.Sql.Performance.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Sql.MySql\Lucene.Net.Sql.MySql.csproj" />
+    <ProjectReference Include="..\Lucene.Net.Sql\Lucene.Net.Sql.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lucene.Net.Sql.Performance/LuceneBenchmarkBase.cs b/Lucene.Net.Sql.Performance/LuceneBenchmarkBase.cs
@@ -1,5 +1,4 @@
-using System;
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Index;

diff --git a/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj b/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj
@@ -23,6 +23,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Sql.MySql\Lucene.Net.Sql.MySql.csproj" />
+    <ProjectReference Include="..\Lucene.Net.Sql\Lucene.Net.Sql.csproj" />
   </ItemGroup>
 
   <ItemGroup>