Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.0] Fix version info missing from native binaries #7867

Merged
dagood merged 1 commit into from
Aug 27, 2019
Merged

[release/3.0] Fix version info missing from native binaries #7867

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
19 changes: 8 additions & 11 deletions src/corehost/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<!--
Always disable sourcelink in this project so that Arcade doesn't complain about 'The target
"InitializeSourceControlInformationFromSourceControlManager" does not exist in the project.'.
Add basic project properties for NuGet restore, needed to import the SourceLink MSBuild tool
package's targets into the build.
-->
<Import Project="$(RepositoryEngineeringDir)/DisableSourceControlManagement.targets"
Condition="'$(DisableSourceControlManagementTargetsImported)' != 'true'" />
<PropertyGroup>
<TargetFramework>$(NETCoreAppFramework)</TargetFramework>
</PropertyGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

<!-- Target that builds dotnet, hostfxr and hostpolicy with the same version as what NetCoreApp will be built for
since the build produced artifacts should always version the same (even if they may not get used).
Expand All @@ -19,11 +21,6 @@
BuildCoreHostUnix;
BuildCoreHostWindows" />

<PropertyGroup Condition="'$(OSGroup)' != 'Windows_NT'">
<GenerateVersionSourceFile>true</GenerateVersionSourceFile>
<NativeVersionSourceFile>$(ObjDir)version.cpp</NativeVersionSourceFile>
</PropertyGroup>

<Target Name="BuildCoreHostUnix"
Condition="'$(OSGroup)' != 'Windows_NT'"
DependsOnTargets="GetLatestCommitHash;GenerateNativeVersionFile">
Expand Down
2 changes: 1 addition & 1 deletion src/corehost/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ __configuration=Debug
__linkPortable=0
__cmake_defines=
__baseIntermediateOutputPath="$RootRepo/artifacts/obj"
__versionSourceFile="$__baseIntermediateOutputPath/version.cpp"
__versionSourceFile="$__baseIntermediateOutputPath/_version.c"
__cmake_bin_prefix=

while [ "$1" != "" ]; do
Expand Down