AppVeyor - Build both solutions and use dotnet test

cefsharp · Sep 3, 2021 · 449cb30 · 449cb30
1 parent d350cad
commit 449cb30
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/CefSharp.Core/CefSharp.Core.netcore.csproj b/CefSharp.Core/CefSharp.Core.netcore.csproj
@@ -44,6 +44,10 @@
       <Compile Remove="RequestContext.cs" />
       <Compile Remove="UrlRequest.cs" />
       <Compile Remove="WindowInfo.cs" />
+      <!-- Don't include items from the "bin" and "obj" folders used by the .NET Framework projects. -->
+      <None Remove="bin/**/*.*" />
+      <None Remove="obj/**/*.*" />
+      <Compile Remove="obj/**/*.*" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,45 +1,19 @@
 version: 93.1.70-CI{build}
 
-image:
-#  - Visual Studio 2019 Preview
-  - Visual Studio 2019
-
 clone_depth: 10
 
-matrix:
-  fast_finish: true
-
-configuration: Release
+image: Visual Studio 2019
 
-#for:
-#  -
-#    matrix:
-#      only:
-#        - image: Visual Studio 2019
-#    build_script:
-#        - ps: .\build.ps1
-#    test:
-        # Test our Release x64 build
-#        assemblies:
-#            - CefSharp.Test\bin\x64\Release\CefSharp.Test.dll
-#  -
-#    matrix:
-#      only:
-#        - image: Visual Studio 2019 Preview
-#    build_script:
-#        - ps: .\build.netcore.ps1
-#    test_script:
-        # Test our Release x64 build
-#        dotnet test CefSharp.Test\bin.netcore\x64\Release\netcoreapp3.1\win-x64\CefSharp.Test.dll
+configuration: Release
 
-# to run your custom scripts instead of automatic MSBuild
 build_script:
   - ps: .\build.ps1
+  - ps: .\build.netcore.ps1
 
-test:
-    # Test our Release x64 build
-    assemblies:
-        - CefSharp.Test\bin\x64\Release\CefSharp.Test.dll
+test_script:
+  # Test our Release x64 build
+  - dotnet test CefSharp.Test\bin\x64\Release\CefSharp.Test.dll
+  - dotnet test CefSharp.Test\bin.netcore\x64\Release\netcoreapp3.1\win-x64\CefSharp.Test.dll
 
 artifacts:
   - path: NuGet\**\*.nupkg