Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

37 changes: 20 additions & 17 deletions src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

<Import Project="..\..\..\..\shared.props" />

<ItemGroup>
<None Include="Build\*.props" Pack="True" PackagePath="build" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="dotnet-gcdump" Version="$(DotnetGCDumpVersion)" IncludeAssets="None" ExcludeAssets="All" PrivateAssets="None"
GeneratePathProperty="true">
Expand All @@ -28,24 +24,31 @@
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelVersion)" />
</ItemGroup>

<ItemGroup>
<Reference Include="dotnet-gcdump">
<HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\dotnet-gcdump.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Diagnostics.FastSerialization">
<!--
Caution: The version of this DLL must be binary compatible with the one embedded in Microsoft.Diagnostics.Tracing.TraceEvent,
otherwise a TypeLoadException will occur at runtime.
-->
<HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\Microsoft.Diagnostics.FastSerialization.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Common\src\Hosting\Steeltoe.Common.Hosting.csproj" />
<ProjectReference Include="..\..\..\Common\src\Http\Steeltoe.Common.Http.csproj" />
<ProjectReference Include="..\..\..\Configuration\src\Abstractions\Steeltoe.Configuration.Abstractions.csproj" />
<ProjectReference Include="..\..\..\Logging\src\DynamicConsole\Steeltoe.Logging.DynamicConsole.csproj" />
<ProjectReference Include="..\Abstractions\Steeltoe.Management.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="dotnet-gcdump">
<!--
Caution: The embedded version of Microsoft.Diagnostics.FastSerialization must be binary compatible with the one
embedded in Microsoft.Diagnostics.Tracing.TraceEvent, otherwise a TypeLoadException will occur at runtime.
-->
<HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\dotnet-gcdump.dll</HintPath>
</Reference>
</ItemGroup>

<!-- Embed dotnet-gcdump.dll in our multi-targeted NuGet package. -->
<Target Name="IncludeDotNetGCDumpAssemblyInPack" BeforeTargets="_GetPackageFiles">
<ItemGroup>
<_DotNetGCDumpNet10 Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\net10.0\dotnet-gcdump.dll" Pack="True" PackagePath="lib\net10.0" />
<_DotNetGCDumpNet8 Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\net8.0\dotnet-gcdump.dll" Pack="True" PackagePath="lib\net8.0" />
<None Include="@(_DotNetGCDumpNet10)" />
<None Include="@(_DotNetGCDumpNet8)" />
</ItemGroup>
</Target>
</Project>
7 changes: 2 additions & 5 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@

<BouncyCastleVersion>2.2.*</BouncyCastleVersion>
<ConsulVersion>1.7.14.*</ConsulVersion>
<DotnetGCDumpVersion>
<!-- Caution: This constant occurs in multiple places and must be kept in sync. -->
9.0.652701
</DotnetGCDumpVersion>
<DotnetGCDumpVersion>9.0.652701</DotnetGCDumpVersion>
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
<FoundationalVersion>
<!--
Expand All @@ -73,7 +70,7 @@
</FoundationalVersion>
<MicrosoftIdentityModelVersion>8.14.*</MicrosoftIdentityModelVersion>
<MicrosoftDiagnosticsNETCoreClientVersion>0.2.652701</MicrosoftDiagnosticsNETCoreClientVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>3.1.26</MicrosoftDiagnosticsTracingTraceEventVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>3.1.23</MicrosoftDiagnosticsTracingTraceEventVersion>
<OpenTelemetryExporterPrometheusVersion>1.14.*-*</OpenTelemetryExporterPrometheusVersion>
<OpenTelemetryVersion>1.14.*</OpenTelemetryVersion>
<SerilogVersion>9.0.*</SerilogVersion>
Expand Down