Skip to content
This repository has been archived by the owner on Sep 25, 2024. It is now read-only.

Commit

Permalink
Reordered comment regarding invisible logic
Browse files Browse the repository at this point in the history
  • Loading branch information
teneko committed Apr 10, 2021
1 parent 071ec4b commit 2ccc0d8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/Nullable/src/Teronis.Nullable.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -170,27 +170,6 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<None Include="buildMultiTargeting\*" Pack="true" PackagePath="buildMultiTargeting" />
</ItemGroup>

<!--
We can put the invisible logic inside .props because on customer side it gets included AFTER the attribute files are added:
...
<Compile Include="$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\contentFiles\cs\netstandard2.0\StaticAnalyseAttributes\NotNullWhenAttribute.cs" Condition="Exists('$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\contentFiles\cs\netstandard2.0\StaticAnalyseAttributes\NotNullWhenAttribute.cs')">
<NuGetPackageId>Teronis.Nullable</NuGetPackageId>
<NuGetPackageVersion>0.1.8-alpha.247</NuGetPackageVersion>
<NuGetItemType>Compile</NuGetItemType>
<Pack>false</Pack>
<Private>False</Private>
<Link>StaticAnalyseAttributes\NotNullWhenAttribute.cs</Link>
</Compile>
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\build\Teronis.Nullable.props" Condition="Exists('$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\build\Teronis.Nullable.props')" />
</ImportGroup>
-->

<Target Name="AddBuildFilesToPackage">

</Target>

<!-- We do not do this. -->

<!--<ItemGroup>
Expand Down
17 changes: 17 additions & 0 deletions src/Nullable/src/build/Teronis.Nullable.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Provides PackagePathStaticAnalyseAttributesFolder variable. -->
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFilename).Core.props"/>

<!--
We can put the invisible logic inside .props because on customer side it gets included AFTER the attribute files are added:
...
<Compile Include="$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\contentFiles\cs\netstandard2.0\StaticAnalyseAttributes\NotNullWhenAttribute.cs" Condition="Exists('$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\contentFiles\cs\netstandard2.0\StaticAnalyseAttributes\NotNullWhenAttribute.cs')">
<NuGetPackageId>Teronis.Nullable</NuGetPackageId>
<NuGetPackageVersion>0.1.8-alpha.247</NuGetPackageVersion>
<NuGetItemType>Compile</NuGetItemType>
<Pack>false</Pack>
<Private>False</Private>
<Link>StaticAnalyseAttributes\NotNullWhenAttribute.cs</Link>
</Compile>
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\build\Teronis.Nullable.props" Condition="Exists('$(NuGetPackageRoot)teronis.nullable\0.1.8-alpha.247\build\Teronis.Nullable.props')" />
</ImportGroup>
-->
<ItemGroup>
<Compile Update="$(NuGetPackageRoot)$(MSBuildThisFilename)/**/$(PackagePathStaticAnalyseAttributesFolder)/*.cs" Visible="false" />
</ItemGroup>
Expand Down

0 comments on commit 2ccc0d8

Please sign in to comment.