diff options
author | Aaron Robinson <arobins@microsoft.com> | 2019-07-03 21:38:04 -0700 |
---|---|---|
committer | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-07-03 21:38:04 -0700 |
commit | a985dda162403ec995c4752e194bc5a062f444a5 (patch) | |
tree | 448c8ce823bee7412ba26ff4796db435c77c54cf /src/pal | |
parent | 4312aeb47447039574e9e905cdcb2bae6388e101 (diff) | |
download | coreclr-a985dda162403ec995c4752e194bc5a062f444a5.tar.gz coreclr-a985dda162403ec995c4752e194bc5a062f444a5.tar.bz2 coreclr-a985dda162403ec995c4752e194bc5a062f444a5.zip |
Remove legacy resource value (PrivateBuild) in binaries. (#25560)
* Remove legacy resource value (PrivateBuild) in binaries.
* Never set the private file flag on the binary
Diffstat (limited to 'src/pal')
-rw-r--r-- | src/pal/prebuilt/inc/fxver.h | 12 | ||||
-rw-r--r-- | src/pal/prebuilt/inc/fxver.rc | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/pal/prebuilt/inc/fxver.h b/src/pal/prebuilt/inc/fxver.h index 7cb0cae0f4..95ccbc6335 100644 --- a/src/pal/prebuilt/inc/fxver.h +++ b/src/pal/prebuilt/inc/fxver.h @@ -96,11 +96,13 @@ #define EXPORT_TAG -#if OFFICIAL_BUILD +// Not setting the private build flag until +// official builds can be detected from native projects +//#if OFFICIAL_BUILD #define VER_PRIVATE 0 -#else -#define VER_PRIVATE VS_FF_PRIVATEBUILD -#endif +//#else +//#define VER_PRIVATE VS_FF_PRIVATEBUILD +//#endif #define VER_SPECIALBUILD 0 @@ -126,8 +128,6 @@ #define VER_COMMENTS_STR "Flavor=" QUOTE_MACRO(URTBLDENV_FRIENDLY) #endif -#define VER_PRIVATEBUILD_STR QUOTE_MACRO(FX_VER_PRIVATEBUILD_STR) - #if defined(__BUILDMACHINE__) #if defined(__BUILDDATE__) #define B2(x,y) " (" #x "." #y ")" diff --git a/src/pal/prebuilt/inc/fxver.rc b/src/pal/prebuilt/inc/fxver.rc index a341041309..ab037e78de 100644 --- a/src/pal/prebuilt/inc/fxver.rc +++ b/src/pal/prebuilt/inc/fxver.rc @@ -62,9 +62,6 @@ BEGIN VALUE "OleSelfRegister", "\0" #endif VALUE "Comments", VER_COMMENTS_STR -#if VER_PRIVATE - VALUE "PrivateBuild", VER_PRIVATEBUILD_STR -#endif #ifdef VER_EXTRA_VALUES VER_EXTRA_VALUES #endif @@ -87,9 +84,6 @@ BEGIN VALUE "OleSelfRegister", "\0" #endif VALUE "Comments", VER_COMMENTS_STR -#if VER_PRIVATE - VALUE "PrivateBuild", VER_PRIVATEBUILD_STR -#endif #ifdef VER_EXTRA_VALUES VER_EXTRA_VALUES #endif |