diff options
| author | Eric Erhardt <eric.erhardt@microsoft.com> | 2022-01-24 19:42:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 19:42:15 +0300 |
| commit | d99fa6789ad213df87358b0bd6fbffd9e0c31371 (patch) | |
| tree | 4636aaaafa846cc2e884b6010fe5959aad544c96 /eng/packaging.targets | |
| parent | eb8a502a0cac4733cdfb30e39288a808f51851ba (diff) | |
Respond to feedback in GenerateMultiTargetRoslynComponentTargetsFile (#63943)
* Respond to feedback in GenerateMultiTargetRoslynComponentTargetsFile
Two small follow up changes from #58446
- Fix a type-o that breaks incremental build. Forgot to use MSBuild property syntax
- Instead of having the infrastructure hard-code removing 'Abstractions', packages can set their own Disable source gen property name.
* PR feedback
Diffstat (limited to 'eng/packaging.targets')
| -rw-r--r-- | eng/packaging.targets | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eng/packaging.targets b/eng/packaging.targets index 667837fbff1..c305c64dd94 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -162,19 +162,18 @@ </Target> <Target Name="GenerateMultiTargetRoslynComponentTargetsFile" - Inputs="$(MSBuildProjectFullPath);_MultiTargetRoslynComponentTargetsTemplate" + Inputs="$(MSBuildProjectFullPath);$(_MultiTargetRoslynComponentTargetsTemplate)" Outputs="$(MultiTargetRoslynComponentTargetsFileIntermediatePath)"> <PropertyGroup> <_MultiTargetRoslynComponentTargetPrefix>$(PackageId.Replace('.', '_'))</_MultiTargetRoslynComponentTargetPrefix> - <_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName>Disable$(PackageId.Replace('.', ''))SourceGenerator</_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName> - <_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName>$(_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName.Replace('Abstractions', ''))</_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName> + <DisableSourceGeneratorPropertyName Condition="'$(DisableSourceGeneratorPropertyName)' == ''">Disable$(PackageId.Replace('.', ''))SourceGenerator</DisableSourceGeneratorPropertyName> </PropertyGroup> <WriteLinesToFile File="$(MultiTargetRoslynComponentTargetsFileIntermediatePath)" Lines="$([System.IO.File]::ReadAllText('$(_MultiTargetRoslynComponentTargetsTemplate)') .Replace('{TargetPrefix}', '$(_MultiTargetRoslynComponentTargetPrefix)') .Replace('{NuGetPackageId}', '$(PackageId)') - .Replace('{DisableSourceGeneratorPropertyName}', '$(_MultiTargetRoslynComponentDisableSourceGeneratorPropertyName)'))" + .Replace('{DisableSourceGeneratorPropertyName}', '$(DisableSourceGeneratorPropertyName)'))" Overwrite="true" /> </Target> |