Skip to content

Commit

Permalink
dotnet test
Browse files Browse the repository at this point in the history
  • Loading branch information
campersau committed Aug 31, 2021
1 parent 8e9a13a commit 43d67ab
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 42 deletions.
6 changes: 5 additions & 1 deletion CefSharp.Core/CefSharp.Core.netcore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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/**/*.*" />

This comment has been minimized.

Copy link
@campersau

campersau Aug 31, 2021

Author Owner

This was only done in CefSharp.netcore.csproj and was missing here which resulted in including compiled files from the netframework build in the netcore build.

https://github.com/cefsharp/CefSharp/blob/5d14f7c1593b0bca1102772352516223aa0440e3/CefSharp/CefSharp.netcore.csproj#L34-L42

</ItemGroup>

<ItemGroup>
Expand All @@ -67,4 +71,4 @@
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>
</Project>
56 changes: 15 additions & 41 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,33 @@
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
name: nupkgfiles

# Publish to myget.org feed
deploy:
provider: NuGet
server: https://www.myget.org/F/cefsharp/api/v2/package
api_key:
secure: V8du2PPvMPok3Ya701jt5v2XWQgOZf52/H5wDHXBpKvXYkIIe8sonhVUy2TmEkqt
skip_symbols: true
symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
artifact: nupkgfiles
#deploy:

This comment has been minimized.

Copy link
@campersau

campersau Aug 31, 2021

Author Owner

Uncomment this!

# provider: NuGet
# server: https://www.myget.org/F/cefsharp/api/v2/package
# api_key:
# secure: V8du2PPvMPok3Ya701jt5v2XWQgOZf52/H5wDHXBpKvXYkIIe8sonhVUy2TmEkqt
# skip_symbols: true
# symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
# artifact: nupkgfiles

#Skip builing if we only modify text files
skip_commits:
Expand Down

0 comments on commit 43d67ab

Please sign in to comment.