Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit edacccb

Browse files
safernsafern
authored
Ensure build of netcoreapp vertical of CoreFx can be done without past packages (#25921)
* Add System.Drawing.Common to netcoreapp vertical * Make System.Data.Odbc be able to build for netcoreapp vertical * Add netcoreapp to System.Diagnostics.PerformanceCounter * Add netcoreapp to System.Diagnostics.EventLog * Run UpdateVSConfigurations * Change Contains('netcoreapp') to StartsWith('netcoreapp') * Include netcoreapp.depproj only when BuildAllConfigurations == true * Change tests to netcoreapp from netcoreapp2.0 for vertical
1 parent 3a98968 commit edacccb

File tree

81 files changed

+490
-598
lines changed

Some content is hidden

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

81 files changed

+490
-598
lines changed

‎external/dir.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<!-- Build for all configurations -->
99
<ItemGroup>
10-
<Project Include="netcoreapp/netcoreapp.depproj" />
10+
<Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
1111
<Project Include="netstandard/netstandard.depproj" />
1212
<Project Include="netfx/netfx.depproj" />
1313
<Project Include="runtime/runtime.depproj" />

‎src/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
<ProjectGuid>{42F10363-C2A2-42B5-B7B9-1B5DBB0BC71E}</ProjectGuid>
66
<RootNamespace>WebData.BaseLib</RootNamespace>
77
</PropertyGroup>
8-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
9-
</PropertyGroup>
10-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
11-
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
1210
<ItemGroup>
1311
<Compile Include="Globalization.cs" />
1412
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs">
1513
<Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs</Link>
1614
</Compile>
1715
</ItemGroup>
1816
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
19-
</Project>
17+
</Project>

‎src/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 14
33
VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{0657A043-0AEE-445E-9BE4-0B3A9D80318F}"
6+
ProjectSection(ProjectDependencies) = postProject
7+
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}
8+
EndProjectSection
9+
EndProject
510
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist", "src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj", "{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}"
611
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
13+
EndProject
714
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
815
EndProject
916
Global
@@ -12,6 +19,10 @@ Global
1219
Release|Any CPU = Release|Any CPU
1320
EndGlobalSection
1421
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22+
{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.ActiveCfg = netfx-Debug|Any CPU
23+
{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.Build.0 = netfx-Debug|Any CPU
24+
{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.ActiveCfg = netfx-Release|Any CPU
25+
{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.Build.0 = netfx-Release|Any CPU
1526
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.ActiveCfg = netfx-Windows_NT-Debug|Any CPU
1627
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.Build.0 = netfx-Windows_NT-Debug|Any CPU
1728
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.ActiveCfg = netfx-Windows_NT-Release|Any CPU
@@ -21,6 +32,7 @@ Global
2132
HideSolutionNode = FALSE
2233
EndGlobalSection
2334
GlobalSection(NestedProjects) = preSolution
35+
{0657A043-0AEE-445E-9BE4-0B3A9D80318F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
2436
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
2537
EndGlobalSection
2638
EndGlobal

‎src/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<PropertyGroup>
1212
<SDTTestDir>..\..\System.Diagnostics.Tracing\tests</SDTTestDir>
1313
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
1616
<ItemGroup>
1717
<Compile Include="$(SDTTestDir)\BasicEventSourceTest\Harness\EventTestHarness.cs" />
1818
<Compile Include="$(SDTTestDir)\BasicEventSourceTest\FuzzyTests.cs" />
@@ -41,4 +41,4 @@
4141
<Compile Include="$(SDTTestDir)\CustomEventSources\UseInterfaceEventSource.cs" />
4242
</ItemGroup>
4343
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
44-
</Project>
44+
</Project>

‎src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ Global
3030
{20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
3131
{20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
3232
{20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
33-
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
34-
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
35-
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
36-
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
33+
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
34+
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
35+
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
36+
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
3737
{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
3838
{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
3939
{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
30-
<ItemGroup Condition="$(TargetGroup.Contains('netcoreapp'))">
30+
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
3131
<Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
3232
<Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
3333
</Compile>
@@ -44,7 +44,7 @@
4444
<Compile Include="System\Security\AccessControl\RegistryRights.cs" />
4545
<Compile Include="System\Security\AccessControl\RegistrySecurity.cs" />
4646
</ItemGroup>
47-
<ItemGroup Condition="$(TargetGroup.Contains('netcoreapp')) AND '$(TargetsWindows)' == 'true'">
47+
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) AND '$(TargetsWindows)' == 'true'">
4848
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
4949
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
5050
</Compile>

‎src/SharedFrameworkValidation/RestoreSDKProject/RestoreSDKProject.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netcoreapp2.0</TargetFramework>
54
<RuntimeFrameworkVersion>$(_RuntimeFrameworkVersion)</RuntimeFrameworkVersion>
65
<CoreFxPackageVersion>4.4.0-$(CoreFxExpectedPrerelease)</CoreFxPackageVersion>
76
<RuntimeIdentifier>$(_PackageRID)</RuntimeIdentifier>
87
<SelfContained>true</SelfContained>
98
</PropertyGroup>
10-
9+
<PropertyGroup>
10+
<ProjectGuid>{8371FF08-5374-4584-970C-6DC5B25E8BF1}</ProjectGuid>
11+
</PropertyGroup>
1112
<ItemGroup>
1213
<PackageReference Include="Microsoft.CSharp" Version="$(CoreFxPackageVersion)" />
1314
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0-$(CoreFxExpectedPrerelease)" />
@@ -57,10 +58,9 @@
5758
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxPackageVersion)" />
5859
<PackageReference Include="System.ValueTuple" Version="$(CoreFxPackageVersion)" />
5960
</ItemGroup>
60-
6161
<Target Name="BinPlaceMetaPackageRef" BeforeTargets="CoreCompile">
6262
<Copy SourceFiles="%(ReferencePath.Identity)" DestinationFolder="$(_MetaPackageDestinationFolder)" />
6363
</Target>
64-
65-
</Project>
66-
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
65+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
66+
</Project>

‎src/System.Collections.Concurrent/System.Collections.Concurrent.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurre
77
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}
88
EndProjectSection
99
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent.Performance.Tests", "tests\Performance\System.Collections.Concurrent.Performance.Tests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}"
11+
ProjectSection(ProjectDependencies) = postProject
12+
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}
13+
EndProjectSection
14+
EndProject
1015
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "src\System.Collections.Concurrent.csproj", "{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}"
1116
ProjectSection(ProjectDependencies) = postProject
1217
{772CB0A7-3D45-4D3A-B975-671A1937C761} = {772CB0A7-3D45-4D3A-B975-671A1937C761}
@@ -30,6 +35,10 @@ Global
3035
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
3136
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
3237
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
38+
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
39+
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
40+
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
41+
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
3342
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
3443
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
3544
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -44,6 +53,7 @@ Global
4453
EndGlobalSection
4554
GlobalSection(NestedProjects) = preSolution
4655
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
56+
{16568C86-E97E-42C6-B683-65A1B5AF2EC8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
4757
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
4858
{772CB0A7-3D45-4D3A-B975-671A1937C761} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
4959
EndGlobalSection

‎src/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.Performance.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<IncludePerformanceTests>true</IncludePerformanceTests>
66
<ProjectGuid>{16568C86-E97E-42C6-B683-65A1B5AF2EC8}</ProjectGuid>
77
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
810
<!-- Default configurations to help VS understand the configurations -->
9-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
10-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
1111
<ItemGroup>
1212
<Compile Include="Perf.ConcurrentBag.cs" />
1313
<Compile Include="Perf.ConcurrentDictionary.cs" />

‎src/System.Collections/System.Collections.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Tests",
77
{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5}
88
EndProjectSection
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Performance.Tests", "tests\Performance\System.Collections.Performance.Tests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Performance.Tests", "tests\Performance\System.Collections.Performance.Tests.csproj", "{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}"
1111
ProjectSection(ProjectDependencies) = postProject
1212
{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5}
1313
EndProjectSection
@@ -35,10 +35,10 @@ Global
3535
{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
3636
{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
3737
{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
38-
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
39-
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
40-
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
41-
{16568C86-E97E-42C6-B683-65A1B5AF2EC8}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
38+
{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
39+
{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
40+
{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
41+
{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
4242
{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
4343
{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
4444
{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -53,7 +53,7 @@ Global
5353
EndGlobalSection
5454
GlobalSection(NestedProjects) = preSolution
5555
{F5EB9630-AD29-4880-963F-F2D39C684D8A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
56-
{16568C86-E97E-42C6-B683-65A1B5AF2EC8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
56+
{F2B47C9D-477E-4EB2-B7F9-D7563FCED117} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
5757
{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
5858
{C746D448-E7C3-4850-9CA7-D3F1FA49742F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
5959
EndGlobalSection

0 commit comments

Comments
 (0)