Skip to content

Commit 44d60c5

Browse files
committed
Remove strong-name signing and public key attributes from projects; update test InternalsVisibleTo declarations; add Docker.DotNet to test dependencies
1 parent 879752f commit 44d60c5

3 files changed

Lines changed: 25 additions & 26 deletions

File tree

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<PackageVersion Include="FluentAssertions" Version="8.3.0" />
3535
<PackageVersion Include="Verify.Xunit" Version="30.3.1" />
3636
<PackageVersion Include="NSubstitute" Version="5.3.0" />
37+
<PackageVersion Include="Docker.DotNet" Version="3.128.0" />
3738
</ItemGroup>
3839
<ItemGroup Label="Code Analyzers PackageVersions">
3940
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />

src/EFCore/EFCore.csproj

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<IsPackable>true</IsPackable>
55
<OutputType>Library</OutputType>
66

7-
<SignAssembly>true</SignAssembly>
8-
<AssemblyOriginatorKeyFile>EasyPersistence.EFCore.snk</AssemblyOriginatorKeyFile>
9-
<PublicSignedKey>0024000004800000940000000602000000240000525341310004000001000100d18894997cc753770ca16558e7a1e3e8358f88b84b6359a894ac301204c53706df4f0c4d1041ecf08daadcf03e44f328680cc85702b2785abe3ef02cd84a1c43300c2db16c7c08f9fb5be9082e3fd5e4b2c4dec0972a3efa62a832d493903b0617ee56e401cd6ce7eb8b942bba03a8f8d7d131d636282ed9dcfdffe7f9ec1ce6</PublicSignedKey>
107
<!-- Include the build assets in the package -->
118
<IncludeBuildOutput>true</IncludeBuildOutput>
129
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
@@ -45,12 +42,12 @@
4542
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
4643

4744
</PropertyGroup>
48-
45+
4946
<ItemGroup Label="Documentation and Source Files">
5047
<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
5148
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
5249
</ItemGroup>
53-
50+
5451
<ItemGroup>
5552
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions"/>
5653
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"/>
@@ -68,14 +65,14 @@
6865
</ItemGroup>
6966
<ItemGroup Label="Code Analyzers">
7067
<PackageReference Include="AsyncMethodNameFixer" PrivateAssets="All"/>
71-
<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="All" />
72-
<PackageReference Include="ConfigureAwaitEnforcer" PrivateAssets="All" />
73-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" />
74-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" />
75-
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All" />
76-
<PackageReference Include="Roslynator.Analyzers" PrivateAssets="All" />
77-
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" PrivateAssets="All" />
78-
<PackageReference Include="Roslynator.Formatting.Analyzers" PrivateAssets="All" />
68+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="All"/>
69+
<PackageReference Include="ConfigureAwaitEnforcer" PrivateAssets="All"/>
70+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All"/>
71+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All"/>
72+
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All"/>
73+
<PackageReference Include="Roslynator.Analyzers" PrivateAssets="All"/>
74+
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" PrivateAssets="All"/>
75+
<PackageReference Include="Roslynator.Formatting.Analyzers" PrivateAssets="All"/>
7976
<PackageReference Include="SonarAnalyzer.CSharp">
8077
<PrivateAssets>all</PrivateAssets>
8178
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -84,21 +81,21 @@
8481
<PrivateAssets>all</PrivateAssets>
8582
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8683
</PackageReference>
87-
<PackageReference Include="SecurityCodeScan.VS2019" PrivateAssets="All" />
84+
<PackageReference Include="SecurityCodeScan.VS2019" PrivateAssets="All"/>
8885
</ItemGroup>
8986

9087
<ItemGroup Label="Test Assembly Attributes">
9188
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
92-
<_Parameter1>$(AssemblyName).Test.UI, PublicKey=$(PublicSignedKey)</_Parameter1>
89+
<_Parameter1>$(AssemblyName).Test.UI</_Parameter1>
9390
</AssemblyAttribute>
9491
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
95-
<_Parameter1>$(AssemblyName).Test.Integrations, PublicKey=$(PublicSignedKey)</_Parameter1>
92+
<_Parameter1>$(AssemblyName).Test.Integrations</_Parameter1>
9693
</AssemblyAttribute>
9794
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
98-
<_Parameter1>$(AssemblyName).Test.Units, PublicKey=$(PublicSignedKey)</_Parameter1>
95+
<_Parameter1>$(AssemblyName).Test.Units</_Parameter1>
9996
</AssemblyAttribute>
10097
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
101-
<_Parameter1>DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d18894997cc753770ca16558e7a1e3e8358f88b84b6359a894ac301204c53706df4f0c4d1041ecf08daadcf03e44f328680cc85702b2785abe3ef02cd84a1c43300c2db16c7c08f9fb5be9082e3fd5e4b2c4dec0972a3efa62a832d493903b0617ee56e401cd6ce7eb8b942bba03a8f8d7d131d636282ed9dcfdffe7f9ec1ce6</_Parameter1>
98+
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
10299
</AssemblyAttribute>
103100
</ItemGroup>
104101

src/EfCoreSqlClr/EfCoreSqlClr.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
34
<OutputType>Library</OutputType>
45
<TargetFramework>net48</TargetFramework>
5-
<SignAssembly>true</SignAssembly>
6-
<AssemblyOriginatorKeyFile>EFCoreSqlClr.snk</AssemblyOriginatorKeyFile>
7-
<ProjectPublicKey>0024000004800000940000000602000000240000525341310004000001000100b185830d7f9cec89363ae17757478e90669d5152a0adfa0bd0811471c0b7a3d588beee9922ceba93b5cf85a1df44b45b5e8d218ed8a90de321f67337131e5ca9659a34d1567389790d2796c563f62e42f558c6129e6141d7633981e0ac0aba8c9aa06647d1e5a5e3eae7cd92d0fe3bbbcdabf6b8c54187c70d0b164dd51aedd1</ProjectPublicKey>
8-
</PropertyGroup>
6+
</PropertyGroup>
97
<ItemGroup Label="Test Assembly Attributes">
108
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
11-
<_Parameter1>$(AssemblyName).Test.UI, PublicKey=$(ProjectPublicKey)</_Parameter1>
9+
<_Parameter1>$(AssemblyName).Test.UI</_Parameter1>
1210
</AssemblyAttribute>
1311
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
14-
<_Parameter1>$(AssemblyName).Test.Integrations, PublicKey=$(ProjectPublicKey)</_Parameter1>
12+
<_Parameter1>$(AssemblyName).Test.Integrations</_Parameter1>
1513
</AssemblyAttribute>
1614
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
17-
<_Parameter1>$(AssemblyName).Test.Units, PublicKey=$(ProjectPublicKey)</_Parameter1>
15+
<_Parameter1>$(AssemblyName).Test.Units</_Parameter1>
16+
</AssemblyAttribute>
17+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
18+
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
1819
</AssemblyAttribute>
1920
</ItemGroup>
2021

2122
<ItemGroup>
22-
<Reference Include="Microsoft.SqlServer.Server"/>
23+
<Reference Include="Microsoft.SqlServer.Server" Version="1.0.0"/>
2324
</ItemGroup>
2425

2526
<Import Project="PostBuild.targets"/>

0 commit comments

Comments
 (0)