Merge pull request #2366 from stephentoub/cryptostream_cleanup

Cleanup minor issues in S.S.C.Encryption left from initial port

Author: stephentoub

src/System.Security.Cryptography.Encryption/System.Security.Cryptography.Encryption.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22911.2
+VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encryption", "src\System.Security.Cryptography.Encryption.csproj", "{D04A73AE-E418-4ACD-A132-7688435BE8B5}"
 EndProject
@@ -13,10 +13,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
-		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
-		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
-		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
+		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D04A73AE-E418-4ACD-A132-7688435BE8B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54C20799-0F9C-4921-81E0-B3BEB73B451A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54C20799-0F9C-4921-81E0-B3BEB73B451A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54C20799-0F9C-4921-81E0-B3BEB73B451A}.Release|Any CPU.ActiveCfg = Debug|Any CPU

src/System.Security.Cryptography.Encryption/src/System.Security.Cryptography.Encryption.csproj

@@ -2,19 +2,15 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{D04A73AE-E418-4ACD-A132-7688435BE8B5}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>System.Security.Cryptography.Encryption</AssemblyName>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <Compile Include="System\Security\Cryptography\AsymmetricAlgorithm.cs" />
     <Compile Include="System\Security\Cryptography\CipherMode.cs" />