Skip to content

Commit 56b6fed

Browse files
HofmeisterAnHofmeisterAn
committed
chore: Update CI build
1 parent aacf3c2 commit 56b6fed

File tree

9 files changed

+29
-33
lines changed

9 files changed

+29
-33
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- name: Setup .NET Core
16-
uses: actions/setup-dotnet@v2
16+
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 6.0.x
18+
dotnet-version: 8.x
1919
- name: Build
2020
run: dotnet build -c Release
2121
- name: Test

‎.github/workflows/publish.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,25 @@ permissions:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818
- name: Setup .NET Core
19-
uses: actions/setup-dotnet@v2
19+
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 6.0.x
22-
- name: Install SignClient tool
23-
run: dotnet tool install --tool-path . SignClient
21+
dotnet-version: 8.x
2422
- name: Install NBGV tool
2523
run: dotnet tool install --tool-path . nbgv
2624
- name: Set Version
2725
run: ./nbgv cloud
2826
- name: Create Packages
29-
run: dotnet pack -c Release -o packages
30-
- name: Sign Packages
31-
run: |
32-
echo $DNF_CODESIGN_CONFIG > ./packages/sign.json
33-
./SignClient sign --config "./packages/sign.json" --input "./packages/**/*.nupkg" --name "Docker.DotNet" --user "$DNF_CODESIGN_USER" --secret "$DNF_CODESIGN_SECRET" --Description "Docker.Net" --descriptionUrl "https://github.com/dotnet/Docker.DotNet"
34-
rm packages/sign.json
35-
env:
36-
DNF_CODESIGN_CONFIG: ${{secrets.DNF_CODESIGN_CONFIG}}
37-
DNF_CODESIGN_USER: ${{secrets.DNF_CODESIGN_USER}}
38-
DNF_CODESIGN_SECRET: ${{secrets.DNF_CODESIGN_SECRET}}
27+
run: dotnet pack -c Release -o packages -p:ContinuousIntegrationBuild=true
3928
- name: Push packages to NuGet.org
4029
run: dotnet nuget push ./packages/Docker.DotNet.*.nupkg --skip-duplicate -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
4130
- name: Create Release
42-
uses: actions/github-script@v5
31+
uses: actions/github-script@v7
4332
with:
4433
script: |
4534
github.rest.repos.createRelease({

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<!-- Strong-naming -->
33
<PropertyGroup Label="Signing">
4+
<DebugType>embedded</DebugType>
45
<SignAssembly>true</SignAssembly>
56
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\Key.snk</AssemblyOriginatorKeyFile>
67
</PropertyGroup>

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# .NET Client for Docker Remote API
1+
> [!IMPORTANT]
2+
> Unfortunately, there has been no further development or bug fixes in [Docker.DotNet](https://github.com/dotnet/Docker.DotNet/tree/aacf3c26131f582ca8acc34084663a4b79e28d38) for some time now, and the repository appears inactive. Reaching the current maintainer is challenging. I understand that priorities shift, and maintaining an open-source project is time-consuming and exhausting. As maintainers, we often cannot dedicate the necessary time. Over the past months—and even years—I have frequently offered my help.
3+
>
4+
> Docker.DotNet is an important upstream dependency for Testcontainers for .NET and many other developers. It would be unfortunate for this valuable work not to continue. Therefore, I have decided to fork the repository to focus on essential fixes, improvements, and updates for the Docker Engine API. I am also accepting further contributions and remaining PRs from the upstream repository.
5+
6+
# .NET Client for Docker Remote API
27

38
This library allows you to interact with [Docker Remote API][docker-remote-api] endpoints in your .NET applications.
49

‎src/Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<IsPackable>true</IsPackable>
7-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
7+
<TargetFrameworks>net6.0;net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
88
<PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
99
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
1010
<PackageTags>Docker Container C# .NET</PackageTags>
@@ -32,7 +32,6 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
3635
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108">
3736
<PrivateAssets>all</PrivateAssets>
3837
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎src/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<PackageId>Docker.DotNet.BasicAuth</PackageId>
2+
<PropertyGroup>
3+
<PackageId>Docker.DotNet.Enhanced.BasicAuth</PackageId>
44
<Description>Docker.DotNet.BasicAuth is a library that allows you to use basic authentication with a remote Docker engine programmatically in your .NET applications.</Description>
55
<AssemblyName>Docker.DotNet.BasicAuth</AssemblyName>
66
</PropertyGroup>

‎src/Docker.DotNet.X509/Docker.DotNet.X509.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
4-
<PackageId>Docker.DotNet.X509</PackageId>
4+
<PackageId>Docker.DotNet.Enhanced.X509</PackageId>
55
<Description>Docker.DotNet.X509 is a library that allows you to use certificate authentication with a remote Docker engine programmatically in your .NET applications.</Description>
66
<AssemblyName>Docker.DotNet.X509</AssemblyName>
77
</PropertyGroup>

‎src/Docker.DotNet/Docker.DotNet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<PackageId>Docker.DotNet</PackageId>
3+
<PackageId>Docker.DotNet.Enhanced</PackageId>
44
<Description>Docker.DotNet is a library that allows you to interact with the Docker Remote API programmatically with fully asynchronous, non-blocking and object-oriented code in your .NET applications.</Description>
55
<AssemblyName>Docker.DotNet</AssemblyName>
66
</PropertyGroup>

‎test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<IsPublishable>false</IsPublishable>
46
</PropertyGroup>
57
<ItemGroup>
6-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
7-
<PackageReference Include="xunit" Version="2.4.1" />
8-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
9-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
9+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
1012
</ItemGroup>
1113
<ItemGroup>
1214
<ProjectReference Include="..\..\src\Docker.DotNet.BasicAuth\Docker.DotNet.BasicAuth.csproj" />

0 commit comments

Comments
 (0)