Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 588aea3

Browse files
stephentoubstephentoub
committed
Merge pull request #2510 from dotnet-bot/from-tfs
Merge changes from TFS
2 parents 38f462d + a5524dd commit 588aea3

File tree

197 files changed

+2399
-8352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+2399
-8352
lines changed

‎src/System.Security.Cryptography.RSA/tests/EncryptDecrypt.cs renamed to ‎src/Common/tests/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs

File renamed without changes.

‎src/System.Security.Cryptography.RSA/tests/ImportExport.cs renamed to ‎src/Common/tests/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs

File renamed without changes.

‎src/System.Security.Cryptography.RSA/tests/KeyGeneration.cs renamed to ‎src/Common/tests/Cryptography/AlgorithmImplementations/RSA/KeyGeneration.cs

File renamed without changes.

‎src/System.Security.Cryptography.RSA/tests/SignVerify.cs renamed to ‎src/Common/tests/Cryptography/AlgorithmImplementations/RSA/SignVerify.cs

File renamed without changes.

‎src/System.Security.Cryptography.RSA/tests/TestData.cs renamed to ‎src/Common/tests/Cryptography/AlgorithmImplementations/RSA/TestData.cs

File renamed without changes.

‎src/System.Security.Cryptography.RSA/tests/PositionValueStream.cs renamed to ‎src/Common/tests/Streams/PositionValueStream.cs

File renamed without changes.

‎src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms", "src\System.Security.Cryptography.Algorithms.csproj", "{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms.Tests", "tests\System.Security.Cryptography.Algorithms.Tests.csproj", "{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
FreeBSD_Debug|Any CPU = FreeBSD_Debug|Any CPU
13+
FreeBSD_Release|Any CPU = FreeBSD_Release|Any CPU
14+
Linux_Debug|Any CPU = Linux_Debug|Any CPU
15+
Linux_Release|Any CPU = Linux_Release|Any CPU
16+
OSX_Debug|Any CPU = OSX_Debug|Any CPU
17+
OSX_Release|Any CPU = OSX_Release|Any CPU
18+
Windows_Debug|Any CPU = Windows_Debug|Any CPU
19+
Windows_Release|Any CPU = Windows_Release|Any CPU
20+
EndGlobalSection
21+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.FreeBSD_Debug|Any CPU.ActiveCfg = FreeBSD_Debug|Any CPU
23+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.FreeBSD_Debug|Any CPU.Build.0 = FreeBSD_Debug|Any CPU
24+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.FreeBSD_Release|Any CPU.ActiveCfg = FreeBSD_Release|Any CPU
25+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.FreeBSD_Release|Any CPU.Build.0 = FreeBSD_Release|Any CPU
26+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
27+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
28+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
29+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU
30+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU
31+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU
32+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU
33+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU
34+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
35+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
36+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
37+
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
38+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.FreeBSD_Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.FreeBSD_Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.FreeBSD_Release|Any CPU.ActiveCfg = Debug|Any CPU
41+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.FreeBSD_Release|Any CPU.Build.0 = Debug|Any CPU
42+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Linux_Release|Any CPU.ActiveCfg = Debug|Any CPU
45+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Linux_Release|Any CPU.Build.0 = Debug|Any CPU
46+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.OSX_Release|Any CPU.ActiveCfg = Debug|Any CPU
49+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.OSX_Release|Any CPU.Build.0 = Debug|Any CPU
50+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Windows_Release|Any CPU.ActiveCfg = Debug|Any CPU
53+
{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Windows_Release|Any CPU.Build.0 = Debug|Any CPU
54+
EndGlobalSection
55+
GlobalSection(SolutionProperties) = preSolution
56+
HideSolutionNode = FALSE
57+
EndGlobalSection
58+
EndGlobal

‎src/System.Security.Cryptography.Encryption.Aes/src/Internal/Cryptography/AesCngCryptoDecryptor.cs renamed to ‎src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/AesCngCryptoDecryptor.cs

File renamed without changes.

‎src/System.Security.Cryptography.Encryption.Aes/src/Internal/Cryptography/AesCngCryptoEncryptor.cs renamed to ‎src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/AesCngCryptoEncryptor.cs

File renamed without changes.

‎src/System.Security.Cryptography.Encryption.Aes/src/Internal/Cryptography/AesCngCryptoTransform.cs renamed to ‎src/System.Security.Cryptography.Algorithms/src/Internal/Cryptography/AesCngCryptoTransform.cs

File renamed without changes.

0 commit comments

Comments
 (0)