diff options
34 files changed, 3 insertions, 49 deletions
diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj index 95dd685594..ea2e17eee9 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj +++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj @@ -14,7 +14,6 @@ <DefineConstants>$(DefineConstants),LATEBINDING=True</DefineConstants> <AssemblyName>Microsoft.VisualBasic</AssemblyName> <NoStdLib>true</NoStdLib> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index c37ffa7280..2b576bafb7 100644 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -8,7 +8,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj index 8efad72726..9cb4f6a7cd 100644 --- a/src/System.Collections/src/System.Collections.csproj +++ b/src/System.Collections/src/System.Collections.csproj @@ -8,7 +8,6 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- 436 is thrown because BitArray conflict with corelib --> <NoWarn>0436</NoWarn> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.ComponentModel/src/System.ComponentModel.csproj b/src/System.ComponentModel/src/System.ComponentModel.csproj index 0c10c0a9a8..fb2bbe10ac 100644 --- a/src/System.ComponentModel/src/System.ComponentModel.csproj +++ b/src/System.ComponentModel/src/System.ComponentModel.csproj @@ -6,7 +6,6 @@ <RootNamespace>System.ComponentModel</RootNamespace> <AssemblyName>System.ComponentModel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 666f92d056..51d476520c 100644 --- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -6,7 +6,6 @@ <ProjectGuid>{02304469-722E-4723-92A1-820B9A37D275}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> <!-- Disable 1685 (aka multiple type definitions) warning so it doesn't turn into an error --> <NoWarn>$(NoWarn);1685</NoWarn> </PropertyGroup> diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 0e6fed8e8e..57b2377ddf 100644 --- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -7,7 +7,6 @@ <DefineConstants>$(DefineConstants);TRACE</DefineConstants> <ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 2f3546eb22..66b5526bbb 100644 --- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -9,7 +9,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Help VS understand available configurations --> diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj index 440eab2f96..3d5f1a0dcd 100644 --- a/src/System.Globalization/src/System.Globalization.csproj +++ b/src/System.Globalization/src/System.Globalization.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <AssemblyName>System.Globalization</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 75dc2c658a..c8ecf2eb0d 100644 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -7,7 +7,6 @@ <EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj index 11553be471..ae1b59cc99 100644 --- a/src/System.IO/src/System.IO.csproj +++ b/src/System.IO/src/System.IO.csproj @@ -5,7 +5,6 @@ <AssemblyName>System.IO</AssemblyName> <ProjectGuid>{07390899-C8F6-4e83-A3A9-6867B8CB46A0}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> <NoWarn Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'">CS0436</NoWarn> </PropertyGroup> diff --git a/src/System.Json/src/System.Json.csproj b/src/System.Json/src/System.Json.csproj index 1e735d675c..8de79585bf 100644 --- a/src/System.Json/src/System.Json.csproj +++ b/src/System.Json/src/System.Json.csproj @@ -9,7 +9,6 @@ --> <AssemblyVersion>2.0.5.0</AssemblyVersion> <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid> - <PackageTargetFramework>netstandard1.0</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.0-Debug|AnyCPU'" /> diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 0aa3a66775..089a5d869d 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -11,7 +11,7 @@ <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="'$(PackageTargetFramework)' == 'netcore50'">true</IsInterpreting> + <IsInterpreting Condition="'$(TargetGroup)' == 'netcore50'">true</IsInterpreting> <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants> <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly> diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index ed9f667ff1..b8f05f87f0 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -7,7 +7,7 @@ </PropertyGroup> <PropertyGroup> <ProjectGuid>{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}</ProjectGuid> - <IsInterpreting Condition="'$(PackageTargetFramework)' == 'netcore50'">true</IsInterpreting> + <IsInterpreting Condition="'$(TargetGroup)' == 'netcore50'">true</IsInterpreting> <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants> <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> </PropertyGroup> diff --git a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj index 59730b2f76..25070dd5fc 100644 --- a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid> <AssemblyName>System.Linq.Parallel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-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 f7cca2baec..014415b68a 100644 --- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -8,7 +8,6 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- all targets but netcore50aot are pure facades. Exclude resources for pure facades --> <ExcludeResourcesImport Condition="'$(TargetGroup)'!='netcore50aot'">true</ExcludeResourcesImport> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index eeb1d673e5..0cfd6dd196 100644 --- a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -11,8 +11,6 @@ <DefaultLanguage>en-US</DefaultLanguage> <NoWarn>1591</NoWarn> <CLSCompliant>false</CLSCompliant> - <!-- rev'ed to 1.4.1 so that we can drop pre-release down to beta --> - <DefineConstants>$(DefineConstants)</DefineConstants> <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.1-Debug|AnyCPU'" /> diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index 76c67f4543..eee199650e 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <AssemblyName>System.Reflection.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Reflection.TypeExtensions/dir.props b/src/System.Reflection.TypeExtensions/dir.props index dde44234bf..1f9c2223d9 100644 --- a/src/System.Reflection.TypeExtensions/dir.props +++ b/src/System.Reflection.TypeExtensions/dir.props @@ -5,8 +5,4 @@ <AssemblyVersion>4.1.2.0</AssemblyVersion> <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> - <ItemGroup> - <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uap10.1 --> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 94e7db9f0a..e0529e5354 100644 --- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -5,7 +5,6 @@ <AssemblyName>System.Reflection.TypeExtensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ProjectGuid>{1E689C1B-690C-4799-BDE9-6E7990585894}</ProjectGuid> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.5'">netstandard1.5;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net462-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj index b3048b1f2e..bc75bd89bf 100644 --- a/src/System.Reflection/src/System.Reflection.csproj +++ b/src/System.Reflection/src/System.Reflection.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <AssemblyName>System.Reflection</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index 7c7730bf67..b454505efa 100644 --- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj @@ -7,7 +7,6 @@ <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != 'uap101aot'">None</ResourcesSourceOutputDirectory> <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='uap101aot'">true</SkipCommonResourcesIncludes> <AllowUnsafeBlocks Condition="'$(TargetGroup)' == 'uap101aot'">true</AllowUnsafeBlocks> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 496f69db78..b76adfac2d 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -9,9 +9,7 @@ <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- System.IO.Path conflicts between type in partial facade and in mscorlib --> <NoWarn>0436</NoWarn> - <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> - <TargetsWindowsUap Condition="'$(TargetGroup)'=='uap101aot'">true</TargetsWindowsUap> + <TargetsWindowsUap Condition="'$(TargetGroup)'=='uap101aot'">true</TargetsWindowsUap> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 8f1087aca6..3a0a3343aa 100644 --- a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{D85EE71C-F05B-4331-9300-8E2833D49E19}</ProjectGuid> <AssemblyName>System.Runtime.Handles</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index 240902b60a..e0d6fc6104 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -9,7 +9,6 @@ <GenFacadesArgs Condition="'$(TargetGroup)' == 'uap101aot' or '$(TargetGroup)' == 'netcoreapp1.2corert'">$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs> <!-- Force string resources to be excluded for full facades. --> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463' or '$(TargetGroup)' == 'uap101aot'">None</ResourcesSourceOutputDirectory> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" /> 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 bce1af1d9b..7c64b6494b 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 @@ -12,8 +12,6 @@ <PlatformTarget>AnyCPU</PlatformTarget> <ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcore50aot-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index 41885250e6..8e66029a21 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -26,6 +26,4 @@ <ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <!-- Temporarily disable TFM validation until its fixed to ignore windows.winmd --> - <Target Name="ValidatePackageTargetFramework" /> </Project>
\ No newline at end of file diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 02c2b27022..19aae14fc8 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{07390899-C8F6-4E83-A3A9-6867B8CB46A0}</ProjectGuid> <RootNamespace>System.Security.Permissions</RootNamespace> <AssemblyName>System.Security.Permissions</AssemblyName> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard</PackageTargetFramework> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <PackageAsRefAndLib Condition="'$(TargetGroup)' == 'net461'">true</PackageAsRefAndLib> </PropertyGroup> diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj index 6629873eb6..4408e2adca 100644 --- a/src/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/System.Security.Principal/src/System.Security.Principal.csproj @@ -8,7 +8,6 @@ <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 5393732e4e..9453b177fe 100644 --- a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -8,14 +8,6 @@ <AssemblyName>System.Text.Encoding.CodePages</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> - <PackageTargetFramework Include="netstandard2.0" /> - <!-- need to support rid-less restore for packages.config --> - <PackageTargetFramework Include="net461"> - <TargetRuntime> - </TargetRuntime> - </PackageTargetFramework> - </ItemGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj index b9a71b5a94..e35e5882a5 100644 --- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -5,7 +5,6 @@ <AssemblyName>System.Text.Encoding</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index 5f0d4d836b..9db5da2072 100644 --- a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -8,7 +8,6 @@ <FileAlignment>512</FileAlignment> <DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj index 6969f6a7a6..633bf957ed 100644 --- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}</ProjectGuid> <AssemblyName>System.Threading.Tasks</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='uap101aot-Windows_NT-Debug|AnyCPU'" /> diff --git a/src/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/System.Threading.Thread/src/System.Threading.Thread.csproj index 29cbe2922e..5c25837058 100644 --- a/src/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -5,7 +5,6 @@ <AssemblyName>System.Threading.Thread</AssemblyName> <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework> <!-- Don't allow project reference to package dependency conversion --> <KeepAllProjectReferences>true</KeepAllProjectReferences> <!-- Type being defined conflicts with imported type from dependency assembly --> diff --git a/src/System.Transactions/src/System.Transactions.csproj b/src/System.Transactions/src/System.Transactions.csproj index c699d6209a..4c57cc79b4 100644 --- a/src/System.Transactions/src/System.Transactions.csproj +++ b/src/System.Transactions/src/System.Transactions.csproj @@ -5,7 +5,6 @@ <AssemblyVersion>4.0.0.0</AssemblyVersion> <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <PackageTargetFramework>netstandard</PackageTargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the options --> |