Skip to content

Commit 6355116

Browse files
galvesribeirogalvesribeiro
committed
Update packages
1 parent 9daaae6 commit 6355116

File tree

8 files changed

+70
-81
lines changed

8 files changed

+70
-81
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
## files generated by popular Visual Studio add-ons.
33

44
.vs
5-
.vscode
65

76
# Project-specific
87
DemoClient/**

‎.vscode/launch.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": []
4+
}

‎.vscode/tasks.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/Docker.DotNet.sln",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/Docker.DotNet.sln",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"${workspaceFolder}/Docker.DotNet.sln",
36+
"/property:GenerateFullPaths=true",
37+
"/consoleloggerparameters:NoSummary"
38+
],
39+
"problemMatcher": "$msCompile"
40+
}
41+
]
42+
}

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,20 @@
33
<IsPackable>true</IsPackable>
44
<PackageId>Docker.DotNet.BasicAuth</PackageId>
55
<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>
6-
<TargetFrameworks>netstandard2.0;netstandard1.6;net46;net45</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
77
<AssemblyName>Docker.DotNet.BasicAuth</AssemblyName>
88
<PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
9-
<PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
9+
<PackageLicenseUrl>https://github.com/dotnet/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
1010
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
1111
<PackageTags>Docker Container C# .NET</PackageTags>
1212
<RepositoryType>git</RepositoryType>
1313
<RepositoryUrl>https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet.BasicAuth</RepositoryUrl>
14-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
15-
<VersionPrefix>3.125.3</VersionPrefix>
14+
<VersionPrefix>3.125.4</VersionPrefix>
1615
</PropertyGroup>
1716
<PropertyGroup Condition="'$(VersionSuffix)' != ''">
1817
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
1918
</PropertyGroup>
2019
<ItemGroup>
2120
<ProjectReference Include="..\Docker.DotNet\Docker.DotNet.csproj" />
2221
</ItemGroup>
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
24-
<Reference Include="System.Runtime" />
25-
<Reference Include="System.Security" />
26-
<Reference Include="System.Net.Http" />
27-
<Reference Include="System" />
28-
<Reference Include="Microsoft.CSharp" />
29-
</ItemGroup>
30-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
31-
<Reference Include="System" />
32-
<Reference Include="Microsoft.CSharp" />
33-
<Reference Include="System.Net.Http" />
34-
</ItemGroup>
3522
</Project>

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,19 @@
33
<IsPackable>true</IsPackable>
44
<PackageId>Docker.DotNet.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>
6-
<TargetFrameworks>netstandard2.0;netstandard1.6;net46;net45</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
77
<AssemblyName>Docker.DotNet.X509</AssemblyName>
88
<PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
9-
<PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
9+
<PackageLicenseUrl>https://github.com/dotnet/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
1010
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
1111
<PackageTags>Docker Container C# .NET</PackageTags>
1212
<RepositoryType>git</RepositoryType>
1313
<RepositoryUrl>https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet</RepositoryUrl>
14-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
15-
<VersionPrefix>3.125.3</VersionPrefix>
14+
<VersionPrefix>3.125.4</VersionPrefix>
1615
</PropertyGroup>
1716
<PropertyGroup Condition="'$(VersionSuffix)' != ''">
1817
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
1918
</PropertyGroup>
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
21-
<PackageReference Include="System.Security.Cryptography.Csp" Version="4.3.0" />
22-
</ItemGroup>
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
24-
<Reference Include="System.Net.Http" />
25-
<Reference Include="System.Net.Http.WebRequest" />
26-
<Reference Include="System" />
27-
<Reference Include="Microsoft.CSharp" />
28-
</ItemGroup>
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
30-
<Reference Include="System.Net.Http" />
31-
<Reference Include="System.Net.Http.WebRequest" />
32-
<Reference Include="System" />
33-
<Reference Include="Microsoft.CSharp" />
34-
</ItemGroup>
3519
<ItemGroup>
3620
<ProjectReference Include="..\Docker.DotNet\Docker.DotNet.csproj" />
3721
</ItemGroup>

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

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,21 @@
33
<IsPackable>true</IsPackable>
44
<PackageId>Docker.DotNet</PackageId>
55
<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>
6-
<TargetFrameworks>net45;net46;netstandard1.6;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
77
<AssemblyName>Docker.DotNet</AssemblyName>
88
<PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
9-
<PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
9+
<PackageLicenseUrl>https://github.com/dotnet/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
1010
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
1111
<PackageTags>Docker Container C# .NET</PackageTags>
1212
<RepositoryType>git</RepositoryType>
1313
<RepositoryUrl>https://github.com/Microsoft/Docker.DotNet</RepositoryUrl>
14-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
15-
<VersionPrefix>3.125.3</VersionPrefix>
14+
<VersionPrefix>3.125.4</VersionPrefix>
1615
</PropertyGroup>
1716
<PropertyGroup Condition="'$(VersionSuffix)' != ''">
1817
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
1918
</PropertyGroup>
2019
<ItemGroup>
21-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
22-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
23-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
24-
</ItemGroup>
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
26-
<PackageReference Include="System.Buffers" Version="4.4.0" />
27-
</ItemGroup>
28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
29-
<PackageReference Include="System.Buffers" Version="4.3.0" />
30-
<PackageReference Include="System.IO.Pipes" Version="4.3.0" />
31-
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
32-
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
33-
<PackageReference Include="System.Net.Security" Version="4.3.0" />
34-
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
35-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
36-
<PackageReference Include="System.Threading.Overlapped" Version="4.3.0" />
37-
</ItemGroup>
38-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
39-
<PackageReference Include="System.Buffers" Version="4.3.0" />
40-
<PackageReference Include="System.Runtime" Version="4.3.0" />
41-
<Reference Include="System.Net.Http" />
42-
<Reference Include="System.Runtime.Serialization" />
43-
<Reference Include="System" />
44-
<Reference Include="Microsoft.CSharp" />
45-
</ItemGroup>
46-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
47-
<Reference Include="System.Net.Http" />
48-
<Reference Include="System.Runtime.Serialization" />
49-
<Reference Include="System" />
50-
<Reference Include="Microsoft.CSharp" />
20+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
21+
<PackageReference Include="System.Buffers" Version="4.5.1" />
5122
</ItemGroup>
5223
</Project>

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
7-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.1" />
8-
<PackageReference Include="xunit" Version="2.3.0" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
10-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
6+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
7+
<PackageReference Include="xunit" Version="2.4.1" />
8+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
9+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
1110
</ItemGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\src\Docker.DotNet.BasicAuth\Docker.DotNet.BasicAuth.csproj" />
1413
<ProjectReference Include="..\..\src\Docker.DotNet.X509\Docker.DotNet.X509.csproj" />
1514
<ProjectReference Include="..\..\src\Docker.DotNet\Docker.DotNet.csproj" />
1615
</ItemGroup>
17-
<ItemGroup>
18-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
19-
</ItemGroup>
2016
</Project>

‎test/Docker.DotNet.Tests/ISystemOperations.Tests.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ public async Task MonitorEventsAsync_NullProgress_Throws()
6363
[Fact]
6464
public async Task MonitorEventsAsync_Succeeds()
6565
{
66-
const string repository = "microsoft/nanoserver";
66+
const string repository = "alpine";
67+
await _client.Images.CreateImageAsync(
68+
new ImagesCreateParameters
69+
{
70+
Repo = repository,
71+
Tag = "latest"
72+
}, null, null);
6773
const string tag = "MonitorTests";
6874

6975
var wasProgressCalled = false;
@@ -90,7 +96,7 @@ public async Task MonitorEventsAsync_Succeeds()
9096
await _client.Images.DeleteImageAsync($"{repository}:{tag}", new ImageDeleteParameters());
9197
}
9298

93-
99+
94100

95101
class Progress : IProgress<Message>
96102
{

0 commit comments

Comments
 (0)