Skip to content

Commit 9ef8d9c

Browse files
Merge pull request MicrosoftDocs#4782 from MicrosoftDocs/main638339384262054728sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents ff5b107 + eb7eaa9 commit 9ef8d9c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docs/windows/determining-which-dlls-to-redistribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ We only support using a Redistributable package that's the same as or newer than
2727

2828
It's also possible to include the Redistributable DLLs with your installer in *merge modules*. **This method is now deprecated because libraries deployed this way can't be updated automatically by Windows Update.** Redistributable merge modules, or Microsoft Installer modules (*`.msm`* files), are optional components available in the Visual Studio Installer. When installed, merge modules for the Redistributable DLLs are found in your Visual Studio installation directory under `%VCToolsRedistDir%\MergeModules\`. In Visual Studio 2015 and earlier versions of Visual Studio, these files are found in your *Program Files* or *Program Files (x86)* directory in a `Common Files\Merge Modules` subdirectory. For more information about use of these files, see [Redistributing components by using Merge Modules](redistributing-components-by-using-merge-modules.md).
2929

30-
The individual Redistributable DLLs are also included in your installation of Visual Studio. By default, they're installed in the Visual the `%VCToolsRedistDir%\debug_nonredist\[architecture]\Microsoft.[toolset].[library]` folders, where `[architecture]` represents the target architecture, `[toolset]` represents the toolset version, and `[library]` is the Debug library that has the debug DLLs.
30+
The individual Redistributable DLLs are also included in your installation of Visual Studio. By default, they're installed in the Visual the `%VCToolsRedistDir%\[architecture]\Microsoft.[toolset].[library]` folders, where `[architecture]` represents the target architecture, `[toolset]` represents the toolset version, and `[library]` represents the library.
3131

3232
:::moniker-end
3333

0 commit comments

Comments
 (0)