Skip to content

Commit

Permalink
Test - Add RuntimeIdentifiers so libcef.dll etc copied to output folder
Browse files Browse the repository at this point in the history
- Adding <RuntimeIdentifiers/> didn't work as expected so set RuntimeIdentifier based on PlatformTarget
- Updated appveyor.yml as output path for CefSharp.Test.dll changed
  • Loading branch information
amaitland committed Oct 12, 2021
1 parent 5356e1b commit ee431d7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CefSharp.Native.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</Content>
</ItemGroup>
</When>
<When Condition="'$(Platform)' == 'x86'">
<When Condition="'$(Platform)' == 'x86' OR '$(Platform)' == 'Win32'">
<ItemGroup>
<Content Include="@(CefRuntimeWin32Locales)">
<Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
Expand Down
31 changes: 20 additions & 11 deletions CefSharp.Test/CefSharp.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>Library</OutputType>
Expand All @@ -9,6 +9,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(PlatformTarget)' == 'x86'">
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x86</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup Condition="'$(PlatformTarget)' == 'x64'">
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x64</RuntimeIdentifier>
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.ServiceModel" />
Expand All @@ -23,16 +32,16 @@
<ProjectReference Include="..\CefSharp\CefSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="chromiumembeddedframework.runtime" Version="94.4.2" />
<PackageReference Include="Moq" Version="4.13.0" />
<PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
<PackageReference Include="Titanium.Web.Proxy" version="3.1.1301" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="94.4.2"/>

<PackageReference Include="Moq" Version="4.13.0" />
<PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
<PackageReference Include="Titanium.Web.Proxy" version="3.1.1301" />
</ItemGroup>
<ItemGroup>
<Compile Remove="DevTools\JsonEnumConverterFacts.cs" />
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build_script:

test_script:
# Test our Release x64 build
- dotnet test CefSharp.Test\bin\x64\Release\CefSharp.Test.dll
- dotnet test CefSharp.Test\bin\x64\Release\win-x64\CefSharp.Test.dll
- dotnet test CefSharp.Test\bin.netcore\x64\Release\netcoreapp3.1\win-x64\CefSharp.Test.dll

artifacts:
Expand Down

0 comments on commit ee431d7

Please sign in to comment.