Skip to content

Commit bc2d80c

Browse files
authored
Removed netcoreappaot configuration from corefx (dotnet/corefx#36739)
* netcoreappaot-Windows_NT regex removed * netcoreappaot-WebAssembly;\n regex removed * netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release; regex removed * netcoreappaot; regex removed * netcoreappaot-Debug;netcoreappaot-Release; removed * removing rest of occurences of netcoreappaot * deleteing the netcoreappaot apicompat files Commit migrated from dotnet/corefx@e9d1a10
1 parent 29a8bb6 commit bc2d80c

110 files changed

Lines changed: 53 additions & 270 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.

eng/configurations/targetgroups.props

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,6 @@
166166
<Imports>netcoreapp3.0</Imports>
167167
<CompatibleWith>netstandard</CompatibleWith>
168168
</TargetGroups>
169-
<TargetGroups Include="netcoreapp3.0aot">
170-
<NETCoreAppMaximumVersion>3.0</NETCoreAppMaximumVersion>
171-
<TargetFramework>netcoreapp3.0</TargetFramework>
172-
<PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
173-
<Imports>netcoreapp;netcoreapp2.1</Imports>
174-
<CompatibleWith>netstandard</CompatibleWith>
175-
</TargetGroups>
176-
<TargetGroups Include="netcoreappaot">
177-
<NETCoreAppMaximumVersion>3.0</NETCoreAppMaximumVersion>
178-
<TargetFramework>netcoreapp3.0</TargetFramework>
179-
<PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
180-
<Imports>netcoreapp;netcoreapp3.0aot</Imports>
181-
<CompatibleWith>netstandard</CompatibleWith>
182-
</TargetGroups>
183169
<TargetGroups Include="net45">
184170
<TargetFramework>net45</TargetFramework>
185171
<TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.5</TargetingPackNugetPackageId>

src/libraries/CoreFx.Private.TestUtilities/src/Configurations.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
netcoreapp-Unix;
1010
netcoreapp2.0-Windows_NT;
1111
netcoreapp2.0-Unix;
12-
netcoreappaot-Windows_NT;
13-
netcoreappaot-WebAssembly;
1412
</BuildConfigurations>
1513
</PropertyGroup>
1614
</Project>

src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
1111
<NoWarn Condition="'$(TargetGroup)' == 'netstandard'">$(NoWarn);CS3021</NoWarn>
1212
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">Test Utilities are not supported on this platform</GeneratePlatformNotSupportedAssemblyMessage>
13-
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
13+
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<Compile Include="System\Buffers\BoundedMemory.cs" />

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<PropertyGroup>
33
<BuildConfigurations>
44
netcoreapp-Windows_NT;
5-
netcoreappaot-Windows_NT;
6-
netcoreappaot-WebAssembly;
75
netcoreapp-Unix;
86
uap-Windows_NT;
97
uapaot-Windows_NT;

src/libraries/System.AppContext/src/System.AppContext.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectGuid>{5522BAFC-E2FF-4896-993A-401DDEDFD85F}</ProjectGuid>
55
<ClsCompliant>true</ClsCompliant>
66
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
7-
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
7+
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
88
</PropertyGroup>
99
<!-- Default configurations to help VS understand the options -->
1010
<ItemGroup>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<PropertyGroup>
33
<BuildConfigurations>
44
netcoreapp-Windows_NT;
5-
netcoreappaot-Windows_NT;
6-
netcoreappaot-WebAssembly;
75
netcoreapp-Unix;
86
uap-Windows_NT;
97
uapaot-Windows_NT;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
66
<ExcludeResourcesImport>true</ExcludeResourcesImport>
7-
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
7+
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
88
</PropertyGroup>
99
<ItemGroup>
1010
<ReferenceFromRuntime Include="System.Private.CoreLib" />

src/libraries/System.Collections.Concurrent/src/Configurations.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<BuildConfigurations>
44
netcoreapp-Unix;
55
netcoreapp-Windows_NT;
6-
netcoreappaot-Windows_NT;
7-
netcoreappaot-WebAssembly;
86
uap-Windows_NT;
97
uapaot-Windows_NT;
108
</BuildConfigurations>

src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyName>System.Collections.Concurrent</AssemblyName>
55
<RootNamespace>System.Collections.Concurrent</RootNamespace>
66
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
7-
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreappaot-WebAssembly-Debug;netcoreappaot-WebAssembly-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
7+
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
88
</PropertyGroup>
99
<ItemGroup>
1010
<Compile Include="System\Collections\Concurrent\BlockingCollection.cs" />

src/libraries/System.Collections/src/Configurations.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<BuildConfigurations>
44
uapaot-Windows_NT;
55
netcoreapp-Windows_NT;
6-
netcoreappaot-Windows_NT;
7-
netcoreappaot-WebAssembly;
86
netcoreapp-Unix;
97
uap-Windows_NT;
108
</BuildConfigurations>

0 commit comments

Comments
 (0)