Skip to content

Commit 250ecbb

Browse files
committed
Revert changes to make build targets transitive
This is no longer needed now that we update NuGetizer package reference to always be PrivateAssets=all, to account for users not doing it (misconfig issue). This also fixes the issue with multi-targeting projects referencing nugetizer now since we had the wrong path for importing targets in that case.
1 parent 970bd77 commit 250ecbb

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

src/CodeAnalysis/CodeAnalysis.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.1.3" PrivateAssets="all" />
1515
<PackageReference Include="ThisAssembly.Strings" Version="1.1.3" PrivateAssets="all" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
17-
<PackageReference Include="Devlooped.SponsorLink" Version="0.10.2" GeneratePathProperty="true" />
17+
<PackageReference Include="Devlooped.SponsorLink" Version="0.10.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<None Update="NuGetizer.CodeAnalysis.targets" PackFolder="buildTransitive" CopyToOutputDirectory="PreserveNewest" />
22-
<None Include="$(PkgDevlooped_SponsorLink)\buildTransitive\Devlooped.SponsorLink.targets"
23-
PackFolder="buildTransitive"
24-
CopyToOutputDirectory="PreserveNewest" />
21+
<None Update="NuGetizer.CodeAnalysis.targets" PackFolder="build" CopyToOutputDirectory="PreserveNewest" />
2522
</ItemGroup>
2623

2724
</Project>

src/CodeAnalysis/NuGetizer.CodeAnalysis.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,4 @@
3131
<SponsorablePackageId Include="NuGetizer" />
3232
</ItemGroup>
3333

34-
<!-- This ensures devlooped targets are imported transitively even if we are a dev dependency
35-
and therefore don't propagate the SL dependency, which would otherwise cause a build error
36-
due to analyzers being forcedly transitive even if the reference is private assets/dev dep.
37-
-->
38-
<Import Project="Devlooped.SponsorLink.targets" Condition="$(SponsorLinkImported) != true"/>
3934
</Project>

src/NuGetizer.Tasks/NuGetizer.Tasks.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Description>Simple, flexible and powerful NuGet packaging</Description>
2020

2121
<DevelopmentDependency>true</DevelopmentDependency>
22-
<PackFolder>buildTransitive</PackFolder>
22+
<PackFolder>build</PackFolder>
2323

2424
<PackOnBuild Condition="'$(PackOnBuild)' == '' And '$(Configuration)' == 'Release'">true</PackOnBuild>
2525
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">..\..\bin</PackageOutputPath>

0 commit comments

Comments
 (0)