Skip to content

refactor: avoid InternalsVisibleTo #1217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 22, 2025
Merged

refactor: avoid InternalsVisibleTo #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc9f4e2
refactor: use `InternalsVisibleTo` in csproj file
vbreuss Feb 22, 2025
268ac97
Avoid `InternalsVisibleTo`
vbreuss Feb 22, 2025
4f8592e
Keep internals visible to for `DynamicProxyGenAssembly2`
vbreuss Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<Copyright>Copyright © Tatham Oddie &amp; friends 2010-$([System.DateTime]::Now.ToString('yyyy'))</Copyright>
<Authors>Tatham Oddie &amp; friends</Authors>
<SignAssembly Condition="'$(Configuration)' == 'Release'">True</SignAssembly>
<PublicKey>00240000048000009400000006020000002400005253413100040000010001001160c7a0f907c400c5392975b66d2f3752fb82625d5674d386b83896d4d4ae8d0ef8319ef391fbb3466de0058ad2f361b8f5cb8a32ecb4e908bece5c519387552cedd2ca0250e36b59c6d6dc3dc260ca73a7e27c3add4ae22d5abaa562225d7ba34d427e8f3f52928a46a674deb0208eca7d379aa22712355b91a55a5ce521d2</PublicKey>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)StrongName.snk</AssemblyOriginatorKeyFile>
<LangVersion>latest</LangVersion>
<PackageTags>testing</PackageTags>
Expand Down
7 changes: 0 additions & 7 deletions src/TestableIO.System.IO.Abstractions.TestingHelpers/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/TestableIO.System.IO.Abstractions.Wrappers/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions ...tableIO.System.IO.Abstractions.Wrappers/TestableIO.System.IO.Abstractions.Wrappers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,14 @@
<PackageReference Include="Testably.Abstractions.FileSystem.Interface"/>
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.CLSCompliantAttribute">
<_Parameter1>true</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"/>
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion ...stractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net472.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.7.2", FrameworkDisplayName=".NET Framework 4.7.2")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
1 change: 0 additions & 1 deletion ...stractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net6.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
1 change: 0 additions & 1 deletion ...stractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
1 change: 0 additions & 1 deletion ...stractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net9.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
1 change: 0 additions & 1 deletion ...ns.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName=".NET Standard 2.0")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
1 change: 0 additions & 1 deletion ...ns.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.TestingHelpers.Tests")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName=".NET Standard 2.1")]
namespace System.IO.Abstractions.TestingHelpers
{
Expand Down
3 changes: 1 addition & 2 deletions ....IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_net472.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.7.2", FrameworkDisplayName=".NET Framework 4.7.2")]
namespace System.IO.Abstractions
{
Expand Down
3 changes: 1 addition & 2 deletions ....IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_net6.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
namespace System.IO.Abstractions
{
Expand Down
3 changes: 1 addition & 2 deletions ....IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
namespace System.IO.Abstractions
{
Expand Down
3 changes: 1 addition & 2 deletions ....IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_net9.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")]
namespace System.IO.Abstractions
{
Expand Down
3 changes: 1 addition & 2 deletions ...ractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_netstandard2.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName=".NET Standard 2.0")]
namespace System.IO.Abstractions
{
Expand Down
3 changes: 1 addition & 2 deletions ...ractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.Wrappers_netstandard2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[assembly: System.CLSCompliant(true)]
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/TestableIO/System.IO.Abstractions.git")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.IO.Abstractions.Tests")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName=".NET Standard 2.1")]
namespace System.IO.Abstractions
{
Expand Down
12 changes: 12 additions & 0 deletions ...eIO.System.IO.Abstractions.TestingHelpers.Tests/Polyfills/SupportedOSPlatformAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#if !FEATURE_SUPPORTED_OS_ATTRIBUTE
namespace System.Runtime.Versioning
{
[AttributeUsage(AttributeTargets.All)]
internal class SupportedOSPlatformAttribute : Attribute
{
public SupportedOSPlatformAttribute(string _)
{
}
}
}
#endif
40 changes: 20 additions & 20 deletions tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/ProductVersionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ public void ProductVersionParser_Parse_ShouldIgnoreTheSegmentsWhenThereAreMoreTh
string productVersion = "1.2.3.4.5";

// Act
var parsedProductVersion = ProductVersionParser.Parse(productVersion);
var versionInfo = new MockFileVersionInfo("foo", productVersion: productVersion);

// Assert
Assert.Multiple(() =>
{
Assert.That(parsedProductVersion.Major, Is.Zero);
Assert.That(parsedProductVersion.Minor, Is.Zero);
Assert.That(parsedProductVersion.Build, Is.Zero);
Assert.That(parsedProductVersion.PrivatePart, Is.Zero);
Assert.That(versionInfo.ProductMajorPart, Is.Zero);
Assert.That(versionInfo.ProductMinorPart, Is.Zero);
Assert.That(versionInfo.ProductBuildPart, Is.Zero);
Assert.That(versionInfo.ProductPrivatePart, Is.Zero);
});
}

Expand All @@ -37,15 +37,15 @@ public void ProductVersionParser_Parse_ShouldSkipTheRestOfTheSegmentsWhenOneIsNo
int expectedRevision)
{
// Act
var parsedProductVersion = ProductVersionParser.Parse(productVersion);
var versionInfo = new MockFileVersionInfo("foo", productVersion: productVersion);

// Assert
Assert.Multiple(() =>
{
Assert.That(parsedProductVersion.Major, Is.EqualTo(expectedMajor));
Assert.That(parsedProductVersion.Minor, Is.EqualTo(expectedMinor));
Assert.That(parsedProductVersion.Build, Is.EqualTo(expectedBuild));
Assert.That(parsedProductVersion.PrivatePart, Is.EqualTo(expectedRevision));
Assert.That(versionInfo.ProductMajorPart, Is.EqualTo(expectedMajor));
Assert.That(versionInfo.ProductMinorPart, Is.EqualTo(expectedMinor));
Assert.That(versionInfo.ProductBuildPart, Is.EqualTo(expectedBuild));
Assert.That(versionInfo.ProductPrivatePart, Is.EqualTo(expectedRevision));
});
}

Expand All @@ -66,15 +66,15 @@ public void ProductVersionParser_Parse_ShouldSkipTheRestOfTheSegmentsWhenOneCont
int expectedRevision)
{
// Act
var parsedProductVersion = ProductVersionParser.Parse(productVersion);
var versionInfo = new MockFileVersionInfo("foo", productVersion: productVersion);

// Assert
Assert.Multiple(() =>
{
Assert.That(parsedProductVersion.Major, Is.EqualTo(expectedMajor));
Assert.That(parsedProductVersion.Minor, Is.EqualTo(expectedMinor));
Assert.That(parsedProductVersion.Build, Is.EqualTo(expectedBuild));
Assert.That(parsedProductVersion.PrivatePart, Is.EqualTo(expectedRevision));
Assert.That(versionInfo.ProductMajorPart, Is.EqualTo(expectedMajor));
Assert.That(versionInfo.ProductMinorPart, Is.EqualTo(expectedMinor));
Assert.That(versionInfo.ProductBuildPart, Is.EqualTo(expectedBuild));
Assert.That(versionInfo.ProductPrivatePart, Is.EqualTo(expectedRevision));
});
}

Expand All @@ -92,15 +92,15 @@ public void ProductVersionParser_Parse_ShouldParseEachProvidedSegment(
int expectedRevision)
{
// Act
var parsedProductVersion = ProductVersionParser.Parse(productVersion);
var versionInfo = new MockFileVersionInfo("foo", productVersion: productVersion);

// Assert
Assert.Multiple(() =>
{
Assert.That(parsedProductVersion.Major, Is.EqualTo(expectedMajor));
Assert.That(parsedProductVersion.Minor, Is.EqualTo(expectedMinor));
Assert.That(parsedProductVersion.Build, Is.EqualTo(expectedBuild));
Assert.That(parsedProductVersion.PrivatePart, Is.EqualTo(expectedRevision));
Assert.That(versionInfo.ProductMajorPart, Is.EqualTo(expectedMajor));
Assert.That(versionInfo.ProductMinorPart, Is.EqualTo(expectedMinor));
Assert.That(versionInfo.ProductBuildPart, Is.EqualTo(expectedBuild));
Assert.That(versionInfo.ProductPrivatePart, Is.EqualTo(expectedRevision));
});
}
}
Expand Down
128 changes: 0 additions & 128 deletions tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/StringExtensionsTests.cs
View file
Open in desktop

This file was deleted.

Loading