Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup file descriptions baked into Windows unmanaged .dlls #77080

Merged
merged 1 commit into from
Oct 15, 2022
Merged

Cleanup file descriptions baked into Windows unmanaged .dlls #77080

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
2 changes: 1 addition & 1 deletion src/coreclr/debug/createdump/createdump.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime Crash Dump Generator\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Crash Dump Generator"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/dlls/clretwrc/clretwrc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime resources\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime resources"

#include <fxver.h>
#include <fxver.rc>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/dlls/mscordac/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET External Data Access Support\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime External Data Access Support"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/dlls/mscordbi/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime Debugging Services\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Debugging Services"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/dlls/mscoree/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/dlls/mscorrc/mscorrc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <winresrc.h>

#ifndef FX_VER_FILEDESCRIPTION_STR
#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime resources\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime resources"
#endif

#include <fxver.h>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/gc/windows/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime Standalone GC\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Standalone GC"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/hosts/corerun/native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft CoreCLR EXE launcher\0"
#define FX_VER_FILEDESCRIPTION_STR "CoreCLR test host"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/ilasm/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Framework IL assembler\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET IL Assembler"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/ildasm/dasm.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
#endif // !TARGET_UNIX

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Framework IL disassembler\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET IL Disassembler"

#include <fxver.h>
#include <fxver.rc>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime Just-In-Time Compiler\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Just-In-Time Compiler"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/jitinterface/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft .NET Runtime Just-In-Time Compiler Type System Interface\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Just-In-Time Compiler Type System Interface"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/coreclr/tools/metainfo/Native.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#define FX_VER_FILEDESCRIPTION_STR "Microsoft Common Language Runtime Metadata Info\0"
#define FX_VER_FILEDESCRIPTION_STR ".NET Metadata Info"

#include <fxver.h>
#include <fxver.rc>
2 changes: 1 addition & 1 deletion src/native/libs/System.IO.Compression.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ else ()
set(NATIVECOMPRESSION_SOURCES ${ZLIB_SOURCES} ${NATIVECOMPRESSION_SOURCES})

if (GEN_SHARED_LIB)
add_definitions(-DVER_FILEDESCRIPTION_STR="System.IO.Compression.Native")
Copy link
Member Author

@jkotas jkotas Oct 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This matches what we use as file descriptions for managed System.*.dlls

add_library(System.IO.Compression.Native
SHARED
${NATIVECOMPRESSION_SOURCES}
System.IO.Compression.Native.def
# This will add versioning to the library
${VERSION_FILE_RC_PATH}
)
endif ()
Expand Down
4 changes: 0 additions & 4 deletions src/native/libs/System.IO.Compression.Native/Native.rc
View file
Open in desktop

This file was deleted.