Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move packages props #124

Closed
wants to merge 1 commit into from
Closed

Move packages props #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions CefGlue.Common/CefGlue.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\CefGlue.Packages.props" />

<PropertyGroup>
<TargetFramework>$(DotnetVersion)</TargetFramework>
<AssemblyName>Xilium.CefGlue.Common</AssemblyName>
Expand Down Expand Up @@ -28,16 +29,6 @@
<PackageReference Include="NLog" />
</ItemGroup>

<ItemGroup Condition="'$(Platform)' == 'x64'">
<PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-x64" />
<PackageReference PrivateAssets="None" Include="cef.redist.osx64" />
</ItemGroup>

<ItemGroup Condition="'$(Platform)' == 'ARM64'">
<PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-arm64" />
<PackageReference PrivateAssets="None" Include="cef.redist.osx.arm64" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CefGlue.Common.Shared\CefGlue.Common.Shared.csproj">
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
Expand Down
12 changes: 2 additions & 10 deletions CefGlue.CopyLocal.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition="'$(Platform)' == 'x64'">
<PackageReference Include="chromiumembeddedframework.runtime.win-x64" />
<PackageReference Include="cef.redist.osx64" />
</ItemGroup>

<ItemGroup Condition="'$(Platform)' == 'ARM64'">
<PackageReference Include="chromiumembeddedframework.runtime.win-arm64" />
<PackageReference Include="cef.redist.osx.arm64" />
</ItemGroup>

<Import Project="CefGlue.Packages.props" />

<PropertyGroup>
<BrowserProcessDir>$(MSBuildThisFileDirectory)CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)</BrowserProcessDir>
<RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
Expand Down
1 change: 1 addition & 0 deletions CefGlue.Demo.Avalonia/CefGlue.Demo.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<RollForward>LatestMajor</RollForward>
<TargetFramework>$(DotnetVersion)</TargetFramework>
<AssemblyName>Xilium.CefGlue.Demo.Avalonia</AssemblyName>
<RootNamespace>Xilium.CefGlue.Demo.Avalonia</RootNamespace>
Expand Down
12 changes: 12 additions & 0 deletions CefGlue.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition="'$(Platform)' == 'x64'">
<PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-x64" />
<PackageReference PrivateAssets="None" Include="cef.redist.osx64" />
</ItemGroup>

<ItemGroup Condition="'$(Platform)' == 'ARM64'">
<PackageReference PrivateAssets="None" Include="chromiumembeddedframework.runtime.win-arm64" />
<PackageReference PrivateAssets="None" Include="cef.redist.osx.arm64" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions Xilium.CefGlue.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
CefGlue.Packages.props = CefGlue.Packages.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefGlue.Demo.WPF", "CefGlue.Demo.WPF\CefGlue.Demo.WPF.csproj", "{8E758128-CA79-4533-963E-91A1BF0558FB}"
Expand Down
Loading