Skip to content

Commit 6b5496e

Browse files
committed
Fix compatibility with .NET 5 SDK InternalsVisibleTo
1 parent a324c4f commit 6b5496e

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true" />
4545

4646
<!-- DynamicProxyGenAssembly2 is needed so Moq can use our internals -->
47-
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
48-
<InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" PublicKey="$(SixLaborsPublicKey)" />
49-
<InternalsVisibleTo Include="ImageSharp.Drawing.Benchmarks" PublicKey="$(SixLaborsPublicKey)" />
47+
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
48+
<InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" Key="$(SixLaborsPublicKey)" />
49+
<InternalsVisibleTo Include="ImageSharp.Drawing.Benchmarks" Key="$(SixLaborsPublicKey)" />
5050
</ItemGroup>
5151

5252
</Project>

src/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
4747
Inputs="$(MSBuildAllProjects)"
4848
Outputs="$(GeneratedInternalsVisibleToFile)">
49-
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)" Condition="'%(InternalsVisibleTo.PublicKey)' == ''">
49+
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)" Condition="'%(InternalsVisibleTo.Key)' == ''">
5050
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
5151
</CreateItem>
52-
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.PublicKey)" Condition="'%(InternalsVisibleTo.PublicKey)' != ''">
52+
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)" Condition="'%(InternalsVisibleTo.Key)' != ''">
5353
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
5454
</CreateItem>
5555

0 commit comments

Comments
 (0)