Skip to content

Commit 143d177

Browse files
authored
Merge pull request #5202 from MicrosoftDocs/master637237119245793995
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 0b033bd + 10aa9fc commit 143d177

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/containers/container-tools-react.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ Update the Dockerfile by adding the following lines. This will copy node and npm
140140
FROM mcr.microsoft.com/powershell:nanoserver-1903 AS downloadnodejs
141141
SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop';$ProgressPreference='silentlyContinue';"]
142142
RUN Invoke-WebRequest -OutFile nodejs.zip -UseBasicParsing "https://nodejs.org/dist/v10.16.3/node-v10.16.3-win-x64.zip"; `
143-
RUN Expand-Archive nodejs.zip -DestinationPath C:\; `
144-
RUN Rename-Item "C:\node-v10.16.3-win-x64" c:\nodejs
143+
Expand-Archive nodejs.zip -DestinationPath C:\; `
144+
Rename-Item "C:\node-v10.16.3-win-x64" c:\nodejs
145145
146146
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-nanoserver-1903 AS base
147147
WORKDIR /app

docs/ide/reference/devenv-command-line-switches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ The following command-line switches display the IDE and do the described task.
6666
|[/LCID or /L](lcid-devenv-exe.md)|Sets the default language for the IDE. If the specified language isn't included in your installation of Visual Studio, this setting is ignored.<br /><br /> `devenv /l 1033`|
6767
|[/Log](log-devenv-exe.md)|Starts Visual Studio and logs all activity to the log file.<br /><br /> `devenv /log mylogfile.xml`|
6868
|[/NoSplash](nosplash-devenv-exe.md)|Opens the IDE without showing the splash screen.<br /><br /> `devenv /nosplash File1 File2`|
69+
|[/ResetSettings](resetsettings-devenv-exe.md)|Restores Visual Studio default settings. Optionally resets the settings to the specified `.vssettings` file.<br /><br /> `devenv /resetsettings mysettings.vssettings`|
6970
|[/Run or /R](run-devenv-exe.md)|Compiles and runs the specified solution.<br /><br /> `devenv /run mysln.sln`|
7071
|[/RunExit](runexit-devenv-exe.md)|Compiles and runs the specified solution, minimizes the IDE when the solution is run, and closes the IDE after the solution has finished running.<br /><br /> `devenv /runexit mysln.sln`|
7172
|[/SafeMode](safemode-devenv-exe.md)|Starts Visual Studio in safe mode. This switch loads only the default environment, the default services, and the shipped versions of third-party packages.<br /><br /> This switch takes no arguments.|
@@ -83,7 +84,6 @@ The following command-line switches don't display the IDE.
8384
|[/Project](project-devenv-exe.md)|The project to build, clean, or deploy. You can use this switch only if you've also supplied the `/Build`, `/Rebuild`, `/Clean`, or `/Deploy` switch.<br /><br /> `devenv mysln.sln /build Debug /project proj1`|
8485
|[/ProjectConfig](projectconfig-devenv-exe.md)|Specifies the project configuration to build or deploy. You can use this switch only if you've also supplied the `/Project` switch.<br /><br /> `devenv mysln.sln /build Release /project proj1 /projectconfig Release`|
8586
|[/Rebuild](rebuild-devenv-exe.md)|Cleans and then builds the specified solution or project according to the configuration of the specified solution.<br /><br /> `devenv mysln.sln /rebuild`|
86-
|[/ResetSettings](resetsettings-devenv-exe.md)|Restores Visual Studio default settings. Optionally resets the settings to the specified `.vssettings` file.<br /><br /> `devenv /resetsettings mysettings.vssettings`|
8787
|[/Upgrade](upgrade-devenv-exe.md)|Upgrades the specified solution file and all its project files, or the specified project file, to the current Visual Studio formats for these files.<br /><br /> `devenv mysln.sln /upgrade`|
8888

8989
## See also

docs/msbuild/how-to-use-the-same-target-in-multiple-project-files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ ms.workload:
1515
# How to: Use the same target in multiple project files
1616

1717
If you have authored several MSBuild project files, you might have discovered that you need to use the same tasks and targets in different project files. Instead of including the complete description of those tasks or targets in every project file, you can save a target in a separate project file and then import that project into any other project that needs to use the target.
18+
1819
## Use the Import element
1920

20-
The `Import` element is used to insert one project file into another project file. The project file that is being imported must be a valid MSBuild project file and contain well-formed XML. The `Project` attribute specifies the path to the imported project file. For more information on the `Import` element, see [Import element (MSBuild)](../msbuild/import-element-msbuild.md).
21-
The `Import` element is used to insert one project file into another project file. The project file that is being imported must be a valid MSBuild project file and contain well-formed XML. The `Project` attribute specifies the path to the imported project file. For more information on the `Import` element, see [Import element (MSBuild)](../msbuild/import-element-msbuild.md).
21+
The `Import` element is used to insert one project file into another project file. The project file that is being imported must be a valid MSBuild project file and contain well-formed XML. The `Project` attribute specifies the path to the imported project file. For more information on the `Import` element, see [Import element (MSBuild)](../msbuild/import-element-msbuild.md).
2222

2323
#### To import a project
2424

0 commit comments

Comments
 (0)