Skip to content

Commit

Permalink
Bump test dependencies (#3355)
Browse files Browse the repository at this point in the history
* Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets to 1.20.1

* Bump Elastic.Clients.Elasticsearch 8.13.3
  • Loading branch information
Kielek authored Apr 8, 2024
1 parent 9dd9abc commit 14cd854
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static partial class LibraryVersion
{
new("8.0.0"),
new("8.10.0"),
new("8.12.1"),
new("8.13.3"),
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Packages.props" />
<ItemGroup>
<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="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Google.Protobuf" Version="3.26.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/IntegrationTests/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static partial class LibraryVersion
#else
new object[] { "8.0.0" },
new object[] { "8.10.0" },
new object[] { "8.12.1" },
new object[] { "8.13.3" },
#endif
};
public static readonly IReadOnlyCollection<object[]> EntityFrameworkCore = new List<object[]>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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\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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -215,12 +215,12 @@
<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>
</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.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.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.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\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>
<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')" />
<!-- 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<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.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="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
try
{
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)));
#endif
}
catch (UnexpectedTransportException)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
<PackageReference Include="Elastic.Clients.Elasticsearch" VersionOverride="$(LibraryVersion)" />
Expand Down

0 comments on commit 14cd854

Please sign in to comment.