Skip to content

Commit 4aefcf4

Browse files
ericstjericstj
committed
Merge pull request dotnet#6765 from ericstj/revCrypto
Update crypto package dependency versions
2 parents 2eaefd5 + 2ad1955 commit 4aefcf4

File tree

39 files changed

+89
-47
lines changed

39 files changed

+89
-47
lines changed

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.25-prerelease-00192
1+
1.0.25-prerelease-00193

‎src/System.IO.Compression/tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"System.Runtime": "4.0.20",
1414
"System.Runtime.Extensions": "4.0.10",
1515
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23908",
16-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
16+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
1717
"System.Text.Encoding": "4.0.10",
1818
"System.Threading.Tasks": "4.0.10",
1919
"xunit": "2.1.0",

‎src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<AssemblyVersion>4.0.0.0</AssemblyVersion>
1414
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
1515
<PackageTargetRuntime Condition="'$(PackageTargetFramework)' == ''">win</PackageTargetRuntime>
16+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
1617
</PropertyGroup>
1718

1819
<!-- Help VS understand available configurations -->

‎src/System.Net.Http.WinHttpHandler/src/project.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"dependencies": {
33
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
44
"Microsoft.Win32.Primitives": "4.0.0",
5+
"System.Collections": "4.0.0",
56
"System.Diagnostics.DiagnosticSource": "4.0.0-rc3-23908",
7+
"System.Diagnostics.Debug": "4.0.10",
68
"System.Globalization": "4.0.10",
79
"System.IO": "4.0.10",
810
"System.IO.Compression": "4.1.0-rc3-23908",
@@ -12,12 +14,14 @@
1214
"System.Runtime.Extensions": "4.0.10",
1315
"System.Runtime.Handles": "4.0.0",
1416
"System.Runtime.InteropServices": "4.0.20",
15-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
17+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1618
"System.Text.Encoding": "4.0.10",
1719
"System.Threading": "4.0.0",
1820
"System.Threading.Tasks": "4.0.10"
1921
},
2022
"frameworks": {
21-
"dnxcore50": {}
23+
"netstandard1.3": {
24+
"imports": [ "dotnet5.4" ]
25+
}
2226
}
2327
}

‎src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"System.IO.Compression": "4.1.0-rc3-23908",
77
"System.Net.Http": "4.0.0",
88
"System.Net.Primitives": "4.0.11-rc3-23908",
9-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
9+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1010
"System.Threading.Tasks": "4.0.10",
1111
"xunit": "2.1.0",
1212
"xunit.netcore.extensions": "1.0.0-prerelease-00187"

‎src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"System.Runtime.Extensions": "4.0.10",
1313
"System.Runtime.Handles": "4.0.0",
1414
"System.Runtime.InteropServices": "4.0.20",
15-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
15+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1616
"System.Text.Encoding": "4.0.10",
1717
"System.Threading": "4.0.10",
1818
"System.Threading.Tasks": "4.0.10",

‎src/System.Net.Http/src/System.Net.Http.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@
1212
<AssemblyName>System.Net.Http</AssemblyName>
1313
<AssemblyVersion>4.0.1.0</AssemblyVersion>
1414
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
15-
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
15+
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
16+
<PackageTargetFramework Condition="'$(TargetsUnix)' == 'true'">netstandard1.4</PackageTargetFramework>
1617
<PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true'">win7</PackageTargetRuntime>
1718
<PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime>
18-
<PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime>
19+
<PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime>
20+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
21+
<NuGetTargetMoniker Condition="'$(TargetsUnix)' == 'true'">.NETStandard,Version=v1.4</NuGetTargetMoniker>
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(TargetsUnix)' == 'true' and '$(ProjectJson)' == '' ">
2124
<ProjectJson>unix/project.json</ProjectJson>

‎src/System.Net.Http/src/project.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
"System.Diagnostics.DiagnosticSource": "4.0.0-rc3-23908"
44
},
55
"frameworks": {
6-
"dnxcore50": {
6+
"netstandard1.3": {
7+
"imports": [ "dotnet5.4" ],
78
"dependencies": {
89
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
910
"Microsoft.Win32.Primitives": "4.0.0",
1011
"System.Diagnostics.Contracts": "4.0.0",
12+
"System.Diagnostics.Debug": "4.0.10",
1113
"System.Diagnostics.Tools": "4.0.0",
1214
"System.Globalization": "4.0.10",
1315
"System.IO": "4.0.10",
@@ -17,7 +19,7 @@
1719
"System.Runtime.Extensions": "4.0.10",
1820
"System.Runtime.Handles": "4.0.0",
1921
"System.Runtime.InteropServices": "4.0.20",
20-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
22+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
2123
"System.Text.Encoding": "4.0.10",
2224
"System.Threading": "4.0.0",
2325
"System.Threading.Tasks": "4.0.10"

‎src/System.Net.Http/src/unix/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"System.Diagnostics.DiagnosticSource": "4.0.0-rc3-23908"
44
},
55
"frameworks": {
6-
"dnxcore50": {
6+
"netstandard1.4": {
7+
"imports": [ "dotnet5.5" ],
78
"dependencies": {
89
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
910
"Microsoft.Win32.Primitives": "4.0.0",
1011
"System.Diagnostics.Contracts": "4.0.0",
12+
"System.Diagnostics.Debug": "4.0.10",
1113
"System.Diagnostics.Tools": "4.0.0",
1214
"System.Globalization": "4.0.10",
1315
"System.IO": "4.0.10",
16+
"System.IO.FileSystem": "4.0.0",
1417
"System.IO.Compression": "4.0.0",
1518
"System.Net.Primitives": "4.0.10",
1619
"System.Resources.ResourceManager": "4.0.0",
1720
"System.Runtime.Extensions": "4.0.10",
1821
"System.Runtime.Handles": "4.0.0",
1922
"System.Runtime.InteropServices": "4.0.20",
2023
"System.Security.Cryptography.OpenSsl": "4.0.0-rc3-23908",
21-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
24+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
2225
"System.Text.Encoding": "4.0.10",
2326
"System.Threading": "4.0.0",
2427
"System.Threading.Tasks": "4.0.10"

‎src/System.Net.Http/tests/FunctionalTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"System.Net.Primitives": "4.0.11-rc3-23908",
1010
"System.Net.Sockets": "4.1.0-rc3-23908",
1111
"System.Runtime.Extensions": "4.0.10",
12-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
12+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
1313
"System.Text.Encoding": "4.0.10",
1414
"System.Threading.Tasks": "4.0.10",
1515
"xunit": "2.1.0",

‎src/System.Net.Security/src/System.Net.Security.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
<DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants>
1313
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
1414
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
15-
<PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
15+
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
16+
<PackageTargetFramework Condition="'$(TargetsLinux)' == 'true'">netstandard1.4</PackageTargetFramework>
1617
<UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
18+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
19+
<NuGetTargetMoniker Condition="'$(TargetsLinux)' == 'true'">.NETStandard,Version=v1.4</NuGetTargetMoniker>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(TargetsWindows)' == 'true' and '$(ProjectJson)' == '' ">
1922
<ProjectJson>win/project.json</ProjectJson>

‎src/System.Net.Security/src/unix/project.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
4+
"Microsoft.Win32.Primitives": "4.0.0",
5+
"System.Collections": "4.0.0",
6+
"System.Collections.Concurrent": "4.0.0",
7+
"System.Collections.Specialized": "4.0.0",
48
"System.Diagnostics.Contracts": "4.0.0",
9+
"System.Diagnostics.Tracing": "4.0.0",
510
"System.Globalization.Extensions": "4.0.0",
611
"System.Net.Primitives": "4.0.10",
712
"System.Security.Cryptography.OpenSsl": "4.0.0-rc3-23908",
8-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
13+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
914
"System.Security.Principal": "4.0.0",
1015
"System.Security.Principal.Windows": "4.0.0-rc3-23908",
1116
"System.Threading": "4.0.10",
1217
"System.Threading.ThreadPool": "4.0.10-rc3-23908"
1318
},
1419
"frameworks": {
15-
"dnxcore50": {}
20+
"netstandard1.4": {
21+
"imports": [ "dotnet5.5" ]
22+
}
1623
},
1724
"runtimes": {
1825
"ubuntu.14.04-x64": {},

‎src/System.Net.Security/src/win/project.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
{
22
"frameworks": {
3-
"dnxcore50": {
3+
"netstandard1.3": {
4+
"imports": [ "dotnet5.5" ],
45
"dependencies": {
56
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
7+
"Microsoft.Win32.Primitives": "4.0.0",
8+
"System.Collections": "4.0.0",
9+
"System.Collections.Concurrent": "4.0.0",
610
"System.Collections.Specialized": "4.0.0",
711
"System.Diagnostics.Contracts": "4.0.0",
12+
"System.Diagnostics.Tracing": "4.0.0",
813
"System.Net.Primitives": "4.0.10",
9-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
14+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1015
"System.Security.Principal": "4.0.0",
1116
"System.Security.Principal.Windows": "4.0.0-rc3-23908",
1217
"System.Threading": "4.0.10",

‎src/System.Net.Security/tests/FunctionalTests/unix/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"System.Net.Sockets": "4.1.0-rc3-23908",
99
"System.Net.TestData": "1.0.0-prerelease",
1010
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
11-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
11+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1212
"System.Security.Principal": "4.0.0",
1313
"xunit": "2.1.0",
1414
"xunit.netcore.extensions": "1.0.0-prerelease-00187"

‎src/System.Net.Security/tests/FunctionalTests/win/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"System.Net.Primitives": "4.0.10",
66
"System.Net.Sockets": "4.1.0-rc3-23908",
77
"System.Net.TestData": "1.0.0-prerelease",
8-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
8+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
99
"System.Security.Principal": "4.0.0",
1010
"System.Security.Principal.Windows": "4.0.0-rc3-23908",
1111
"xunit": "2.1.0",

‎src/System.Net.Security/tests/UnitTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"System.Net.Primitives": "4.0.10",
55
"System.Net.Sockets": "4.1.0-rc3-23908",
66
"System.Net.TestData": "1.0.0-prerelease",
7-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
7+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
88
"xunit": "2.1.0",
99
"xunit.netcore.extensions": "1.0.0-prerelease-00187"
1010
},

‎src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
1515
<PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime>
1616
<PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
17+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
1718
</PropertyGroup>
1819

1920
<PropertyGroup Condition="'$(EnableWinRT)' != 'true'">

‎src/System.Net.WebSockets.Client/src/netcore50/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"System.Runtime": "4.0.20",
1515
"System.Runtime.InteropServices.WindowsRuntime": "4.0.0",
1616
"System.Runtime.WindowsRuntime": "4.0.0",
17-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
17+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1818
"System.Threading": "4.0.10",
1919
"System.Threading.Tasks": "4.0.10"
2020
}

‎src/System.Net.WebSockets.Client/src/project.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"frameworks": {
3-
"dnxcore50": {
3+
"netstandard1.3": {
4+
"imports": [ "dotnet5.4" ],
45
"dependencies": {
56
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
7+
"Microsoft.Win32.Primitives": "4.0.0",
68
"System.Collections": "4.0.10",
79
"System.Diagnostics.Tools": "4.0.0",
810
"System.Diagnostics.Tracing": "4.0.20",
@@ -11,7 +13,7 @@
1113
"System.Net.WebSockets": "4.0.0-rc3-23908",
1214
"System.Resources.ResourceManager": "4.0.0",
1315
"System.Runtime": "4.0.20",
14-
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23908",
16+
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23908",
1517
"System.Threading": "4.0.10",
1618
"System.Threading.Tasks": "4.0.10"
1719
}

‎src/System.Security.Cryptography.Cng/ref/4.0/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"System.Runtime": "4.0.0",
44
"System.IO": "4.0.0",
55
"System.Runtime.Handles": "4.0.0",
6-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
6+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
77
"System.Security.Cryptography.Primitives": "4.0.0-rc3-23908"
88
},
99
"frameworks": {

‎src/System.Security.Cryptography.Cng/ref/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"System.Runtime": "4.0.0",
44
"System.IO": "4.0.0",
55
"System.Runtime.Handles": "4.0.0",
6-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
6+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
77
"System.Security.Cryptography.Primitives": "4.0.0-rc3-23908"
88
},
99
"frameworks": {

‎src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46' OR '$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly>
1313
<ResourcesSourceOutputDirectory Condition="'$(IsPartialFacadeAssembly)' == 'true'">None</ResourcesSourceOutputDirectory>
1414
<PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.4</PackageTargetFramework>
15+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.4</NuGetTargetMoniker>
1516
</PropertyGroup>
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
1718
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />

‎src/System.Security.Cryptography.Cng/src/project.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"frameworks": {
3-
"dnxcore50": {
3+
"netstandard1.4": {
4+
"imports": [ "dotnet5.5" ],
45
"dependencies": {
56
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
67
"System.Diagnostics.Debug": "4.0.10",
@@ -10,7 +11,7 @@
1011
"System.Runtime": "4.0.20",
1112
"System.Runtime.Extensions": "4.0.0",
1213
"System.Runtime.InteropServices": "4.0.20",
13-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908"
14+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908"
1415
}
1516
},
1617
"net46": {

‎src/System.Security.Cryptography.Cng/tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"System.Runtime": "4.0.20",
77
"System.Runtime.Extensions": "4.0.10",
88
"System.Runtime.Numerics": "4.0.0",
9-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
9+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
1010
"System.Text.Encoding.Extensions": "4.0.10",
1111
"xunit": "2.1.0",
1212
"xunit.netcore.extensions": "1.0.0-prerelease-00187"

‎src/System.Security.Cryptography.Csp/ref/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"System.Runtime": "4.0.0",
44
"System.IO": "4.0.0",
5-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
5+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
66
"System.Security.Cryptography.Primitives": "4.0.0-rc3-23908"
77
},
88
"frameworks": {

‎src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
1212
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
1313
<PackageTargetRuntime Condition="'$(TargetGroup)' == ''">win</PackageTargetRuntime>
14+
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
1415
</PropertyGroup>
1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />

‎src/System.Security.Cryptography.Csp/src/project.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"frameworks": {
3-
"dnxcore50": {
3+
"netstandard1.3": {
4+
"imports": [ "dotnet5.4" ],
45
"dependencies": {
56
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23908",
67
"System.Diagnostics.Contracts": "4.0.0",
@@ -10,7 +11,7 @@
1011
"System.Runtime": "4.0.20",
1112
"System.Runtime.Extensions": "4.0.10",
1213
"System.Runtime.InteropServices": "4.0.20",
13-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
14+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
1415
"System.Security.Cryptography.Encoding": "4.0.0-rc3-23908",
1516
"System.Text.Encoding": "4.0.10",
1617
"System.Threading": "4.0.10"

‎src/System.Security.Cryptography.Csp/tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"System.IO": "4.0.10",
55
"System.Runtime": "4.0.20",
66
"System.Runtime.Numerics": "4.0.0",
7-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
7+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
88
"System.Text.Encoding.Extensions": "4.0.10",
99
"xunit": "2.1.0",
1010
"xunit.netcore.extensions": "1.0.0-prerelease-00187"

‎src/System.Security.Cryptography.OpenSsl/ref/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"System.Runtime": "4.0.0",
44
"System.Runtime.Handles": "4.0.0",
55
"System.IO": "4.0.0",
6-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
6+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
77
"System.Security.Cryptography.Primitives": "4.0.0-rc3-23908"
88
},
99
"frameworks": {

‎src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1313
<CLSCompliant>false</CLSCompliant>
1414
<PackageTargetFramework>netstandard1.4</PackageTargetFramework>
15+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1516
<!-- Temporarily remove the RID from this package until we have a
1617
cross platform API to use RSA https://github.com/dotnet/corefx/issues/2953 -->
1718
<!-- PackageTargetRuntime>unix</PackageTargetRuntime -->

‎src/System.Security.Cryptography.OpenSsl/src/project.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
"System.Runtime": "4.0.20",
1010
"System.Runtime.InteropServices": "4.0.20",
1111
"System.Runtime.Numerics": "4.0.0",
12-
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23908",
12+
"System.Security.Cryptography.Algorithms": "4.1.0-rc3-23908",
1313
"System.Security.Cryptography.Encoding": "4.0.0-rc3-23908",
1414
"System.Text.Encoding": "4.0.10"
1515
},
1616
"frameworks": {
17-
"dnxcore50": {}
17+
"netstandard1.4": {
18+
"imports": [ "dotnet5.5" ]
19+
}
1820
}
1921
}

0 commit comments

Comments
 (0)