Skip to content

Commit 4b48049

Browse files
authored
Merge pull request #87 from dotnet/master
Update Live with current Master
2 parents 3f8c920 + 4ce9339 commit 4b48049

File tree

63 files changed

+107
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+107
-113
lines changed

includes/ajax-current-ext-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tla2sharptla-win-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tla2sharptla-winforms-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/tlasharptla-avalonwinfx-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/vsprvs-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/wf-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/wf2-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

xml/Microsoft.Build.Tasks/AssignProjectConfiguration.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
<format type="text/markdown"><![CDATA[
329329
330330
## Remarks
331-
Since [!INCLUDE[vsprvs](~/includes/vsprvs-md.md)] only pre-resolves non-[!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] projects, this means that project references in this list are in the [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] format.
331+
Since Visual Studio only pre-resolves non-MSBuild projects, this means that project references in this list are in the MSBuild format.
332332
333333
]]></format>
334334
</remarks>

xml/Microsoft.Build.Tasks/Csc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
<format type="text/markdown"><![CDATA[
566566
567567
## Remarks
568-
Used only by [!INCLUDE[vsprvs](~/includes/vsprvs-md.md)].
568+
Used only by Visual Studio.
569569
570570
]]></format>
571571
</remarks>

xml/Microsoft.Build.Tasks/ResolveNonMSBuildProjectOutput.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<format type="text/markdown"><![CDATA[
1919
2020
## Remarks
21-
The `ResolveNonMSBuildProjectOutput` task searches for a special property set by the [!INCLUDE[vsprvs](~/includes/vsprvs-md.md)] IDE for the list of project GUIDs and their associated outputs. The IDE only pre-resolves non-[!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] projects and in this way separates [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] project references from non-[!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] references. The IDE returns the list of [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] projects as UnresolvedProjectReferences. This enables the task to use more powerful [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] mechanisms to manipulate just the [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] project references, such as. calling into specific targets of references to get the manifest file name, which would not be possible with a mixed list of [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] and non-[!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] project references.
21+
The `ResolveNonMSBuildProjectOutput` task searches for a special property set by the Visual Studio IDE for the list of project GUIDs and their associated outputs. The IDE only pre-resolves non-MSBuild projects and in this way separates MSBuild project references from non-MSBuild references. The IDE returns the list of MSBuild projects as UnresolvedProjectReferences. This enables the task to use more powerful MSBuild mechanisms to manipulate just the MSBuild project references, such as calling into specific targets of references to get the manifest file name, which would not be possible with a mixed list of MSBuild and non-MSBuild project references.
2222
2323
]]></format>
2424
</remarks>
@@ -139,7 +139,7 @@
139139
<format type="text/markdown"><![CDATA[
140140
141141
## Remarks
142-
Since [!INCLUDE[vsprvs](~/includes/vsprvs-md.md)] only pre-resolves non-[!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] projects, the project reference items that could not be resolved using the pre-resolved list of outputs are in the [!INCLUDE[vstecmsbuild](~/includes/vstecmsbuild-md.md)] format.
142+
Since Visual Studio only pre-resolves non-MSBuild projects, the project reference items that could not be resolved using the pre-resolved list of outputs are in the MSBuild format.
143143
144144
]]></format>
145145
</remarks>

0 commit comments

Comments
 (0)