diff options
author | Jeremy Barton <jbarton@microsoft.com> | 2017-02-11 02:25:21 +0300 |
---|---|---|
committer | Jeremy Barton <jbarton@microsoft.com> | 2017-02-11 02:25:21 +0300 |
commit | ecf7087690d812007694227bccc70f812ee492c1 (patch) | |
tree | 3e98327a12782b95e3b16ed73a1744c03a3b6f0e /src/System.Security.Cryptography.Encoding | |
parent | 6e58be2c5775d63a6192233e392594ae902ee3ca (diff) | |
parent | 5091856f5ec900505026f8296e8b2fd5f958796b (diff) |
Merge commit '5091856f5ec900505026f8296e8b2fd5f958796b' into dev/apple_crypto
Conflicts:
src/System.Security.Cryptography.Encoding/src/Configurations.props
src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
Diffstat (limited to 'src/System.Security.Cryptography.Encoding')
10 files changed, 69 insertions, 174 deletions
diff --git a/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln b/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln index 9aba51cbe1..91e3aaac7d 100644 --- a/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln +++ b/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22911.2 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding.Tests", "tests\System.Security.Cryptography.Encoding.Tests.csproj", "{0581E9FA-D639-4B88-96D8-D092760F90B0}" ProjectSection(ProjectDependencies) = postProject @@ -9,133 +8,43 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptograph EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "src\System.Security.Cryptography.Encoding.csproj", "{AA81E343-5E54-40B0-9381-C459419BE780}" + ProjectSection(ProjectDependencies) = postProject + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} = {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "ref\System.Security.Cryptography.Encoding.csproj", "{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU - ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU - DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU - ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU - DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU - ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU - DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU - ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU - DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU - ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU - DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU - ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU - DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU - ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU - DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU - ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU - DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU - ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU - DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU - ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU - DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU - ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU - DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU - ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard1.3-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {0581E9FA-D639-4B88-96D8-D092760F90B0}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Unix|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Unix|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Unix|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {AA81E343-5E54-40B0-9381-C459419BE780}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0581E9FA-D639-4B88-96D8-D092760F90B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {AA81E343-5E54-40B0-9381-C459419BE780} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD} + {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} + EndGlobalSection EndGlobal diff --git a/src/System.Security.Cryptography.Encoding/dir.props b/src/System.Security.Cryptography.Encoding/dir.props index bfbc5bd9e0..83a5a15522 100644 --- a/src/System.Security.Cryptography.Encoding/dir.props +++ b/src/System.Security.Cryptography.Encoding/dir.props @@ -4,5 +4,6 @@ <PropertyGroup> <AssemblyVersion>4.1.0.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds deleted file mode 100644 index bbb60403ab..0000000000 --- a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <Project Include="System.Security.Cryptography.Encoding.pkgproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj b/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj deleted file mode 100644 index 88463cb064..0000000000 --- a/src/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <ProjectReference Include="..\ref\System.Security.Cryptography.Encoding.csproj"> - <SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> - </ProjectReference> - <ProjectReference Include="..\src\System.Security.Cryptography.Encoding.builds" /> - </ItemGroup> - <ItemGroup> - <InboxOnTargetFramework Include="MonoAndroid10" /> - <InboxOnTargetFramework Include="MonoTouch10" /> - <InboxOnTargetFramework Include="xamarinios10" /> - <InboxOnTargetFramework Include="xamarinmac20" /> - <InboxOnTargetFramework Include="xamarintvos10" /> - <InboxOnTargetFramework Include="xamarinwatchos10" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/ref/Configurations.props b/src/System.Security.Cryptography.Encoding/ref/Configurations.props new file mode 100644 index 0000000000..c701755863 --- /dev/null +++ b/src/System.Security.Cryptography.Encoding/ref/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + uap; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj index daaca689ce..1b981a5810 100644 --- a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj +++ b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj @@ -1,6 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <ProjectGuid>{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}</ProjectGuid> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Security.Cryptography.Encoding.cs" /> </ItemGroup> diff --git a/src/System.Security.Cryptography.Encoding/src/Configurations.props b/src/System.Security.Cryptography.Encoding/src/Configurations.props index b278adb7d1..05d3ab66c3 100644 --- a/src/System.Security.Cryptography.Encoding/src/Configurations.props +++ b/src/System.Security.Cryptography.Encoding/src/Configurations.props @@ -2,10 +2,10 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - net463-Windows_NT; - netstandard-OSX; - netstandard-Unix; - netstandard-Windows_NT; + netcoreapp-OSX; + netcoreapp-Unix; + netcoreapp-Windows_NT; + uap-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project> diff --git a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index 8dc6c94696..cd64025731 100644 --- a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -1,22 +1,20 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{AA81E343-5E54-40B0-9381-C459419BE780}</ProjectGuid> <AssemblyName>System.Security.Cryptography.Encoding</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-OSX-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-OSX-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" /> + <ItemGroup> <Compile Include="Internal\Cryptography\AsnFormatter.cs" /> <Compile Include="Internal\Cryptography\Helpers.cs" /> <Compile Include="Internal\Cryptography\OidLookup.cs" /> @@ -29,7 +27,7 @@ <Compile Include="System\Security\Cryptography\OidEnumerator.cs" /> <Compile Include="System\Security\Cryptography\OidGroup.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard'"> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true'"> <Compile Include="Internal\Cryptography\AsnFormatter.Windows.cs" /> <Compile Include="Internal\Cryptography\CngAsnFormatter.cs" /> <Compile Include="Internal\Cryptography\OidLookup.Windows.cs" /> @@ -97,10 +95,6 @@ <Compile Include="Internal\Cryptography\AsnFormatter.OSX.cs" /> <Compile Include="Internal\Cryptography\OidLookup.OSX.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> - <TargetingPackReference Include="mscorlib" /> - <TargetingPackReference Include="System" /> - </ItemGroup> <ItemGroup> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> diff --git a/src/System.Security.Cryptography.Encoding/tests/Configurations.props b/src/System.Security.Cryptography.Encoding/tests/Configurations.props index fa9e1005a0..cfc57211a4 100644 --- a/src/System.Security.Cryptography.Encoding/tests/Configurations.props +++ b/src/System.Security.Cryptography.Encoding/tests/Configurations.props @@ -2,8 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.3-Unix; - netstandard1.3-Windows_NT; netstandard-Unix; netstandard-Windows_NT; </BuildConfigurations> diff --git a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index a7643a6124..c4d0d980c3 100644 --- a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,6 +6,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AsnEncodedData.cs" /> <Compile Include="AsnEncodedDataCollectionTests.cs" /> @@ -27,4 +31,4 @@ <Compile Include="Base64TransformsTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |