Merge pull request #2180 from dotnet-bot/from-tfs

Merge changes from TFS

Author: ellismg

src/System.IO.Compression/src/System.IO.Compression.csproj

@@ -1,10 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <!-- Required due to https://github.com/dotnet/corefx/issues/2171 -->
+    <AssemblyKeyType>ECMA</AssemblyKeyType>
+  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Windows_Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <AssemblyName>System.IO.Compression</AssemblyName>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <ProjectGuid>{5471BFE8-8071-466F-838E-5ADAA779E742}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs

@@ -437,6 +437,15 @@ static internal bool IsNonAttributedTypeValidForSerialization(Type type)
         }
 
         private static string[] s_knownSerializableTypeNames = new string[] {
+                "System.Collections.Queue",
+                "System.Collections.Stack",
+                "System.Globalization.CultureInfo",
+                "System.Version",
+                "System.Collections.Generic.KeyValuePair`2",
+                "System.Collections.Generic.Queue`1",
+                "System.Collections.Generic.Stack`1",
+                "System.Collections.ObjectModel.ReadOnlyCollection`1",
+                "System.Collections.ObjectModel.ReadOnlyDictionary`2",
                 "System.Tuple`1",
                 "System.Tuple`2",
                 "System.Tuple`3",
@@ -445,9 +454,6 @@ static internal bool IsNonAttributedTypeValidForSerialization(Type type)
                 "System.Tuple`6",
                 "System.Tuple`7",
                 "System.Tuple`8",
-                "System.Collections.Generic.Queue`1",
-                "System.Version",
-                "System.Collections.ObjectModel.ReadOnlyCollection`1"
         };
 
         internal static bool IsKnownSerializableType(Type type)

src/dir.targets

@@ -10,32 +10,10 @@
   <Target Name="GetAssemblyVersion"
           Returns="$(AssemblyVersion)"/>
 
-  <!-- Returns the set of files to be included in the nuget package
-       with appropriate metadata.-->
-  <Target Name="GetFilesToPackage"
-          Returns="@(FilesToPackage)">
-
-    <PropertyGroup>
-      <PackagePath Condition="'$(PackagePath)' == ''">$(TargetPath)</PackagePath>
-      <DocPackagePath Condition="'$(DocPackagePath)' == ''">$(DocumentationFile)</DocPackagePath>
-
-       <!-- default to treat as 'dotnet' package based portable library -->
-      <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet</PackageTargetFramework>
-      <PackageTargetPath Condition="'$(PackageTargetPath)' == ''">lib/dotnet</PackageTargetPath>
-    </PropertyGroup>
-    
-    <ItemGroup>
-       <FilesToPackage Include="$(PackagePath)">
-         <AssemblyVersion>$(AssemblyVersion)</AssemblyVersion>
-         <TargetFramework>$(PackageTargetFramework)</TargetFramework>
-         <TargetPath>$(PackageTargetPath)</TargetPath>
-       </FilesToPackage>
-       <FilesToPackage Include="$(DocPackagePath)" Condition="Exists('$(DocPackagePath)')">
-         <TargetFramework>$(PackageTargetFramework)</TargetFramework>
-         <TargetPath>$(PackageTargetPath)</TargetPath>
-       </FilesToPackage>
-    </ItemGroup>
-  </Target>
+  <!-- Returns the generated documentation file for consumption
+       by the NuGet package generation -->
+  <Target Name="GetDocumentationFile"
+          Returns="$(DocumentationFile)"/>
 
   <Import Project="$(ToolsDir)Build.Common.targets" Condition="Exists('$(ToolsDir)Build.Common.targets')" />
   <Import Project="..\override.targets" Condition="Exists('..\override.targets')"/>