Skip to content

Commit d1042f2

Browse files
committed
cleanup
1 parent ee47c5e commit d1042f2

File tree

6 files changed

+28
-32
lines changed

6 files changed

+28
-32
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
echo exit code $?
2727
git tag --list
2828
29-
# Install .NET version as mandated by global.json
29+
# Install the dotnet version as mandated by global.json
3030
- uses: actions/setup-dotnet@v5
3131
with:
3232
global-json-file: global.json
3333
dotnet-version: |
34-
10.x
34+
10.x
3535
env:
3636
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
3737

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
35+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
3636
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" PrivateAssets="All" />
3737
</ItemGroup>
3838
</Project>

src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
<PackageTags>elastic,elasticsearch,cluster,ephemeral</PackageTags>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="SharpZipLib" Version="1.4.2" />
10-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
9+
<PackageReference Include="SharpZipLib" Version="1.4.2"/>
1110
</ItemGroup>
1211
<ItemGroup>
13-
<ProjectReference Include="..\Elastic.Elasticsearch.Managed\Elastic.Elasticsearch.Managed.csproj" />
12+
<ProjectReference Include="..\Elastic.Elasticsearch.Managed\Elastic.Elasticsearch.Managed.csproj"/>
1413
</ItemGroup>
1514

1615
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
17-
<Reference Include="System.Net.Http" />
16+
<Reference Include="System.Net.Http"/>
1817
</ItemGroup>
1918
</Project>

src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0;net10.0</TargetFrameworks>
55
<Description>
6-
Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process.
6+
Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process.
77
Also ships with an cluster abstraction that can start one or more ElasticsearchNode's
88
</Description>
99
<PackageTags>elastic,elasticsearch,cluster,observable,rx</PackageTags>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj" />
13-
<PackageReference Include="Proc" Version="0.11.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
12+
<ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj"/>
13+
<PackageReference Include="Proc" Version="0.11.0"/>
1514
</ItemGroup>
1615
</Project>

src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<PackageTags>elastic,elasticsearch,xunit,cluster,integration,test,ephemeral</PackageTags>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Nullean.Xunit.Partitions" Version="0.10.0" />
11-
<PackageReference Include="xunit" Version="2.9.3" />
12-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
10+
<PackageReference Include="Nullean.Xunit.Partitions" Version="0.10.0"/>
11+
<PackageReference Include="xunit" Version="2.9.3"/>
1312
</ItemGroup>
1413
<ItemGroup>
15-
<ProjectReference Include="..\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj" />
14+
<ProjectReference Include="..\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj"/>
1615
</ItemGroup>
1716
</Project>
Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net462;net8.0;net10.0</TargetFrameworks>
4-
<Description>Provides a set of classes to resolve the location of Elastic stack products in various stages: released, snapshot and build candidates</Description>
5-
<PackageTags>elastic,elasticsearch,stack,versioning,artifacts</PackageTags>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageReference Include="SemanticVersioning" Version="1.3.0" />
10-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
11-
</ItemGroup>
12-
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
13-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
14-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net462;net8.0;net10.0</TargetFrameworks>
4+
<Description>Provides a set of classes to resolve the location of Elastic stack products in various stages: released, snapshot and build candidates</Description>
5+
<PackageTags>elastic,elasticsearch,stack,versioning,artifacts</PackageTags>
6+
</PropertyGroup>
157

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
17-
<Reference Include="System.Net.Http" />
18-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
19-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="SemanticVersioning" Version="1.3.0"/>
10+
</ItemGroup>
11+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
12+
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
13+
</ItemGroup>
14+
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
16+
<Reference Include="System.Net.Http"/>
17+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0"/>
18+
</ItemGroup>
2019

2120
</Project>

0 commit comments

Comments
 (0)