diff options
author | Eric St. John <ericstj@microsoft.com> | 2017-01-18 23:37:22 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2017-01-19 01:02:31 +0300 |
commit | c9b7abbd031af702c236e82b9a56de608811756f (patch) | |
tree | c943a8022f442da252d1c236cabde46477715b00 /src | |
parent | 8590e419f6639d9d5eabdbcb916e62fb1656d30e (diff) |
Clean up depprojs
Remove depprojs that were being used for old references/API-compat
For any project mentioning depproj, remove reference and clean up any
Configurations we don't expect to build
Diffstat (limited to 'src')
24 files changed, 13 insertions, 247 deletions
diff --git a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj deleted file mode 100644 index 4a6bfcac64..0000000000 --- a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj index 3b8d4c7fca..d3cd65531d 100644 --- a/src/System.AppContext/src/System.AppContext.csproj +++ b/src/System.AppContext/src/System.AppContext.csproj @@ -6,7 +6,6 @@ <ProjectGuid>{5522BAFC-E2FF-4896-993A-401DDEDFD85F}</ProjectGuid> <ClsCompliant>true</ClsCompliant> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'!='netcore50aot'">true</IsPartialFacadeAssembly> - <ContractProject Condition="'$(TargetGroup)'=='netcore50'">..\ref\4.0.0\System.AppContext.depproj</ContractProject> <!-- The following line needs to be removed once we have a targeting pack for 4.6.3 --> <TargetingPackNugetPackageId Condition="'$(TargetGroup)'=='net463'">Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId> <ExcludeResourcesImport Condition="'$(IsPartialFacadeAssembly)'=='true'">true</ExcludeResourcesImport> diff --git a/src/System.Console/ref/4.0.0/System.Console.depproj b/src/System.Console/ref/4.0.0/System.Console.depproj deleted file mode 100644 index 2e7ae1ef78..0000000000 --- a/src/System.Console/ref/4.0.0/System.Console.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj index e77d4c9555..4638562157 100644 --- a/src/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/System.IO.Compression/src/System.IO.Compression.csproj @@ -3,23 +3,21 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.IO.Compression</AssemblyName> - <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.3' OR '$(TargetGroup)'=='net46'">4.1.2.0</AssemblyVersion> - <ContractProject Condition="'$(AssemblyVersion)'=='4.1.2.0'">../ref/4.1.0/System.IO.Compression.depproj</ContractProject> <OutputType>Library</OutputType> <ProjectGuid>{5471BFE8-8071-466F-838E-5ADAA779E742}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <UseECMAKey>true</UseECMAKey> <DefineConstants Condition="'$(TargetGroup)' == 'netstandard'">$(DefineConstants);FEATURE_ZLIB</DefineConstants> - <DefineConstants Condition="'$(AssemblyVersion)'!='4.1.2.0'">$(DefineConstants);netstandard17</DefineConstants> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46' Or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> + <DefineConstants>$(DefineConstants);netstandard20</DefineConstants> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <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'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net46-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net46-Windows_NT-Release|AnyCPU'" /> <!-- Files shared between net46 and core --> <ItemGroup> <Compile Include="$(SharedOpenSourcePath)System\IO\Compression\Crc32Helper.cs" /> @@ -103,7 +101,7 @@ </Compile> </ItemGroup> <!-- Files exclusive to net46 --> - <ItemGroup Condition="'$(TargetGroup)' == 'net46' Or '$(TargetGroup)' == 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> <Compile Include="AssemblyInfo.cs" /> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> diff --git a/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs b/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs index 7ea497f5f3..775948314e 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs @@ -292,7 +292,7 @@ namespace System.IO.Compression throw new InvalidOperationException(SR.CannotWriteToDeflateStream); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(ReadAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs b/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs index f67bf43352..22c1352bf0 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs @@ -328,7 +328,7 @@ namespace System.IO.Compression throw new InvalidOperationException(SR.CannotWriteToDeflateStream); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(ReadAsync(buffer, offset, count, CancellationToken.None), asyncCallback, asyncState); @@ -585,7 +585,7 @@ namespace System.IO.Compression } } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index e0e3252af7..e97331499f 100644 --- a/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -72,7 +72,7 @@ namespace System.IO.Compression return _deflateStream.ReadByte(); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); @@ -86,7 +86,7 @@ namespace System.IO.Compression return _deflateStream.Read(array, offset, count); } -#if netstandard17 +#if netstandard20 public override IAsyncResult BeginWrite(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) => TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState); diff --git a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj b/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj deleted file mode 100644 index 36b93c3576..0000000000 --- a/src/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.0.1.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 10065d65e7..d48e83c160 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -4,11 +4,6 @@ <PropertyGroup> <ProjectGuid>{879C23DC-D828-4DFB-8E92-ABBC11B71035}</ProjectGuid> <AssemblyName>System.IO.FileSystem</AssemblyName> - <!-- - Disabling APICompat for the older builds because we are hitting - bug https://github.com/dotnet/buildtools/issues/1056 - --> - <RunApiCompat Condition="'$(AssemblyVersion)'=='4.0.2.0'">false</RunApiCompat> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> diff --git a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj b/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj deleted file mode 100644 index eb9b218fc4..0000000000 --- a/src/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.6</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 089a5d869d..a7aaf933a5 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -9,8 +9,6 @@ <ProjectGuid>{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}</ProjectGuid> <AssemblyName>System.Linq.Expressions</AssemblyName> <RootNamespace>System.Linq.Expressions</RootNamespace> - <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.6' Or '$(TargetGroup)'=='netstandard1.6'">4.1.1.0</AssemblyVersion> - <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Linq.Expressions.depproj</ContractProject> <IsInterpreting Condition="'$(TargetGroup)' == 'netcore50'">true</IsInterpreting> <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants> <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index a0eb2cc415..24710db79c 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -9,7 +9,6 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion> <DefineConstants Condition="'$(TargetGroup)' == 'netcore50'">$(DefineConstants);netcore50</DefineConstants> - <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Net.Sockets.depproj</ContractProject> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcore50-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 014415b68a..7dfd8ac83c 100644 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Reflection.Extensions</AssemblyName> - <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.3'">4.0.2.0</AssemblyVersion> - <ContractProject Condition="'$(AssemblyVersion)'=='4.0.2.0'">..\ref\4.0.0\System.Reflection.Extensions.depproj</ContractProject> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- all targets but netcore50aot are pure facades. Exclude resources for pure facades --> <ExcludeResourcesImport Condition="'$(TargetGroup)'!='netcore50aot'">true</ExcludeResourcesImport> diff --git a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj b/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj deleted file mode 100644 index 1ff7ec1f85..0000000000 --- a/src/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.5</PackageTargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 7c64b6494b..892d452bd0 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName> - <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.3' Or '$(TargetGroup)'=='netcore50aot'">4.1.1.0</AssemblyVersion> - <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.1/System.Runtime.Serialization.Primitives.depproj</ContractProject> <RootNamespace>System.Runtime.Serialization.Primitives</RootNamespace> <NoWarn>$(NoWarn);1634;1691;649</NoWarn> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> @@ -14,12 +12,8 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcore50aot-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcore50aot-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> @@ -35,14 +29,6 @@ <Compile Include="System\Runtime\Serialization\ISerializationSurrogateProvider.cs" /> <Compile Include="System\Runtime\Serialization\KnownTypeAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3' Or '$(TargetGroup)'=='netcore50aot'"> - <Compile Include="System\Runtime\Serialization\OnDeserializedAttribute.cs" /> - <Compile Include="System\Runtime\Serialization\OnDeserializingAttribute.cs" /> - <Compile Include="System\Runtime\Serialization\OnSerializedAttribute.cs" /> - <Compile Include="System\Runtime\Serialization\OnSerializingAttribute.cs" /> - <Compile Include="System\Runtime\Serialization\SerializationException.cs" /> - <Compile Include="System\Runtime\Serialization\StreamingContext.cs" /> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' Or '$(TargetGroup)'=='uap101aot'"> <Compile Include="System\Runtime\Serialization\InvalidDataContractException.Serialization.cs" /> <Compile Include="System.Runtime.Serialization.Primitives.TypeForwards.cs" /> diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs deleted file mode 100644 index 408a55ccf9..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializedAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnDeserializedAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs deleted file mode 100644 index 162857e8d3..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnDeserializingAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnDeserializingAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs deleted file mode 100644 index 020dd0257c..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializedAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnSerializedAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs deleted file mode 100644 index 8dc8af3f23..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/OnSerializingAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public sealed class OnSerializingAttribute : Attribute - { - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs deleted file mode 100644 index d03fac6793..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/SerializationException.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - public class SerializationException : Exception - { - private static string s_nullMessage = "Serialization error."; // TODO: SR.SerializationException; - - public SerializationException() : base(s_nullMessage) - { - } - - public SerializationException(string message) : base(message) - { - } - - public SerializationException(string message, Exception innerException) : base(message, innerException) - { - } - } -} diff --git a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs b/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs deleted file mode 100644 index 98a622fc68..0000000000 --- a/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/StreamingContext.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.Serialization -{ - public struct StreamingContext - { - private readonly object _additionalContext; - private readonly StreamingContextStates _state; - - public StreamingContext(StreamingContextStates state) : this(state, null) - { - } - - public StreamingContext(StreamingContextStates state, object additional) - { - _state = state; - _additionalContext = additional; - } - - public override bool Equals(object obj) - { - if (!(obj is StreamingContext)) - { - return false; - } - StreamingContext ctx = (StreamingContext)obj; - return ctx._additionalContext == _additionalContext && ctx._state == _state; - } - - public override int GetHashCode() => (int)_state; - - public StreamingContextStates State => _state; - - public object Context => _additionalContext; - } - - // Keep these in sync with the version in vm\runtimehandles.h - [Flags] - public enum StreamingContextStates - { - CrossProcess = 0x01, - CrossMachine = 0x02, - File = 0x04, - Persistence = 0x08, - Remoting = 0x10, - Other = 0x20, - Clone = 0x40, - CrossAppDomain = 0x80, - All = 0xFF, - } -} diff --git a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj b/src/System.Runtime/ref/4.1.0/System.Runtime.depproj deleted file mode 100644 index e3932a41e6..0000000000 --- a/src/System.Runtime/ref/4.1.0/System.Runtime.depproj +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Runtime/src/Configurations.props b/src/System.Runtime/src/Configurations.props index f71bd28c11..d3acc59a8a 100644 --- a/src/System.Runtime/src/Configurations.props +++ b/src/System.Runtime/src/Configurations.props @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.5; net461-Windows_NT; uap101aot-Windows_NT; netcoreapp1.2corert-Windows_NT; diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj index 8749c28b00..32b3ec4116 100644 --- a/src/System.Runtime/src/System.Runtime.csproj +++ b/src/System.Runtime/src/System.Runtime.csproj @@ -4,14 +4,10 @@ <PropertyGroup> <ProjectGuid>{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}</ProjectGuid> <AssemblyName>System.Runtime</AssemblyName> - <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.5'">4.1.1.0</AssemblyVersion> - <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.0/System.Runtime.depproj</ContractProject> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot' Or '$(TargetGroup)' == 'netcoreapp1.2corert'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" /> @@ -38,18 +34,18 @@ <Compile Include="System\Runtime\CompilerServices\Attributes.cs" /> <Compile Include="System\IO\FileAttributes.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net461' and '$(TargetGroup)' != 'netstandard1.5'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> <Compile Include="System\Runtime\NgenServicingAttributes.cs" /> <Compile Include="System\IO\HandleInheritability.cs" /> <Compile Include="System\Runtime\ConstrainedExecution\PrePrepareMethodAttribute.cs" /> <Compile Include="System\Runtime\CompilerServices\SpecialNameAttribute.cs" /> <Compile Include="System\Threading\WaitHandleExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System\ComponentModel\DefaultValueAttribute.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'netstandard1.5' or '$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" /> + <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' != 'net461'"> <TargetingPackReference Include="System.Private.CoreLib" /> |