Skip to content

Commit dd17a9d

Browse files
amaitlandamaitland
committed
Nuget - SdkStyle(PackageReference) default to Content and adjust CefSharpTargetDir path
- SdkStyle(PackageReference) projects now default to CefSharpBuildAction Content - CefSharpTargetDir is now empty by default instead of a `.` and a trailing slash appended if required
1 parent a55858c commit dd17a9d

File tree

1 file changed

+33
-29
lines changed

1 file changed

+33
-29
lines changed

‎NuGet/CefSharp.Common.targets‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@
2828
<PropertyGroup>
2929
<!--
3030
Allowable options are None, Content, NoAction (anything other than None/Content
31-
is the same as NoAction. None is the default (same as selecting the None Build Action in Visual Studio)
31+
is the same as NoAction. None is the default (same as selecting the None Build Action in Visual Studio).
32+
For SdkStyle projects (packagereference) set the default build action to Content.
3233
-->
33-
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == ''">None</CefSharpBuildAction>
34-
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' == ''">.</CefSharpTargetDir>
35-
<CefSharpTargetDirAnyCpu32>$(CefSharpTargetDir)\x86</CefSharpTargetDirAnyCpu32>
36-
<CefSharpTargetDirAnyCpu64>$(CefSharpTargetDir)\x64</CefSharpTargetDirAnyCpu64>
34+
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(UsingMicrosoftNETSdk)' != 'true'">None</CefSharpBuildAction>
35+
<CefSharpBuildAction Condition="'$(CefSharpBuildAction)' == '' AND '$(UsingMicrosoftNETSdk)' == 'true'">Content</CefSharpBuildAction>
36+
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' == ''"></CefSharpTargetDir>
37+
<!-- Ideally we could use EnsureTrailingSlash, was only added on 2016 so unlikely supported in older version of VS -->
38+
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' != '' AND !HasTrailingSlash('$(CefSharpTargetDir)')">$(CefSharpTargetDir)\</CefSharpTargetDir>
39+
<CefSharpTargetDirAnyCpu32>$(CefSharpTargetDir)x86\</CefSharpTargetDirAnyCpu32>
40+
<CefSharpTargetDirAnyCpu64>$(CefSharpTargetDir)x64\</CefSharpTargetDirAnyCpu64>
3741
</PropertyGroup>
3842

3943
<Choose>
@@ -45,18 +49,18 @@
4549
<Choose>
4650
<When Condition="'$(PlatformTarget)' == 'x64'">
4751
<PropertyGroup>
48-
<CefSharpTargetDir>runtimes\win-x64\lib\netcoreapp3.0</CefSharpTargetDir>
52+
<CefSharpTargetDir>runtimes\win-x64\lib\netcoreapp3.0\</CefSharpTargetDir>
4953
</PropertyGroup>
5054
</When>
5155
<When Condition="'$(PlatformTarget)' == 'x86'">
5256
<PropertyGroup>
53-
<CefSharpTargetDir>runtimes\win-x86\lib\netcoreapp3.0</CefSharpTargetDir>
57+
<CefSharpTargetDir>runtimes\win-x86\lib\netcoreapp3.0\</CefSharpTargetDir>
5458
</PropertyGroup>
5559
</When>
5660
<When Condition="'$(PlatformTarget)' == 'AnyCPU'">
5761
<PropertyGroup>
58-
<CefSharpTargetDirAnyCpu32>runtimes\win-x86\lib\netcoreapp3.0</CefSharpTargetDirAnyCpu32>
59-
<CefSharpTargetDirAnyCpu64>runtimes\win-x64\lib\netcoreapp3.0</CefSharpTargetDirAnyCpu64>
62+
<CefSharpTargetDirAnyCpu32>runtimes\win-x86\lib\netcoreapp3.0\</CefSharpTargetDirAnyCpu32>
63+
<CefSharpTargetDirAnyCpu64>runtimes\win-x64\lib\netcoreapp3.0\</CefSharpTargetDirAnyCpu64>
6064
</PropertyGroup>
6165
</When>
6266
</Choose>
@@ -72,13 +76,13 @@
7276
<When Condition="'$(PlatformTarget)' == 'x64'">
7377
<ItemGroup>
7478
<None Include="@(CefRedist64)">
75-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
79+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
7680
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7781
<PublishState>Included</PublishState>
7882
<Visible>false</Visible>
7983
</None>
8084
<None Include="@(CefSharpCommonBinaries64)">
81-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
85+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
8286
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8387
<PublishState>Included</PublishState>
8488
<Visible>false</Visible>
@@ -91,25 +95,25 @@
9195
<When Condition="'$(PlatformTarget)' == 'AnyCPU'">
9296
<ItemGroup>
9397
<None Include="@(CefRedist32)">
94-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
98+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
9599
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
96100
<PublishState>Included</PublishState>
97101
<Visible>false</Visible>
98102
</None>
99103
<None Include="@(CefRedist64)">
100-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
104+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
101105
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
102106
<PublishState>Included</PublishState>
103107
<Visible>false</Visible>
104108
</None>
105109
<None Include="@(CefSharpCommonBinaries32)">
106-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
110+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
107111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
108112
<PublishState>Included</PublishState>
109113
<Visible>false</Visible>
110114
</None>
111115
<None Include="@(CefSharpCommonBinaries64)">
112-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
116+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
113117
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114118
<PublishState>Included</PublishState>
115119
<Visible>false</Visible>
@@ -119,13 +123,13 @@
119123
in the arch specific folders as required by the BrowserSubProcess.
120124
-->
121125
<None Include="@(CefSharpCommonManagedDlls)">
122-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
126+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
123127
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
124128
<PublishState>Included</PublishState>
125129
<Visible>false</Visible>
126130
</None>
127131
<None Include="@(CefSharpCommonManagedDlls)">
128-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
132+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
129133
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130134
<PublishState>Included</PublishState>
131135
<Visible>false</Visible>
@@ -139,13 +143,13 @@
139143
<Otherwise>
140144
<ItemGroup>
141145
<None Include="@(CefRedist32)">
142-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
146+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
143147
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
144148
<PublishState>Included</PublishState>
145149
<Visible>false</Visible>
146150
</None>
147151
<None Include="@(CefSharpCommonBinaries32)">
148-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
152+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
149153
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150154
<PublishState>Included</PublishState>
151155
<Visible>false</Visible>
@@ -162,13 +166,13 @@
162166
<When Condition="'$(PlatformTarget)' == 'x64'">
163167
<ItemGroup>
164168
<Content Include="@(CefRedist64)">
165-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
169+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
166170
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
167171
<PublishState>Included</PublishState>
168172
<Visible>false</Visible>
169173
</Content>
170174
<Content Include="@(CefSharpCommonBinaries64)">
171-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
175+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
172176
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
173177
<PublishState>Included</PublishState>
174178
<Visible>false</Visible>
@@ -181,25 +185,25 @@
181185
<When Condition="'$(PlatformTarget)' == 'AnyCPU'">
182186
<ItemGroup>
183187
<Content Include="@(CefRedist32)">
184-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
188+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
185189
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
186190
<PublishState>Included</PublishState>
187191
<Visible>false</Visible>
188192
</Content>
189193
<Content Include="@(CefRedist64)">
190-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
194+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
191195
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
192196
<PublishState>Included</PublishState>
193197
<Visible>false</Visible>
194198
</Content>
195199
<Content Include="@(CefSharpCommonBinaries32)">
196-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
200+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
197201
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198202
<PublishState>Included</PublishState>
199203
<Visible>false</Visible>
200204
</Content>
201205
<Content Include="@(CefSharpCommonBinaries64)">
202-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
206+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
203207
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
204208
<PublishState>Included</PublishState>
205209
<Visible>false</Visible>
@@ -209,13 +213,13 @@
209213
in the arch specific folders as required by the BrowserSubProcess.
210214
-->
211215
<Content Include="@(CefSharpCommonManagedDlls)">
212-
<Link>$(CefSharpTargetDirAnyCpu32)\%(RecursiveDir)%(FileName)%(Extension)</Link>
216+
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
213217
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
214218
<PublishState>Included</PublishState>
215219
<Visible>false</Visible>
216220
</Content>
217221
<Content Include="@(CefSharpCommonManagedDlls)">
218-
<Link>$(CefSharpTargetDirAnyCpu64)\%(RecursiveDir)%(FileName)%(Extension)</Link>
222+
<Link>$(CefSharpTargetDirAnyCpu64)%(RecursiveDir)%(FileName)%(Extension)</Link>
219223
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
220224
<PublishState>Included</PublishState>
221225
<Visible>false</Visible>
@@ -229,13 +233,13 @@
229233
<Otherwise>
230234
<ItemGroup>
231235
<Content Include="@(CefRedist32)">
232-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
236+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
233237
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
234238
<PublishState>Included</PublishState>
235239
<Visible>false</Visible>
236240
</Content>
237241
<Content Include="@(CefSharpCommonBinaries32)">
238-
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
242+
<Link>$(CefSharpTargetDir)%(RecursiveDir)%(FileName)%(Extension)</Link>
239243
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
240244
<PublishState>Included</PublishState>
241245
<Visible>false</Visible>

0 commit comments

Comments
 (0)