Skip to content
This repository was archived by the owner on Dec 12, 2020. It is now read-only.

Commit 582da8a

Browse files
authored
fix: Block running Tool targets in Metapackage builds (#218)
* build: Skip output of patch.ps1 * feat: Block running Tool targets in metapackage closes #216
1 parent 875f8b0 commit 582da8a

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

src/CodeGeneration.Roslyn.PluginMetapackage.Sdk/Sdk/Sdk.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!-- Announce this SDK (add *AsSdk to differentiate between using this as Sdk
66
and normal PackageReference/dependency usage)-->
77
<UsingCodeGenerationRoslynPluginMetapackageSdkAsSdk>true</UsingCodeGenerationRoslynPluginMetapackageSdkAsSdk>
8+
<!-- Prevent running Tool targets in metapackage -->
9+
<UsingCodeGenerationRoslynToolTargets>false</UsingCodeGenerationRoslynToolTargets>
810
</PropertyGroup>
911

1012
<Import Project="../build/CodeGeneration.Roslyn.PluginMetapackage.Sdk.props" />

src/CodeGeneration.Roslyn.PluginMetapackage.Sdk/Sdk/Sdk.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PackageReference Include="CodeGeneration.Roslyn.Tool"
1515
Version="$(CodeGenerationRoslynPluginMetapackageSdkVersion)"
1616
IsImplicitlyDefined="true"
17+
ExcludeAssets="build"
1718
PrivateAssets="none" />
1819
</ItemGroup>
1920

src/CodeGeneration.Roslyn.Templates/patch.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ while ($InputFile) {
1616
if ($versionSymbol) {
1717
$versionSymbol.defaultValue = $Version
1818
}
19-
New-Item $output -Value (ConvertTo-Json $json) -Force
19+
$null = New-Item $output -Value (ConvertTo-Json $json) -Force
2020
}

src/CodeGeneration.Roslyn.Tool/build/CodeGeneration.Roslyn.Tool.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Announce this Tool's build artifacts are being used.
77
Plugins can validate whether the Tool is available to use on this property.
88
-->
9-
<UsingCodeGenerationRoslynToolTargets>true</UsingCodeGenerationRoslynToolTargets>
9+
<UsingCodeGenerationRoslynToolTargets Condition=" '$(UsingCodeGenerationRoslynToolTargets)' == '' ">true</UsingCodeGenerationRoslynToolTargets>
1010
</PropertyGroup>
1111

1212
<ItemDefinitionGroup>

src/CodeGeneration.Roslyn.Tool/build/CodeGeneration.Roslyn.Tool.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<PropertyGroup>
4+
<PropertyGroup Condition=" '$(UsingCodeGenerationRoslynToolTargets)' != 'false' ">
55
<GenerateCodeFromAttributesDependsOn>
66
$(GenerateCodeFromAttributesDependsOn);
77
ResolveReferences;
@@ -14,6 +14,7 @@
1414

1515
<Target
1616
Name="GenerateCodeFromAttributes"
17+
Condition=" '$(UsingCodeGenerationRoslynToolTargets)' != 'false' "
1718
DependsOnTargets="$(GenerateCodeFromAttributesDependsOn)"
1819
BeforeTargets="CoreCompile;PrepareResources">
1920
</Target>

0 commit comments

Comments
 (0)