Skip to content

Commit a89d407

Browse files
merceyzamaitland
merceyz
authored and
amaitland
committed
Updated build script and added assembly details to the C++CLI projects (#1947)
* Made build script update manifest files * Made build script update AssemblyFileVersion * Replaced tabs with spaces * Added resource files to the C++ CLI projects to be able to set the version * Added the rest of the resource files * Fix build script error * Made build script update version in the C++CLI projects * Fixed WPF browser going blank when connecting over RDP * Revert "Fixed WPF browser going blank when connecting over RDP" This reverts commit 3c29975.
1 parent ad29104 commit a89d407

11 files changed

+140
-0
lines changed

Diff for: ‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj

+4
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
<ClInclude Include="Async\JavascriptAsyncMethodWrapper.h" />
172172
<ClInclude Include="Async\JavascriptAsyncObjectWrapper.h" />
173173
<ClInclude Include="CefAppUnmanagedWrapper.h" />
174+
<ClInclude Include="resource.h" />
174175
<ClInclude Include="WcfEnabledSubProcess.h" />
175176
<ClInclude Include="SubProcess.h" />
176177
<ClInclude Include="CefBrowserWrapper.h" />
@@ -222,6 +223,9 @@
222223
<ItemGroup>
223224
<None Include="packages.config" />
224225
</ItemGroup>
226+
<ItemGroup>
227+
<ResourceCompile Include="Resource.rc" />
228+
</ItemGroup>
225229
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
226230
<ImportGroup Label="ExtensionTargets" />
227231
</Project>

Diff for: ‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
<ClInclude Include="WcfEnabledSubProcess.h">
9090
<Filter>Header Files</Filter>
9191
</ClInclude>
92+
<ClInclude Include="resource.h">
93+
<Filter>Header Files</Filter>
94+
</ClInclude>
9295
</ItemGroup>
9396
<ItemGroup>
9497
<ClCompile Include="AssemblyInfo.cpp">
@@ -152,4 +155,7 @@
152155
<ItemGroup>
153156
<None Include="packages.config" />
154157
</ItemGroup>
158+
<ItemGroup>
159+
<ResourceCompile Include="Resource.rc" />
160+
</ItemGroup>
155161
</Project>

Diff for: ‎CefSharp.BrowserSubprocess.Core/Resource.aps

2.04 KB
Binary file not shown.

Diff for: ‎CefSharp.BrowserSubprocess.Core/Resource.rc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
1 VERSIONINFO
2+
FILEVERSION 55.0.0
3+
PRODUCTVERSION 55.0.0
4+
FILEFLAGSMASK 0x17L
5+
#ifdef _DEBUG
6+
FILEFLAGS 0x1L
7+
#else
8+
FILEFLAGS 0x0L
9+
#endif
10+
FILEOS 0x4L
11+
FILETYPE 0x1L
12+
FILESUBTYPE 0x0L
13+
BEGIN
14+
BLOCK "StringFileInfo"
15+
BEGIN
16+
BLOCK "040904b0"
17+
BEGIN
18+
VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
19+
VALUE "FileVersion", "55.0.0"
20+
VALUE "LegalCopyright", "Copyright © The CefSharp Authors 2010-2016"
21+
VALUE "ProductName", "CefSharp"
22+
VALUE "ProductVersion", "55.0.0"
23+
END
24+
END
25+
BLOCK "VarFileInfo"
26+
BEGIN
27+
VALUE "Translation", 0x409, 1200
28+
END
29+
END

Diff for: ‎CefSharp.BrowserSubprocess.Core/resource.h

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by Resource.rc
4+
5+
// Next default values for new objects
6+
//
7+
#ifdef APSTUDIO_INVOKED
8+
#ifndef APSTUDIO_READONLY_SYMBOLS
9+
#define _APS_NEXT_RESOURCE_VALUE 101
10+
#define _APS_NEXT_COMMAND_VALUE 40001
11+
#define _APS_NEXT_CONTROL_VALUE 1001
12+
#define _APS_NEXT_SYMED_VALUE 101
13+
#endif
14+
#endif

Diff for: ‎CefSharp.Core/CefSharp.Core.vcxproj

+4
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@
285285
<ClInclude Include="Internals\CefWrapper.h" />
286286
<ClInclude Include="PopupFeatures.h" />
287287
<ClInclude Include="RequestContextHandler.h" />
288+
<ClInclude Include="resource.h" />
288289
<ClInclude Include="WindowInfo.h" />
289290
<ClInclude Include="Internals\CefCompletionCallbackAdapter.h" />
290291
<ClInclude Include="Internals\ClientAdapter.h" />
@@ -330,6 +331,9 @@
330331
<ItemGroup>
331332
<None Include="packages.config" />
332333
</ItemGroup>
334+
<ItemGroup>
335+
<ResourceCompile Include="Resource.rc" />
336+
</ItemGroup>
333337
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
334338
<ImportGroup Label="ExtensionTargets" />
335339
</Project>

Diff for: ‎CefSharp.Core/CefSharp.Core.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@
268268
<ClInclude Include="Internals\CefGetGeolocationCallbackAdapter.h">
269269
<Filter>Header Files</Filter>
270270
</ClInclude>
271+
<ClInclude Include="resource.h">
272+
<Filter>Header Files</Filter>
273+
</ClInclude>
271274
</ItemGroup>
272275
<ItemGroup>
273276
<ClInclude Include="Internals\CefSharpBrowserWrapper.h">
@@ -283,4 +286,7 @@
283286
<ItemGroup>
284287
<None Include="packages.config" />
285288
</ItemGroup>
289+
<ItemGroup>
290+
<ResourceCompile Include="Resource.rc" />
291+
</ItemGroup>
286292
</Project>

Diff for: ‎CefSharp.Core/Resource.aps

1.96 KB
Binary file not shown.

Diff for: ‎CefSharp.Core/Resource.rc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
1 VERSIONINFO
2+
FILEVERSION 55.0.0
3+
PRODUCTVERSION 55.0.0
4+
FILEFLAGSMASK 0x17L
5+
#ifdef _DEBUG
6+
FILEFLAGS 0x1L
7+
#else
8+
FILEFLAGS 0x0L
9+
#endif
10+
FILEOS 0x4L
11+
FILETYPE 0x1L
12+
FILESUBTYPE 0x0L
13+
BEGIN
14+
BLOCK "StringFileInfo"
15+
BEGIN
16+
BLOCK "040904b0"
17+
BEGIN
18+
VALUE "FileDescription", "CefSharp.Core"
19+
VALUE "FileVersion", "55.0.0"
20+
VALUE "LegalCopyright", "Copyright © The CefSharp Authors 2010-2016"
21+
VALUE "ProductName", "CefSharp"
22+
VALUE "ProductVersion", "55.0.0"
23+
END
24+
END
25+
BLOCK "VarFileInfo"
26+
BEGIN
27+
VALUE "Translation", 0x409, 1200
28+
END
29+
END

Diff for: ‎CefSharp.Core/resource.h

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by Resource.rc
4+
5+
// Next default values for new objects
6+
//
7+
#ifdef APSTUDIO_INVOKED
8+
#ifndef APSTUDIO_READONLY_SYMBOLS
9+
#define _APS_NEXT_RESOURCE_VALUE 101
10+
#define _APS_NEXT_COMMAND_VALUE 40001
11+
#define _APS_NEXT_CONTROL_VALUE 1001
12+
#define _APS_NEXT_SYMED_VALUE 101
13+
#endif
14+
#endif

Diff for: ‎build.ps1

+34
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,35 @@ function WriteAssemblyVersion
308308

309309
$Filename = Join-Path $WorkingDir CefSharp\Properties\AssemblyInfo.cs
310310
$Regex = 'public const string AssemblyVersion = "(.*)"';
311+
$Regex2 = 'public const string AssemblyFileVersion = "(.*)"'
311312

312313
$AssemblyInfo = Get-Content $Filename
313314
$NewString = $AssemblyInfo -replace $Regex, "public const string AssemblyVersion = ""$AssemblyVersion"""
315+
$NewString = $NewString -replace $Regex2, "public const string AssemblyFileVersion = ""$AssemblyVersion.0"""
316+
317+
$NewString | Set-Content $Filename -Encoding UTF8
318+
}
319+
320+
function WriteVersionToManifest($manifest)
321+
{
322+
$Filename = Join-Path $WorkingDir $manifest
323+
$Regex = 'assemblyIdentity version="(.*?)"';
324+
325+
$ManifestData = Get-Content $Filename
326+
$NewString = $ManifestData -replace $Regex, "assemblyIdentity version=""$AssemblyVersion.0"""
327+
328+
$NewString | Set-Content $Filename -Encoding UTF8
329+
}
330+
331+
function WriteVersionToResourceFile($resourceFile)
332+
{
333+
$Filename = Join-Path $WorkingDir $resourceFile
334+
$Regex1 = 'VERSION .*';
335+
$Regex2 = 'Version", ".*?"';
336+
337+
$ResourceData = Get-Content $Filename
338+
$NewString = $ResourceData -replace $Regex1, "VERSION $AssemblyVersion"
339+
$NewString = $NewString -replace $Regex2, "Version"", ""$AssemblyVersion"""
314340

315341
$NewString | Set-Content $Filename -Encoding UTF8
316342
}
@@ -323,6 +349,14 @@ NugetPackageRestore
323349

324350
WriteAssemblyVersion
325351

352+
WriteVersionToManifest "CefSharp.BrowserSubprocess\app.manifest"
353+
WriteVersionToManifest "CefSharp.OffScreen.Example\app.manifest"
354+
WriteVersionToManifest "CefSharp.WinForms.Example\app.manifest"
355+
WriteVersionToManifest "CefSharp.Wpf.Example\app.manifest"
356+
357+
WriteVersionToResourceFile "CefSharp.BrowserSubprocess.Core\Resource.rc"
358+
WriteVersionToResourceFile "CefSharp.Core\Resource.rc"
359+
326360
switch -Exact ($Target)
327361
{
328362
"nupkg-only"

0 commit comments

Comments
 (0)