Skip to content
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

Jump to bottom

Move to nuget central package management #2467

Merged
merged 12 commits into from
Oct 22, 2024
Merged

Move to nuget central package management #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3b7a967
Move to nuget central package management
Mpdreamz Oct 22, 2024
7399604
address several Checkmarx advisory upgrades and ensure compiler does …
Mpdreamz Oct 22, 2024
f7efb1e
remove duplicates and sort alphabetically
Mpdreamz Oct 22, 2024
7a187fa
replace last usages of Version= to VersionOverride
Mpdreamz Oct 22, 2024
8795a25
upgrade last net5.0 usages
Mpdreamz Oct 22, 2024
3d1f610
update github hashkey for nuget caching
Mpdreamz Oct 22, 2024
1284698
standardize on 8.x for microsoft.extensions.*
Mpdreamz Oct 22, 2024
88c0d99
update buildscript system.diagnostics version discovery
Mpdreamz Oct 22, 2024
f0a3df5
do not check for updates when creating new projects as part of startu…
Mpdreamz Oct 22, 2024
201337d
update binding redirect for newtonsoft.json
Mpdreamz Oct 22, 2024
1ca694e
update binding redirect for newtonsoft.json
Mpdreamz Oct 22, 2024
894f09f
remove redundant integration tests run on windows
Mpdreamz Oct 22, 2024
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
1 change: 1 addition & 0 deletions .github/.github.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>False</IsPackable>
<ImplicitUsings>disable</ImplicitUsings>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.[cf]sproj*') }}
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.[cf]sproj*') }}-${{ hashFiles('**/*.*.props') }}
restore-keys: |
${{ runner.os }}-nuget

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ jobs:
- name: 'Tests: Unit'
run: ./build.bat test --test-suite unit

- name: 'Tests: Integrations'
run: ./build.bat test --test-suite integrations

integrations-tests:
runs-on: windows-2022
needs: [ 'format', 'tests' ]
Expand Down
5 changes: 1 addition & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,12 @@
but dotnet pack expects to pack it e.g. Microsoft.NET.Sdk.Web test and sample projects. -->
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<!-- MinVer Configuration -->
<PropertyGroup>
<MinVerTagPrefix>v</MinVerTagPrefix>
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
<MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all"/>
</ItemGroup>
</Project>
141 changes: 141 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<GlobalPackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
<GlobalPackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all"/>
</ItemGroup>
<!-- Community Packages -->
<ItemGroup>
<PackageVersion Include="AngleSharp" Version="0.14.0" />
<PackageVersion Include="Antlr3.Runtime" Version="3.5.1" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.0.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.13.0" />
<PackageVersion Include="Azure.Storage.Files.Shares" Version="12.7.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.11.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
<PackageVersion Include="Bullseye" Version="3.5.0" />
<PackageVersion Include="CommandLineParser" Version="2.6.0" />
<PackageVersion Include="Confluent.Kafka" Version="1.9.3" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.12.0" />
<PackageVersion Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
<PackageVersion Include="Elasticsearch.Net" Version="7.17.5" />
<PackageVersion Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
<PackageVersion Include="EntityFramework" Version="6.3.0" PrivateAssets="All" />
<PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
<PackageVersion Include="Fake.Core.SemVer" Version="6.0.0" />
<PackageVersion Include="Fake.DotNet.MsBuild" Version="6.0.0" />
<PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
<PackageVersion Include="Fake.IO.Zip" Version="6.0.0" />
<PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="5.6.0" />
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.11.4" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.61.0" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.61.0" />
<PackageVersion Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
<PackageVersion Include="JunitXml.TestLogger" Version="3.1.12" PrivateAssets="All" />
<PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
<PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="MySql.Data" Version="8.0.32.1" />
<PackageVersion Include="MySql.Data.EntityFrameworkCore" Version="8.0.22" />
<PackageVersion Include="NEST" Version="7.17.5" />
<PackageVersion Include="NJsonSchema" Version="10.2.2" />
<PackageVersion Include="NLog" Version="4.6.8" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Nullean.VsTest.Pretty.TestLogger" Version="0.4.0" PrivateAssets="All" />
<PackageVersion Include="Octokit" Version="0.32.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.13.0" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90"/>
<PackageVersion Include="Polly" Version="7.2.1" />
<PackageVersion Include="Proc" Version="0.6.2"/>
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="6.0.0"/>
<PackageVersion Include="SQLite.CodeFirst" Version="1.5.3.29" />
<PackageVersion Include="SharpZipLib" Version="1.3.3" />
<PackageVersion Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5"/>
<PackageVersion Include="SpecFlow.xUnit" Version="3.5.5"/>
<PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="Testcontainers.Elasticsearch" Version="3.7.0" />
<PackageVersion Include="Testcontainers.Kafka" Version="3.7.0" />
<PackageVersion Include="Testcontainers.MongoDb" Version="3.7.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="3.7.0" />
<PackageVersion Include="Testcontainers.MySql" Version="3.7.0" />
<PackageVersion Include="Testcontainers.Oracle" Version="3.7.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0" />
<PackageVersion Include="Testcontainers.RabbitMq" Version="3.7.0" />
<PackageVersion Include="Testcontainers.Redis" Version="3.7.0" />
<PackageVersion Include="YamlDotNet" Version="11.2.1" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
</ItemGroup>

<!-- Microsoft/System packages -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
<PackageVersion Include="Microsoft.AspNet.Identity.Owin" Version="2.2.4" />
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.4" />
<PackageVersion Include="Microsoft.AspNet.TelemetryCorrelation" Version="1.0.7" />
<PackageVersion Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
<PackageVersion Include="Microsoft.AspNet.WebApi" Version="5.2.4" />
<PackageVersion Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.0.0" />
<PackageVersion Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.0"/>
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Core" Version="1.6.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0"/>
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1"/>
<PackageVersion Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
<PackageVersion Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" PrivateAssets="All"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />

<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />

<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.1.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageVersion Include="Microsoft.Web.Administration" Version="11.1.0" />
<PackageVersion Include="MicrosoftAspNetCore.Http" Version="2.1.22" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
<PackageVersion Include="System.Data.SQLite" Version="1.0.112" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6"/>
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageVersion Include="System.Reflection.Emit" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="5.0.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions ElasticApmAgent.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ See the LICENSE file in the project root for more information</s:String>
&lt;/Entry.Match&gt;&#xD;
&lt;Entry.SortBy&gt;&#xD;
&lt;Kind Is="Member" /&gt;&#xD;
&lt;Name Is="Enter Pattern Here" /&gt;&#xD;
&lt;Name /&gt;&#xD;
&lt;/Entry.SortBy&gt;&#xD;
&lt;/Entry&gt;&#xD;
&lt;Entry DisplayName="Readonly Fields"&gt;&#xD;
Expand All @@ -295,7 +295,7 @@ See the LICENSE file in the project root for more information</s:String>
&lt;Entry.SortBy&gt;&#xD;
&lt;Access /&gt;&#xD;
&lt;Readonly /&gt;&#xD;
&lt;Name Is="Enter Pattern Here" /&gt;&#xD;
&lt;Name /&gt;&#xD;
&lt;/Entry.SortBy&gt;&#xD;
&lt;/Entry&gt;&#xD;
&lt;Entry DisplayName="Constructors"&gt;&#xD;
Expand Down Expand Up @@ -570,6 +570,7 @@ See the LICENSE file in the project root for more information</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/HighlightingManager/HighlightingEnabledByDefault/@EntryValue">False</s:Boolean>
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" />
<PackageReference Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="Microsoft.Data.SqlClient" />
<PackageReference Include="Elastic.CommonSchema.BenchmarkDotNetExporter"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Profiler.Api" Version="1.4.0" />
<PackageReference Include="JetBrains.Profiler.Api"/>
</ItemGroup>

<ItemGroup>
Expand Down
25 changes: 13 additions & 12 deletions build/build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,22 @@

</ItemGroup>
<ItemGroup>
<PackageReference Include="Buildalyzer" Version="3.2.0" />
<PackageReference Include="Bullseye" Version="3.5.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
<PackageReference Include="Bullseye" />
<PackageReference Include="System.CommandLine" />

<PackageReference Include="Fake.Core.Environment" Version="6.0.0" />
<PackageReference Include="Fake.Core.SemVer" Version="6.0.0" />
<PackageReference Include="Fake.DotNet.MsBuild" Version="6.0.0" />
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
<PackageReference Include="Fake.IO.Zip" Version="6.0.0" />
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
<PackageReference Include="Fake.Core.Environment" />
<PackageReference Include="Fake.Core.SemVer" />
<PackageReference Include="Fake.DotNet.MsBuild" />
<PackageReference Include="Fake.IO.FileSystem" />
<PackageReference Include="Fake.IO.Zip" />
<PackageReference Include="Fake.Tools.Git" />

<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" />

<PackageReference Include="Octokit" Version="0.32.0" />
<PackageReference Include="Proc" Version="0.6.2" />
<PackageReference Include="Octokit" />
<PackageReference Include="Proc" />


</ItemGroup>

</Project>
17 changes: 7 additions & 10 deletions build/scripts/Build.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@ open System
open System.Collections.Generic
open System.IO
open System.IO.Compression
open System.Linq
open System.Runtime.InteropServices
open System.Xml.Linq
open Buildalyzer
open System.Xml.XPath
open Fake.Core
open Fake.DotNet
open Fake.IO
open Fake.IO.Globbing.Operators
open Scripts.TestEnvironment
open TestEnvironment
open Tooling

module Build =
Expand Down Expand Up @@ -87,15 +85,14 @@ module Build =
}) projectOrSln

/// Gets the current version of System.Diagnostics.DiagnosticSource referenced by Elastic.Apm
let private getCurrentApmDiagnosticSourceVersion =
let getCurrentApmDiagnosticSourceVersion =
match currentDiagnosticSourceVersion with
| Some v -> v
| None ->
let manager = AnalyzerManager();
let analyzer = manager.GetProject(Paths.SrcProjFile "Elastic.Apm")
let analyzeResult = analyzer.Build("netstandard2.0").First()
let values = analyzeResult.PackageReferences.["System.Diagnostics.DiagnosticSource"]
let version = SemVer.parse values.["Version"]
| None ->
let xml = XDocument.Load("Directory.Packages.props")
let package = xml.XPathSelectElement("//PackageVersion[@Include='System.Diagnostics.DiagnosticSource']")
let version = package.Attribute("Version").Value
let version = SemVer.parse version
currentDiagnosticSourceVersion <- Some(version)
version

Expand Down
2 changes: 2 additions & 0 deletions build/scripts/Targets.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ module Main =

Targets.Target("restore", Build.Restore)

Targets.Target("print-diagnostics-version", fun _ -> printfn $"%s{Build.getCurrentApmDiagnosticSourceVersion.ToString()}")

Targets.Target("format", Build.Format)

Targets.Target("build", ["restore"; "clean"; "version"], Build.Build)
Expand Down
2 changes: 1 addition & 1 deletion sample/ApiSamples/ApiSamples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.0.0" />
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
<PackageReference Include="Azure.Messaging.ServiceBus"/>
<PackageReference Include="Microsoft.Azure.ServiceBus"/>
<PackageReference Include="Newtonsoft.Json"/>
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions sample/ElasticsearchSample/ElasticsearchSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="NEST" Version="7.17.5" />
<PackageReference Include="Microsoft.Extensions.Configuration"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets"/>
<PackageReference Include="NEST"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sample/HttpListenerSample/HttpListenerSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json"/>
</ItemGroup>

</Project>
5 changes: 2 additions & 3 deletions sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageReference Include="Testcontainers" Version="3.7.0" />
<PackageReference Include="Testcontainers.MsSql" Version="3.7.0" />
<PackageReference Include="Microsoft.Data.SqlClient"/>
<PackageReference Include="Testcontainers.MsSql" />
</ItemGroup>

</Project>
Loading
Loading