Skip to content

Commit

Permalink
Core - Upgrade to newer SDK Style project
Browse files Browse the repository at this point in the history 
- Upgrade CefSharp.Core.csproj
- Upgrade CefSharp.csproj
- Ensure pdbs are generated for release builds with same settings as before

Issue #3791
  • Loading branch information
@amaitland
amaitland committed Sep 20, 2021
1 parent fa2b6e2 commit 6553427
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 443 deletions.
102 changes: 27 additions & 75 deletions CefSharp.Core/CefSharp.Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B760B002-D277-4525-9F63-67ED2065034A}</ProjectGuid>
<TargetFramework>net452</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CefSharp</RootNamespace>
<AssemblyName>CefSharp.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\CefSharp.snk</AssemblyOriginatorKeyFile>
<PlatformTarget>AnyCPU</PlatformTarget>
<!--
Stop MSBuild from appending TargetFramework to output path.
Remove if we use TargetFrameworks
-->
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DocumentationFile>bin\Release\CefSharp.Core.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="BrowserSettings.cs" />
<Compile Include="BrowserSubprocess\SelfHost.cs" />
<Compile Include="Cef.cs" />
<Compile Include="CefSettingsBase.cs" />
<Compile Include="DragData.cs" />
<Compile Include="Fluent\DownloadHandler.cs" />
<Compile Include="Fluent\DownloadHandlerBuilder.cs" />
<Compile Include="Fluent\UrlRequestClient.cs" />
<Compile Include="Fluent\UrlRequestClientBuilder.cs" />
<Compile Include="ManagedCefBrowserAdapter.cs" />
<Compile Include="NativeMethodWrapper.cs" />
<Compile Include="PostData.cs" />
<Compile Include="PostDataElement.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ObjectFactory.cs" />
<Compile Include="Request.cs" />
<Compile Include="RequestContext.cs" />
<Compile Include="RequestContextBuilder.cs" />
<Compile Include="RequestContextSettings.cs" />
<Compile Include="UrlRequest.cs" />
<Compile Include="WebBrowserExtensionsEx.cs" />
<Compile Include="WindowInfo.cs" />
<ProjectReference Include="..\CefSharp.Core.Runtime\CefSharp.Core.Runtime.vcxproj" />
<ProjectReference Include="..\CefSharp\CefSharp.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CefSharp.Core.Runtime\CefSharp.Core.Runtime.vcxproj">
<Project>{7b495581-2271-4f41-9476-acb86e8c864f}</Project>
<Name>CefSharp.Core.Runtime</Name>
</ProjectReference>
<ProjectReference Include="..\CefSharp\CefSharp.csproj">
<Project>{a55848cc-10e7-40cb-addb-04740b16dd43}</Project>
<Name>CefSharp</Name>
</ProjectReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<Compile Remove="BrowserSettings.netcore.cs" />
<Compile Remove="Initializer.cs" />
<Compile Remove="ModuleInitializerAttribute.cs" />
<Compile Remove="PostData.netcore.cs" />
<Compile Remove="PostDataElement.netcore.cs" />
<Compile Remove="Request.netcore.cs" />
<Compile Remove="RequestContext.netcore.cs" />
<Compile Remove="UrlRequest.netcore.cs" />
<Compile Remove="WindowInfo.netcore.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />

</Project>
4 changes: 4 additions & 0 deletions CefSharp.OffScreen/CefSharp.OffScreen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@

<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DefineConstants>DEBUG;TRACE;OFFSCREEN</DefineConstants>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DefineConstants>TRACE;OFFSCREEN</DefineConstants>
<DocumentationFile>bin\Release\CefSharp.OffScreen.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion CefSharp.WinForms/CefSharp.WinForms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@

<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DefineConstants>TRACE;DEBUG;WINFORMS</DefineConstants>
<DebugType>full</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DebugSymbols>true</DebugSymbols>
<DefineConstants>TRACE;WINFORMS</DefineConstants>
<DocumentationFile>bin\Release\CefSharp.WinForms.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions CefSharp.Wpf/CefSharp.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@

<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DefineConstants>TRACE;DEBUG;WPF</DefineConstants>
<DebugType>full</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DefineConstants>TRACE;WPF</DefineConstants>
<DocumentationFile>bin\Release\CefSharp.Wpf.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 6553427

Please sign in to comment.