Skip to content

Add OpenTelemetry.PersistentStorage.FileSystem to source-build-assets #1741

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
baronfel merged 1 commit into from
Jul 8, 2026
Merged

Add OpenTelemetry.PersistentStorage.FileSystem to source-build-assets #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<OpenTelemetryDotNetReleaseVersion>1.15.3</OpenTelemetryDotNetReleaseVersion>
<OpenTelemetryDotNetContribHttpReleaseVersion>1.15.1</OpenTelemetryDotNetContribHttpReleaseVersion>
<OpenTelemetryDotNetContribRuntimeReleaseVersion>1.15.1</OpenTelemetryDotNetContribRuntimeReleaseVersion>
<OpenTelemetryDotNetContribPersistentStorageAbstractionsReleaseVersion>1.0.3</OpenTelemetryDotNetContribPersistentStorageAbstractionsReleaseVersion>
<OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion>1.0.3</OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
24 changes: 24 additions & 0 deletions src/externalPackages/projects/opentelemetry-dotnet-contrib.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<PropertyGroup>
<HttpProject>$(ProjectDirectory)src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj</HttpProject>
<RuntimeProject>$(ProjectDirectory)src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj</RuntimeProject>
<PersistentStorageAbstractionsProject>$(ProjectDirectory)src/OpenTelemetry.PersistentStorage.Abstractions/OpenTelemetry.PersistentStorage.Abstractions.csproj</PersistentStorageAbstractionsProject>
<PersistentStorageFileSystemProject>$(ProjectDirectory)src/OpenTelemetry.PersistentStorage.FileSystem/OpenTelemetry.PersistentStorage.FileSystem.csproj</PersistentStorageFileSystemProject>

<CommonBuildArgs>/p:Configuration=$(Configuration)</CommonBuildArgs>
<CommonBuildArgs>$(CommonBuildArgs) /p:DelaySign=$(DelaySign)</CommonBuildArgs>
Expand Down Expand Up @@ -49,6 +51,8 @@
the MSFT-shipped package by ExternalPackageTests / UpdateExternalMetadata. -->
<HttpVersionArgs>/p:Version=$(OpenTelemetryDotNetContribHttpReleaseVersion) /p:AssemblyVersion=$(OpenTelemetryDotNetContribHttpAssemblyVersionOverride) /p:FileVersion=$(OpenTelemetryDotNetContribHttpReleaseVersion).$(OpenTelemetryDotNetContribHttpFileVersionRevision)</HttpVersionArgs>
<RuntimeVersionArgs>/p:Version=$(OpenTelemetryDotNetContribRuntimeReleaseVersion) /p:AssemblyVersion=$(OpenTelemetryDotNetContribRuntimeAssemblyVersionOverride) /p:FileVersion=$(OpenTelemetryDotNetContribRuntimeReleaseVersion).$(OpenTelemetryDotNetContribRuntimeFileVersionRevision)</RuntimeVersionArgs>
<PersistentStorageAbstractionsVersionArgs>/p:Version=$(OpenTelemetryDotNetContribPersistentStorageAbstractionsReleaseVersion) /p:AssemblyVersion=$(OpenTelemetryDotNetContribPersistentStorageAbstractionsAssemblyVersionOverride) /p:FileVersion=$(OpenTelemetryDotNetContribPersistentStorageAbstractionsReleaseVersion).$(OpenTelemetryDotNetContribPersistentStorageAbstractionsFileVersionRevision)</PersistentStorageAbstractionsVersionArgs>
<PersistentStorageFileSystemVersionArgs>/p:Version=$(OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion) /p:AssemblyVersion=$(OpenTelemetryDotNetContribPersistentStorageFileSystemAssemblyVersionOverride) /p:FileVersion=$(OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion).$(OpenTelemetryDotNetContribPersistentStorageFileSystemFileVersionRevision)</PersistentStorageFileSystemVersionArgs>
</PropertyGroup>

<!-- OpenTelemetry.Instrumentation.Http -->
Expand All @@ -70,6 +74,26 @@
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
IgnoreStandardErrorWarningFormat="true" />

<!-- OpenTelemetry.PersistentStorage.Abstractions (packed before FileSystem, which references it) -->
<Exec Command="&quot;$(DotNetTool)&quot; restore /bl:$(ArtifactsLogRepoDir)restore_PersistentStorageAbstractions.binlog $(PersistentStorageAbstractionsProject) $(CommonBuildArgs) $(PersistentStorageAbstractionsVersionArgs)"
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
IgnoreStandardErrorWarningFormat="true" />
<Exec Command="&quot;$(DotNetTool)&quot; pack /bl:$(ArtifactsLogRepoDir)pack_PersistentStorageAbstractions.binlog $(PersistentStorageAbstractionsProject) $(PackArgs) $(PersistentStorageAbstractionsVersionArgs)"
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
IgnoreStandardErrorWarningFormat="true" />

<!-- OpenTelemetry.PersistentStorage.FileSystem (depends on PersistentStorage.Abstractions) -->
<Exec Command="&quot;$(DotNetTool)&quot; restore /bl:$(ArtifactsLogRepoDir)restore_PersistentStorageFileSystem.binlog $(PersistentStorageFileSystemProject) $(CommonBuildArgs) $(PersistentStorageFileSystemVersionArgs)"
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
IgnoreStandardErrorWarningFormat="true" />
<Exec Command="&quot;$(DotNetTool)&quot; pack /bl:$(ArtifactsLogRepoDir)pack_PersistentStorageFileSystem.binlog $(PersistentStorageFileSystemProject) $(PackArgs) $(PersistentStorageFileSystemVersionArgs)"
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
IgnoreStandardErrorWarningFormat="true" />
</Target>

</Project>
22 changes: 22 additions & 0 deletions src/externalPackages/projects/opentelemetry-dotnet-contrib.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
<OpenTelemetryDotNetContribRuntimeFileVersionRevision>1029</OpenTelemetryDotNetContribRuntimeFileVersionRevision>
<!-- AssemblyVersion of MSFT-shipped OpenTelemetry.Instrumentation.Runtime 1.15.1. -->
<OpenTelemetryDotNetContribRuntimeAssemblyVersionOverride>1.15.1.1029</OpenTelemetryDotNetContribRuntimeAssemblyVersionOverride>
<!-- OpenTelemetry.PersistentStorage.Abstractions and OpenTelemetry.PersistentStorage.FileSystem are
released together from a single PersistentStorage-<version> tag, so they share a ReleaseVersion and
BuildNumber. The pinned submodule commit's PersistentStorage sources are identical to the
PersistentStorage-1.0.3 release (only CHANGELOG.md differs), so both build as 1.0.3. -->
<!-- BuildNumber from MSFT-shipped OpenTelemetry.PersistentStorage.Abstractions release (tag PersistentStorage-1.0.3). -->
<OpenTelemetryDotNetContribPersistentStorageAbstractionsFileVersionRevision>1043</OpenTelemetryDotNetContribPersistentStorageAbstractionsFileVersionRevision>
<!-- AssemblyVersion of MSFT-shipped OpenTelemetry.PersistentStorage.Abstractions 1.0.3. -->
<OpenTelemetryDotNetContribPersistentStorageAbstractionsAssemblyVersionOverride>1.0.3.1043</OpenTelemetryDotNetContribPersistentStorageAbstractionsAssemblyVersionOverride>
<!-- BuildNumber from MSFT-shipped OpenTelemetry.PersistentStorage.FileSystem release (tag PersistentStorage-1.0.3). -->
<OpenTelemetryDotNetContribPersistentStorageFileSystemFileVersionRevision>1043</OpenTelemetryDotNetContribPersistentStorageFileSystemFileVersionRevision>
<!-- AssemblyVersion of MSFT-shipped OpenTelemetry.PersistentStorage.FileSystem 1.0.3. -->
<OpenTelemetryDotNetContribPersistentStorageFileSystemAssemblyVersionOverride>1.0.3.1043</OpenTelemetryDotNetContribPersistentStorageFileSystemAssemblyVersionOverride>
</PropertyGroup>

<ItemGroup>
Expand All @@ -43,6 +55,16 @@
<AssemblyVersionOverrideProperty>OpenTelemetryDotNetContribRuntimeAssemblyVersionOverride</AssemblyVersionOverrideProperty>
<ReleaseVersionProperty>OpenTelemetryDotNetContribRuntimeReleaseVersion</ReleaseVersionProperty>
</FileVersionValidationPackage>
<FileVersionValidationPackage Include="OpenTelemetry.PersistentStorage.Abstractions">
Comment thread
baronfel marked this conversation as resolved.
<FileVersionRevisionProperty>OpenTelemetryDotNetContribPersistentStorageAbstractionsFileVersionRevision</FileVersionRevisionProperty>
<AssemblyVersionOverrideProperty>OpenTelemetryDotNetContribPersistentStorageAbstractionsAssemblyVersionOverride</AssemblyVersionOverrideProperty>
<ReleaseVersionProperty>OpenTelemetryDotNetContribPersistentStorageAbstractionsReleaseVersion</ReleaseVersionProperty>
</FileVersionValidationPackage>
<FileVersionValidationPackage Include="OpenTelemetry.PersistentStorage.FileSystem">
<FileVersionRevisionProperty>OpenTelemetryDotNetContribPersistentStorageFileSystemFileVersionRevision</FileVersionRevisionProperty>
<AssemblyVersionOverrideProperty>OpenTelemetryDotNetContribPersistentStorageFileSystemAssemblyVersionOverride</AssemblyVersionOverrideProperty>
<ReleaseVersionProperty>OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion</ReleaseVersionProperty>
</FileVersionValidationPackage>
</ItemGroup>

</Project>