Skip to content

Commit d17ffbf

Browse files
amaitlandamaitland
committed
Nuget - Fix formatting
1 parent 585bead commit d17ffbf

File tree

1 file changed

+62
-62
lines changed

1 file changed

+62
-62
lines changed

‎NuGet/CefSharp.Common.targets‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</Target>
1313

1414
<!-- <Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild"> -->
15-
<!-- <Message Importance="high" Text="CefSharp - ResourceFilesCopied = $(CefSharpResourceFilesCopied)" /> -->
15+
<!-- <Message Importance="high" Text="CefSharp - ResourceFilesCopied = $(CefSharpResourceFilesCopied)" /> -->
1616
<!-- </Target> -->
1717

1818
<PropertyGroup>
@@ -30,13 +30,13 @@
3030
<!--
3131
Allowable options are None, Content, NoAction (anything other than None/Content
3232
is the same as NoAction. None is the default (same as selecting the None Build Action in Visual Studio).
33-
For SdkStyle projects (packagereference) set the default build action to Content.
33+
For SdkStyle projects (packagereference) set the default build action to Content.
3434
-->
3535
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(UsingMicrosoftNETSdk)' != 'true'">None</CefSharpBuildAction>
36-
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(UsingMicrosoftNETSdk)' == 'true'">Content</CefSharpBuildAction>
36+
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(UsingMicrosoftNETSdk)' == 'true'">Content</CefSharpBuildAction>
3737
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' == ''"></CefSharpTargetDir>
38-
<!-- Ideally we could use EnsureTrailingSlash, was only added on 2016 so unlikely supported in older version of VS -->
39-
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' != '' AND !HasTrailingSlash('$(CefSharpTargetDir)')">$(CefSharpTargetDir)\</CefSharpTargetDir>
38+
<!-- Ideally we could use EnsureTrailingSlash, was only added on 2016 so unlikely supported in older version of VS -->
39+
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' != '' AND !HasTrailingSlash('$(CefSharpTargetDir)')">$(CefSharpTargetDir)\</CefSharpTargetDir>
4040
<CefSharpTargetDirAnyCpu32>$(CefSharpTargetDir)x86\</CefSharpTargetDirAnyCpu32>
4141
<CefSharpTargetDirAnyCpu64>$(CefSharpTargetDir)x64\</CefSharpTargetDirAnyCpu64>
4242
</PropertyGroup>
@@ -66,40 +66,40 @@
6666
</When>
6767
</Choose>
6868
</When>
69-
<!--
70-
When CefSharpTargetDir is specified for x86/x64 platforms the files are included in a sub directory,
71-
The CefSharp.dll file required by the BrowserSubProcess isn't copied by default and won't start, so we include an extra
72-
copy.
73-
-->
74-
<When Condition="'$(CefSharpTargetDir)' != '' AND $(TargetFramework.StartsWith('net4')) AND '$(PlatformTarget)' != 'AnyCPU'">
69+
<!--
70+
When CefSharpTargetDir is specified for x86/x64 platforms the files are included in a sub directory,
71+
The CefSharp.dll file required by the BrowserSubProcess isn't copied by default and won't start, so we include an extra
72+
copy.
73+
-->
74+
<When Condition="'$(CefSharpTargetDir)' != '' AND $(TargetFramework.StartsWith('net4')) AND '$(PlatformTarget)' != 'AnyCPU'">
7575
<Choose>
76-
<When Condition="'$(CefSharpBuildAction)' == 'None'">
77-
<ItemGroup>
78-
<None Include="@(CefSharpCommonManagedDlls)">
79-
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
80-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81-
<PublishState>Included</PublishState>
82-
<Visible>false</Visible>
83-
</None>
84-
</ItemGroup>
85-
<PropertyGroup>
86-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
87-
</PropertyGroup>
88-
</When>
89-
<When Condition="'$(CefSharpBuildAction)' == 'Content'">
90-
<ItemGroup>
91-
<Content Include="@(CefSharpCommonManagedDlls)">
92-
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
93-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
94-
<PublishState>Included</PublishState>
95-
<Visible>false</Visible>
96-
</Content>
97-
</ItemGroup>
98-
<PropertyGroup>
99-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
100-
</PropertyGroup>
101-
</When>
102-
</Choose>
76+
<When Condition="'$(CefSharpBuildAction)' == 'None'">
77+
<ItemGroup>
78+
<None Include="@(CefSharpCommonManagedDlls)">
79+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
80+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81+
<PublishState>Included</PublishState>
82+
<Visible>false</Visible>
83+
</None>
84+
</ItemGroup>
85+
<PropertyGroup>
86+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
87+
</PropertyGroup>
88+
</When>
89+
<When Condition="'$(CefSharpBuildAction)' == 'Content'">
90+
<ItemGroup>
91+
<Content Include="@(CefSharpCommonManagedDlls)">
92+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
93+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
94+
<PublishState>Included</PublishState>
95+
<Visible>false</Visible>
96+
</Content>
97+
</ItemGroup>
98+
<PropertyGroup>
99+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
100+
</PropertyGroup>
101+
</When>
102+
</Choose>
103103
</When>
104104
</Choose>
105105

@@ -121,8 +121,8 @@
121121
<Visible>false</Visible>
122122
</None>
123123
</ItemGroup>
124-
<PropertyGroup>
125-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
124+
<PropertyGroup>
125+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
126126
</PropertyGroup>
127127
</When>
128128
<When Condition="'$(PlatformTarget)' == 'AnyCPU'">
@@ -168,8 +168,8 @@
168168
<Visible>false</Visible>
169169
</None>
170170
</ItemGroup>
171-
<PropertyGroup>
172-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
171+
<PropertyGroup>
172+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
173173
</PropertyGroup>
174174
</When>
175175
<!-- x86 and Win32-->
@@ -188,8 +188,8 @@
188188
<Visible>false</Visible>
189189
</None>
190190
</ItemGroup>
191-
<PropertyGroup>
192-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
191+
<PropertyGroup>
192+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
193193
</PropertyGroup>
194194
</Otherwise>
195195
</Choose>
@@ -211,8 +211,8 @@
211211
<Visible>false</Visible>
212212
</Content>
213213
</ItemGroup>
214-
<PropertyGroup>
215-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
214+
<PropertyGroup>
215+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
216216
</PropertyGroup>
217217
</When>
218218
<When Condition="'$(PlatformTarget)' == 'AnyCPU'">
@@ -258,8 +258,8 @@
258258
<Visible>false</Visible>
259259
</Content>
260260
</ItemGroup>
261-
<PropertyGroup>
262-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
261+
<PropertyGroup>
262+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
263263
</PropertyGroup>
264264
</When>
265265
<!-- x86 and Win32-->
@@ -278,8 +278,8 @@
278278
<Visible>false</Visible>
279279
</Content>
280280
</ItemGroup>
281-
<PropertyGroup>
282-
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
281+
<PropertyGroup>
282+
<CefSharpResourceFilesCopied>true</CefSharpResourceFilesCopied>
283283
</PropertyGroup>
284284
</Otherwise>
285285
</Choose>
@@ -310,25 +310,25 @@
310310
-->
311311
<!-- <Target Name="CefSharpCopyFilesAfterNugetRestore32" AfterTargets="AfterBuild" Condition="'$(UsingMicrosoftNETSdk)' != 'true' AND '$(CefSharpResourceFilesCopied)' != 'true' AND '$(CefSharpBuildAction)' != 'NoAction' AND '$(PlatformTarget)' == 'x86'"> -->
312312
<!-- <Message Importance="high" Text="CefSharp - Files were not copied by MSBuild after Nuget install/restore, copying (x64) $(OutDir)$(CefSharpTargetDir)" /> -->
313-
<!-- <Copy SourceFiles="@(CefRedist32)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
314-
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
313+
<!-- <Copy SourceFiles="@(CefRedist32)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
314+
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
315315
<!-- </Target> -->
316316

317317
<!-- <Target Name="CefSharpCopyFilesAfterNugetRestore64" AfterTargets="AfterBuild" Condition="'$(UsingMicrosoftNETSdk)' != 'true' AND '$(CefSharpResourceFilesCopied)' != 'true' AND '$(CefSharpBuildAction)' != 'NoAction' AND '$(PlatformTarget)' == 'x64'"> -->
318318
<!-- <Message Importance="high" Text="CefSharp - Files were not copied by MSBuild after Nuget install/restore, copying (x64) $(OutDir)$(CefSharpTargetDir)" /> -->
319-
<!-- <Copy SourceFiles="@(CefRedist64)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
320-
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
319+
<!-- <Copy SourceFiles="@(CefRedist64)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
320+
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(OutDir)$(CefSharpTargetDir)" SkipUnchangedFiles="true" /> -->
321321
<!-- </Target> -->
322322

323323
<!-- <Target Name="CefSharpCopyFilesAfterNugetRestoreAnyCPU" AfterTargets="AfterBuild" Condition="'$(UsingMicrosoftNETSdk)' != 'true' AND '$(CefSharpResourceFilesCopied)' != 'true' AND '$(CefSharpBuildAction)' != 'NoAction' AND '$(PlatformTarget)' == 'AnyCPU'"> -->
324324
<!-- <Message Importance="high" Text="CefSharp - Files were not copied by MSBuild after Nuget install/restore, copying (AnyCPU) $(OutDir)$(CefSharpTargetDir)" /> -->
325-
<!-- <Copy SourceFiles="@(CefRedist32)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
326-
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
327-
328-
<!-- <Copy SourceFiles="@(CefRedist64)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
329-
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
330-
331-
<!-- <Copy SourceFiles="@(CefSharpCommonManagedDlls)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
332-
<!-- <Copy SourceFiles="@(CefSharpCommonManagedDlls)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
325+
<!-- <Copy SourceFiles="@(CefRedist32)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
326+
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
327+
328+
<!-- <Copy SourceFiles="@(CefRedist64)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
329+
<!-- <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
330+
331+
<!-- <Copy SourceFiles="@(CefSharpCommonManagedDlls)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu32)" SkipUnchangedFiles="true" /> -->
332+
<!-- <Copy SourceFiles="@(CefSharpCommonManagedDlls)" DestinationFolder="$(OutDir)$(CefSharpTargetDirAnyCpu64)" SkipUnchangedFiles="true" /> -->
333333
<!-- </Target> -->
334334
</Project>

0 commit comments

Comments
 (0)