Skip to content

Commit 361a165

Browse files
martincostellorajkumar-rangaraj
martincostello
and
rajkumar-rangaraj
authored
[Infra] Remove AssemblyInfo files (#6382)
Co-authored-by: Rajkumar Rangaraj <[email protected]>
1 parent a2679d5 commit 361a165

File tree

37 files changed

+144
-281
lines changed

37 files changed

+144
-281
lines changed

‎build/Common.nonprod.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@
2121
</Content>
2222
</ItemGroup>
2323

24+
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
25+
<PackageReference Include="GitHubActionsTestLogger" />
26+
<PackageReference Include="JunitXml.TestLogger" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
28+
<PackageReference Include="xunit" />
29+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
30+
</ItemGroup>
31+
32+
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
33+
<Compile Include="$(RepoRoot)\test\Shared\StrongNameTests.cs" Link="StrongNameTests.cs" />
34+
</ItemGroup>
35+
2436
<PropertyGroup>
2537
<!-- Running unit tests from VSCode does not work with .NET SDK 6.0.200 without ProduceReferenceAssemblyInOutDir -->
2638
<!-- Related breaking change: https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/6.0/write-reference-assemblies-to-obj -->

‎build/Common.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<SignAssembly>true</SignAssembly>
55
<RepoRoot>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Parent.FullName)</RepoRoot>
66
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)debug.snk</AssemblyOriginatorKeyFile>
7-
<DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
87
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
98
<GenerateDocumentationFile>true</GenerateDocumentationFile>
109
<Nullable>enable</Nullable>
@@ -17,6 +16,10 @@
1716
<AnalysisLevel>latest-All</AnalysisLevel>
1817
</PropertyGroup>
1918

19+
<PropertyGroup Condition=" '$(SignAssembly)' == 'true' ">
20+
<StrongNamePublicKey>002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898</StrongNamePublicKey>
21+
</PropertyGroup>
22+
2023
<PropertyGroup Label="BuildFlags">
2124
<RunningDotNetPack Condition="'$(RunningDotNetPack)' == ''">false</RunningDotNetPack>
2225
</PropertyGroup>

‎src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs‎

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

‎src/OpenTelemetry.Api.ProviderBuilderExtensions/OpenTelemetry.Api.ProviderBuilderExtensions.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,14 @@
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<InternalsVisibleTo Include="OpenTelemetry" PublicKey="$(StrongNamePublicKey)" />
20+
<InternalsVisibleTo Include="OpenTelemetry.Api.ProviderBuilderExtensions.Tests" PublicKey="$(StrongNamePublicKey)" />
21+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.Console" PublicKey="$(StrongNamePublicKey)" />
22+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" PublicKey="$(StrongNamePublicKey)" />
23+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests" PublicKey="$(StrongNamePublicKey)" />
24+
<InternalsVisibleTo Include="OpenTelemetry.Extensions.Hosting" PublicKey="$(StrongNamePublicKey)" />
25+
<InternalsVisibleTo Include="OpenTelemetry.Tests" PublicKey="$(StrongNamePublicKey)" />
26+
</ItemGroup>
27+
1828
</Project>

‎src/OpenTelemetry.Api/AssemblyInfo.cs‎

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

‎src/OpenTelemetry.Api/OpenTelemetry.Api.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,20 @@
2020
<Compile Include="$(RepoRoot)\src\Shared\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
2121
<Compile Include="$(RepoRoot)\src\Shared\StatusHelper.cs" Link="Includes\StatusHelper.cs" />
2222
</ItemGroup>
23+
24+
<ItemGroup>
25+
<InternalsVisibleTo Include="OpenTelemetry" PublicKey="$(StrongNamePublicKey)" />
26+
<InternalsVisibleTo Include="OpenTelemetry.Api.ProviderBuilderExtensions" PublicKey="$(StrongNamePublicKey)" />
27+
<InternalsVisibleTo Include="OpenTelemetry.Api.ProviderBuilderExtensions.Tests" PublicKey="$(StrongNamePublicKey)" />
28+
<InternalsVisibleTo Include="OpenTelemetry.Api.Tests" PublicKey="$(StrongNamePublicKey)" />
29+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.Console" PublicKey="$(StrongNamePublicKey)" />
30+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.InMemory" PublicKey="$(StrongNamePublicKey)" />
31+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" PublicKey="$(StrongNamePublicKey)" />
32+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests" PublicKey="$(StrongNamePublicKey)" />
33+
<InternalsVisibleTo Include="OpenTelemetry.Extensions.Hosting" PublicKey="$(StrongNamePublicKey)" />
34+
<InternalsVisibleTo Include="OpenTelemetry.Extensions.Hosting.Tests" PublicKey="$(StrongNamePublicKey)" />
35+
<InternalsVisibleTo Include="OpenTelemetry.Shims.OpenTracing.Tests" PublicKey="$(StrongNamePublicKey)" />
36+
<InternalsVisibleTo Include="OpenTelemetry.Tests" PublicKey="$(StrongNamePublicKey)" />
37+
</ItemGroup>
38+
2339
</Project>

‎src/OpenTelemetry.Exporter.InMemory/AssemblyInfo.cs‎

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

‎src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@
1919
<Compile Include="$(RepoRoot)\src\Shared\PeriodicExportingMetricReaderHelper.cs" Link="Includes\PeriodicExportingMetricReaderHelper.cs" />
2020
</ItemGroup>
2121

22+
<ItemGroup Condition="'$(ExposeExperimentalFeatures)' != 'true'">
23+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests" PublicKey="$(StrongNamePublicKey)" />
24+
</ItemGroup>
25+
2226
</Project>

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/AssemblyInfo.cs‎

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

‎src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,10 @@
3333
<Compile Include="$(RepoRoot)\src\Shared\TagWriter\TagWriter.cs" Link="Includes\TagWriter\TagWriter.cs" />
3434
</ItemGroup>
3535

36+
<ItemGroup>
37+
<InternalsVisibleTo Include="Benchmarks" PublicKey="$(StrongNamePublicKey)" />
38+
<InternalsVisibleTo Include="MockOpenTelemetryCollector" PublicKey="$(StrongNamePublicKey)" />
39+
<InternalsVisibleTo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests" PublicKey="$(StrongNamePublicKey)" />
40+
</ItemGroup>
41+
3642
</Project>

0 commit comments

Comments
 (0)