Skip to content

Commit 8590e41

Browse files
ericstjericstj
committed
Remove PackageTargetFramework
This property is largely obsolete and replaced with NuGetTargetMoniker where its needed. I've also cleaned up mentions of this and validation suppression around it in projects that will never be packaged. PackageTargetFramework remains in projects that will be packaged and duplicate their asset in multiple folders, eg: netstandard1.0;portable-net45+win8+wp8+wpa81
1 parent d6c9db6 commit 8590e41

34 files changed

Lines changed: 3 additions & 49 deletions

File tree

‎src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<DefineConstants>$(DefineConstants),LATEBINDING=True</DefineConstants>
1515
<AssemblyName>Microsoft.VisualBasic</AssemblyName>
1616
<NoStdLib>true</NoStdLib>
17-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.3'">netstandard1.3;netcore50</PackageTargetFramework>
1817
</PropertyGroup>
1918
<!-- Default configurations to help VS understand the configurations -->
2019
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" />

‎src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
1010
<!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 -->
11-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework>
1211
</PropertyGroup>
1312
<!-- Help VS understand available configurations -->
1413
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" />

‎src/System.Collections/src/System.Collections.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
99
<!-- 436 is thrown because BitArray conflict with corelib -->
1010
<NoWarn>0436</NoWarn>
11-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework>
1211
</PropertyGroup>
1312
<!-- Default configurations to help VS understand the options -->
1413
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" />

‎src/System.ComponentModel/src/System.ComponentModel.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<RootNamespace>System.ComponentModel</RootNamespace>
77
<AssemblyName>System.ComponentModel</AssemblyName>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework>
109
</PropertyGroup>
1110
<!-- Default configurations to help VS understand the configurations -->
1211
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" />

‎src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<ProjectGuid>{02304469-722E-4723-92A1-820B9A37D275}</ProjectGuid>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
9-
<PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework>
109
<!-- Disable 1685 (aka multiple type definitions) warning so it doesn't turn into an error -->
1110
<NoWarn>$(NoWarn);1685</NoWarn>
1211
</PropertyGroup>

‎src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
88
<ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid>
99
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
10-
<PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework>
1110
</PropertyGroup>
1211
<!-- Help VS understand available configurations -->
1312
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" />

‎src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid>
1111
<!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 -->
12-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework>
1312
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
1413
</PropertyGroup>
1514
<!-- Help VS understand available configurations -->

‎src/System.Globalization/src/System.Globalization.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<AssemblyName>System.Globalization</AssemblyName>
66
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
7-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework>
87
</PropertyGroup>
98
<!-- Help VS understand available configurations -->
109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" />

‎src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<EnableWinRT Condition="'$(TargetGroup)' == 'uap101'">true</EnableWinRT>
88
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net461'">true</IsPartialFacadeAssembly>
99
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net461'">None</ResourcesSourceOutputDirectory>
10-
<PackageTargetFramework Condition="'$(TargetGroup)'=='netstandard'">netstandard;uap10.1</PackageTargetFramework>
1110
</PropertyGroup>
1211
<!-- Default configurations to help VS understand the options -->
1312
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Windows_NT-Debug|AnyCPU'" />

‎src/System.IO/src/System.IO.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AssemblyName>System.IO</AssemblyName>
66
<ProjectGuid>{07390899-C8F6-4e83-A3A9-6867B8CB46A0}</ProjectGuid>
77
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
8-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard;uap10.1</PackageTargetFramework>
98
<DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants>
109
<NoWarn Condition="'$(TargetGroup)' == 'netstandard' or '$(TargetGroup)' == 'uap101aot'">CS0436</NoWarn>
1110
</PropertyGroup>

0 commit comments

Comments
 (0)