Skip to content

Commit f1a07b5

Browse files
Cleanup (#2382)
* Relocate CLSCompliant attribute to msbuild property * Move Android attributes * Relocate InternalsVisibleTo attributes to MSBuild properties * Remove old style attributes * Bump Polyfill library to latest * Bump Verify library to latest
1 parent acb9de4 commit f1a07b5

File tree

50 files changed

+173
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+173
-125
lines changed

Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,14 @@
104104
<SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
105105
</PropertyGroup>
106106

107+
<!-- Public key of .assets/Sentry.snk - not a secret. Used by other InternalsVisibleTo entries throughout the solution. -->
108+
<PropertyGroup>
109+
<SentryPublicKey>002400000480000094000000060200000024000052534131000400000100010059964a931488bcdbd14657f1ee0df32df61b57b3d14d7290c262c2cc9ddaad6ec984044f761f778e1823049d2cb996a4f58c8ea5b46c37891414cb34b4036b1c178d7b582289d2eef3c0f1e9b692c229a306831ee3d371d9e883f0eb0f74aeac6c6ab8c85fd1ec04b267e15a31532c4b4e2191f5980459db4dce0081f1050fb8</SentryPublicKey>
110+
</PropertyGroup>
111+
112+
<!-- Allow NSubstitute dynamic proxies to access any internal API. Its PublicKey is not a secret. -->
113+
<ItemGroup>
114+
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
115+
</ItemGroup>
116+
107117
</Project>

Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
<Compile Remove="**\Tizen\**\*.cs" />
3535
</ItemGroup>
3636

37+
<!-- Allow setting CLSCompliant via property in any csproj -->
38+
<ItemGroup>
39+
<AssemblyAttribute Include="CLSCompliantAttribute" Condition="'$(CLSCompliant)' == 'true'">
40+
<_Parameter1>true</_Parameter1>
41+
</AssemblyAttribute>
42+
</ItemGroup>
43+
3744
<!-- Workaround for https://github.com/xamarin/xamarin-macios/issues/15897 -->
3845
<Target Name="_SetPublishFolderTypeNoneOnDocFileItems"
3946
BeforeTargets="_ComputePublishLocation"

benchmarks/Sentry.Benchmarks/Properties/GlobalSuppressions.cs

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Sentry.Android.AssemblyReader/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
<PackageReference Remove="SIL.ReleaseTasks" />
2727
</ItemGroup>
2828

29+
<ItemGroup>
30+
<InternalsVisibleTo Include="Sentry.Android.AssemblyReader.Tests" PublicKey="$(SentryPublicKey)" />
31+
</ItemGroup>
32+
2933
</Project>

src/Sentry.AspNet/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Sentry.AspNet/Sentry.AspNet.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
<ProjectReference Include="..\Sentry.DiagnosticSource\Sentry.DiagnosticSource.csproj" />
1717
</ItemGroup>
1818

19+
<ItemGroup>
20+
<InternalsVisibleTo Include="Sentry.AspNet.Tests" PublicKey="$(SentryPublicKey)" />
21+
</ItemGroup>
22+
1923
</Project>

src/Sentry.AspNetCore.Grpc/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Sentry.AspNetCore.Grpc/Sentry.AspNetCore.Grpc.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.40.0" />
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<InternalsVisibleTo Include="Sentry.AspNetCore.Grpc.Tests" PublicKey="$(SentryPublicKey)" />
20+
</ItemGroup>
21+
1822
</Project>

src/Sentry.AspNetCore/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)