Skip to content

Commit 692c3f7

Browse files
chcostaweshaggard
chcosta
authored and
weshaggard
committed
Use netcoreapp and netstandard for targetgroups (dotnet/corefx#14616)
* Use netcoreapp and netstandard for targetgroups * Add configurations for some reference projects Commit migrated from dotnet/corefx@fa7a54a
1 parent c165286 commit 692c3f7

204 files changed

Lines changed: 392 additions & 379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/libraries/Microsoft.CSharp/src/Configurations.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<BuildConfigurations>
5-
netstandard1.7;
5+
netstandard;
66
</BuildConfigurations>
77
</PropertyGroup>
88
</Project>

‎src/libraries/Microsoft.Win32.Primitives/src/Configurations.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<BuildConfigurations>
5-
netstandard1.7-Unix;
6-
netstandard1.7-Windows_NT;
5+
netstandard-Unix;
6+
netstandard-Windows_NT;
77
net463-Windows_NT;
88
</BuildConfigurations>
99
</PropertyGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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)' == 'netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework>
11+
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard1.7;uap10.1</PackageTargetFramework>
1212
</PropertyGroup>
1313
<!-- Help VS understand available configurations -->
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" />
@@ -17,10 +17,10 @@
1717
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
1919
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
20-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'">
20+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
2121
<Compile Include="System\ComponentModel\Win32Exception.cs" />
2222
</ItemGroup>
23-
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard1.7' ">
23+
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == 'netstandard' ">
2424
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
2525
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
2626
</Compile>
@@ -29,7 +29,7 @@
2929
</Compile>
3030
<Compile Include="System\ComponentModel\Win32Exception.Windows.cs" />
3131
</ItemGroup>
32-
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard1.7' ">
32+
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netstandard' ">
3333
<Compile Include="System\ComponentModel\Win32Exception.Unix.cs" />
3434
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
3535
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>

‎src/libraries/Microsoft.Win32.Registry/src/Configurations.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<BuildConfigurations>
5-
netstandard1.7-Windows_NT;
6-
netstandard1.7-Unix;
5+
netstandard-Windows_NT;
6+
netstandard-Unix;
77
net463-AnyOS;
88
</BuildConfigurations>
99
</PropertyGroup>

‎src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" />
1717
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
19-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'">
19+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
2020
<Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
2121
<Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
2222
</Compile>
@@ -31,7 +31,7 @@
3131
<Compile Include="Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs" />
3232
<Compile Include="System\Security\AccessControl\RegistryRights.cs" />
3333
</ItemGroup>
34-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7' AND '$(TargetsWindows)' == 'true'">
34+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true'">
3535
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
3636
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
3737
</Compile>

‎src/libraries/System.AppContext/src/Configurations.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<BuildConfigurations>
55
net463;
6-
netstandard1.7;
6+
netstandard;
77
</BuildConfigurations>
88
</PropertyGroup>
99
</Project>

‎src/libraries/System.Buffers/src/Configurations.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<BuildConfigurations>
55
netstandard1.1;
6-
netcoreapp1.1;
6+
netcoreapp;
77
</BuildConfigurations>
88
</PropertyGroup>
99
</Project>

‎src/libraries/System.Buffers/src/System.Buffers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
88
<UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
9-
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netcoreapp1.1'">true</IsPartialFacadeAssembly>
9+
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netcoreapp'">true</IsPartialFacadeAssembly>
1010
</PropertyGroup>
1111
<!-- Default configurations to help VS understand the options -->
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -18,7 +18,7 @@
1818
<Compile Include="System\Buffers\DefaultArrayPoolBucket.cs" />
1919
<Compile Include="System\Buffers\Utilities.cs" />
2020
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp1.1'">
21+
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
2222
<TargetingPackReference Include="System.Private.CoreLib" />
2323
</ItemGroup>
2424
<ItemGroup>

‎src/libraries/System.CodeDom/src/Configurations.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<BuildConfigurations>
55
net463;
6-
netstandard1.7;
6+
netstandard;
77
</BuildConfigurations>
88
</PropertyGroup>
99
</Project>

‎src/libraries/System.CodeDom/src/System.CodeDom.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly>
88
</PropertyGroup>
99
<!-- Default configurations to help VS understand the options -->
10-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU'" />
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.7_Release|AnyCPU'" />
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Debug|AnyCPU'" />
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard_Release|AnyCPU'" />
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
14-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'">
14+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
1515
<Compile Include="Microsoft\CSharp\CSharpCodeGenerator.cs" />
1616
<Compile Include="Microsoft\CSharp\CSharpCodeProvider.cs" />
1717
<Compile Include="Microsoft\CSharp\CSharpMemberAttributeConverter.cs" />

0 commit comments

Comments
 (0)