Skip to content

Commit 94a6f01

Browse files
tmattmat
committed
Rename to PublishedProjectOutputGroup
1 parent 5bb091b commit 94a6f01

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎eng/targets/VisualStudio.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@
151151
Workaround for missing dependency publishing feature in the VS SDK.
152152
153153
Relies on the following convention: When a project reference publish outputs (i.e. more than standard build outputs) need to be packaged into a VSIX,
154-
the project should define VsixItemsOutputGroup target and include it in ProjectRefrence.IncludeOutputGroupsInVSIX.
154+
the project should define PublishedProjectOutputGroup target and include it in ProjectRefrence.IncludeOutputGroupsInVSIX.
155155
156-
VsixItemsOutputGroup target may gather all the publishing items to be packaged into the VSIX using PublishItemsOutputGroup target,
157-
but should not depend on Publish target (i.e. invoking VsixItemsOutputGroup target should not trigger actual publishing).
156+
PublishedProjectOutputGroup target may gather all the publishing items to be packaged into the VSIX using PublishItemsOutputGroup target,
157+
but should not depend on Publish target (i.e. invoking PublishedProjectOutputGroup target should not trigger actual publishing).
158158
159-
Target PublishProjectReferencesForVsixCreation will take care of publishing for all ProjectReferences with VsixItemsOutputGroup.
159+
Target PublishProjectReferencesForVsixCreation will take care of publishing for all ProjectReferences with PublishedProjectOutputGroup.
160160
-->
161161

162162
<PropertyGroup>
@@ -165,7 +165,7 @@
165165

166166
<Target Name="PublishProjectReferencesForVsixCreation">
167167
<ItemGroup>
168-
<_ProjectsToPublish Include="@(ProjectReference)" Condition="$([MSBuild]::ValueOrDefault('%(ProjectReference.IncludeOutputGroupsInVSIX)', '').Contains('VsixItemsOutputGroup'))"/>
168+
<_ProjectsToPublish Include="@(ProjectReference)" Condition="$([MSBuild]::ValueOrDefault('%(ProjectReference.IncludeOutputGroupsInVSIX)', '').Contains('PublishedProjectOutputGroup'))"/>
169169
</ItemGroup>
170170

171171
<MSBuild Projects="@(_ProjectsToPublish)"

‎src/Interactive/HostProcess/x64/InteractiveHost64.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Compile Include="..\InteractiveHostEntryPoint.cs" />
2828
</ItemGroup>
2929

30-
<Target Name="VsixItemsOutputGroup" DependsOnTargets="PublishItemsOutputGroup" Returns="@(_VsixItem)">
30+
<Target Name="PublishedProjectOutputGroup" DependsOnTargets="PublishItemsOutputGroup" Returns="@(_VsixItem)">
3131
<!-- Workaround for https://github.com/dotnet/sdk/issues/42255 -->
3232
<PropertyGroup>
3333
<!-- IntermediateDepsFilePath is the location where the deps.json file is originally created -->
@@ -64,5 +64,5 @@
6464
</ItemGroup>
6565
</Target>
6666

67-
<Target Name="PublishVsixItems" DependsOnTargets="Publish;VsixItemsOutputGroup" Returns="@(_VsixItem)" />
67+
<Target Name="PublishVsixItems" DependsOnTargets="Publish;PublishedProjectOutputGroup" Returns="@(_VsixItem)" />
6868
</Project>

‎src/Interactive/HostProcess/x86/InteractiveHost32.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!--
2424
InteractiveHost32 is deployed to the same directory as InteractiveHost64 as it shares the same dependencies.
2525
-->
26-
<Target Name="VsixItemsOutputGroup" Returns="@(_VsixItem)">
26+
<Target Name="PublishedProjectOutputGroup" Returns="@(_VsixItem)">
2727
<ItemGroup>
2828
<_VsixItem Include="$(TargetPath)">
2929
<TargetPath>$(TargetFileName)</TargetPath>
@@ -42,5 +42,5 @@
4242
4343
Use BuiltProjectOutputGroup as the dependend target to ensure the targets has all dependencies that BuiltProjectOutputGroupOutput would have.
4444
-->
45-
<Target Name="PublishVsixItems" DependsOnTargets="Build;BuiltProjectOutputGroup;VsixItemsOutputGroup" Returns="@(_VsixItem)" />
45+
<Target Name="PublishVsixItems" DependsOnTargets="Build;BuiltProjectOutputGroup;PublishedProjectOutputGroup" Returns="@(_VsixItem)" />
4646
</Project>

‎src/Tools/SemanticSearch/ReferenceAssemblies/SemanticSearch.ReferenceAssemblies.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
</Target>
6262

6363
<!-- Used from Setup and test projects to fetch the list of generated ref assemblies -->
64-
<Target Name="VsixItemsOutputGroup" DependsOnTargets="_CalculateFilteredReferenceAssembliesInputsAndOutputs" Returns="@(_OutputFile)" />
64+
<Target Name="PublishedProjectOutputGroup" DependsOnTargets="_CalculateFilteredReferenceAssembliesInputsAndOutputs" Returns="@(_OutputFile)" />
6565

6666
<!-- Generates ref assemblies -->
67-
<Target Name="PublishVsixItems" DependsOnTargets="VsixItemsOutputGroup;GenerateFilteredReferenceAssemblies" Returns="@(_OutputFile)" />
67+
<Target Name="PublishVsixItems" DependsOnTargets="PublishedProjectOutputGroup;GenerateFilteredReferenceAssemblies" Returns="@(_OutputFile)" />
6868
</Project>

‎src/VisualStudio/Setup.ServiceHub/arm64/Roslyn.VisualStudio.ServiceHub.Setup.arm64.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- This project targets netcoreapp -->
2121
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2222
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
23-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
23+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
2424
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
2525
<Private>false</Private>
2626
<!-- Disable NGEN. Core assemblies are crossgened. -->

‎src/VisualStudio/Setup.ServiceHub/x64/Roslyn.VisualStudio.ServiceHub.Setup.x64.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- This project targets netcoreapp -->
1313
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
1414
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
15-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
15+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
1616
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
1717
<Private>false</Private>
1818
<!-- Disable NGEN. Core assemblies are crossgened. -->

‎src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278

279279
<Private>false</Private>
280280
<VSIXSubPath>InteractiveHost\Core</VSIXSubPath>
281-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
281+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
282282
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
283283

284284
<!-- Disable NGEN. Core assemblies are crossgened. -->
@@ -293,7 +293,7 @@
293293

294294
<Private>false</Private>
295295
<VSIXSubPath>InteractiveHost\Desktop</VSIXSubPath>
296-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
296+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
297297
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
298298
</ProjectReference>
299299
<ProjectReference Include="..\..\Interactive\HostProcess\x86\InteractiveHost32.csproj">
@@ -308,7 +308,7 @@
308308

309309
<Private>false</Private>
310310
<VSIXSubPath>InteractiveHost\Desktop</VSIXSubPath>
311-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
311+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
312312
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
313313
</ProjectReference>
314314
<ProjectReference Include="..\..\Tools\SemanticSearch\ReferenceAssemblies\SemanticSearch.ReferenceAssemblies.csproj">
@@ -317,7 +317,7 @@
317317
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
318318
<Private>false</Private>
319319
<VSIXSubPath>SemanticSearchRefs</VSIXSubPath>
320-
<IncludeOutputGroupsInVSIX>VsixItemsOutputGroup</IncludeOutputGroupsInVSIX>
320+
<IncludeOutputGroupsInVSIX>PublishedProjectOutputGroup</IncludeOutputGroupsInVSIX>
321321
<IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
322322
<Ngen>false</Ngen>
323323
</ProjectReference>

‎src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<Error Text="Crossgen2 failed with exit code $(_Crossgen2ErrorCode)." Condition="'$(_Crossgen2ErrorCode)' != '0'" />
138138
</Target>
139139

140-
<Target Name="VsixItemsOutputGroup" DependsOnTargets="CalculateCrossgenInputs" Returns="@(_VsixItem)">
140+
<Target Name="PublishedProjectOutputGroup" DependsOnTargets="CalculateCrossgenInputs" Returns="@(_VsixItem)">
141141
<PropertyGroup>
142142
<!--
143143
For BCL, we want to use the version provided by the runtime in VS, not the ones from the NuGet packages.
@@ -167,5 +167,5 @@
167167
</ItemGroup>
168168
</Target>
169169

170-
<Target Name="PublishVsixItems" DependsOnTargets="VsixItemsOutputGroup;CompileReadyToRun" Returns="@(_VsixItem)" />
170+
<Target Name="PublishVsixItems" DependsOnTargets="PublishedProjectOutputGroup;CompileReadyToRun" Returns="@(_VsixItem)" />
171171
</Project>

0 commit comments

Comments
 (0)