open-telemetry
/
opentelemetry-dotnet-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump test dependencies (#3355) 

* Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets to 1.20.1

* Bump Elastic.Clients.Elasticsearch 8.13.3
This commit is contained in:
Piotr Kiełkowicz 2024-04-08 12:38:00 +02:00 committed by GitHub
parent 9dd9abc7d0
commit 14cd8548f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/LibraryVersions.g.cs
View File

@ -29,7 +29,7 @@ public static partial class LibraryVersion
{ {
new("8.0.0"), new("8.0.0"),
new("8.10.0"), new("8.10.0"),
new("8.12.1"), new("8.13.3"),
} }
}, },
{ {

2
test/Directory.Packages.props
View File

@ -2,7 +2,7 @@
<Import Project="..\Directory.Packages.props" /> <Import Project="..\Directory.Packages.props" />
<ItemGroup> <ItemGroup>
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" /> <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.12.1" /> <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.13.3" />
<PackageVersion Include="Confluent.Kafka" Version="2.3.0" /> <PackageVersion Include="Confluent.Kafka" Version="2.3.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" /> <PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Google.Protobuf" Version="3.26.1" /> <PackageVersion Include="Google.Protobuf" Version="3.26.1" />

2
test/IntegrationTests/LibraryVersions.g.cs
View File

@ -29,7 +29,7 @@ public static partial class LibraryVersion
#else #else
new object[] { "8.0.0" }, new object[] { "8.0.0" },
new object[] { "8.10.0" }, new object[] { "8.10.0" },
new object[] { "8.12.1" }, new object[] { "8.13.3" },
#endif #endif
}; };
public static readonly IReadOnlyCollection<object[]> EntityFrameworkCore = new List<object[]> public static readonly IReadOnlyCollection<object[]> EntityFrameworkCore = new List<object[]>

8
test/test-applications/integrations/TestApplication.AspNet.NetFramework/TestApplication.AspNet.NetFramework.csproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" /> <Import Project="..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
<Import Project="..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props" Condition="Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props')" /> <Import Project="..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props" Condition="Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -215,12 +215,12 @@
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props'))" /> <Error Condition="!Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets'))" /> <Error Condition="!Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" /> <Error Condition="!Exists('..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" /> <Error Condition="!Exists('..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" />
</Target> </Target>
<Import Project="..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets" Condition="Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.0\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" /> <Import Project="..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets" Condition="Exists('..\..\..\..\packages\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.1.20.1\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" /> <Import Project="..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.11.0\build\net462\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
test/test-applications/integrations/TestApplication.AspNet.NetFramework/packages.config
View File

@ -8,7 +8,7 @@
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.3.0" targetFramework="net462" /> <package id="Microsoft.AspNet.WebApi.WebHost" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net462" /> <package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net462" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.11.0" targetFramework="net462" /> <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.11.0" targetFramework="net462" />
<package id="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" version="1.20.0" targetFramework="net462" /> <package id="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" version="1.20.1" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net462" /> <package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net462" />
<package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net462" /> <package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />

5
test/test-applications/integrations/TestApplication.Elasticsearch/Program.cs
View File

@ -23,7 +23,12 @@ var client = new ElasticsearchClient(settings);
try try
{ {
await client.SearchAsync<TestObject>(s => await client.SearchAsync<TestObject>(s =>
#if ELASTICSEARCH_CLIENT_8_13_OR_GREATER
s.Index("test-index").From(0).Size(10).Query(q => q.Term(t => t.Field(to => to.Id))));
#else
s.Index("test-index").From(0).Size(10).Query(q => q.Term(t => t.Id, 1))); s.Index("test-index").From(0).Size(10).Query(q => q.Term(t => t.Id, 1)));
#endif
} }
catch (UnexpectedTransportException) catch (UnexpectedTransportException)
{ {

6
test/test-applications/integrations/TestApplication.Elasticsearch/TestApplication.Elasticsearch.csproj
View File

@ -1,4 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DefineConstants Condition="'$(LibraryVersion)' == '' or '$(LibraryVersion)'>='8.13.0'">$(DefineConstants);ELASTICSEARCH_CLIENT_8_13_OR_GREATER</DefineConstants>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Elastic.Clients.Elasticsearch" VersionOverride="$(LibraryVersion)" /> <PackageReference Include="Elastic.Clients.Elasticsearch" VersionOverride="$(LibraryVersion)" />