Skip to content

Commit adc4e4c

Browse files
authored
Remove old transport packages from CoreCLR and CoreFX. (#5523)
* Remove old transport packages from CoreCLR and CoreFX. * Remove a lot of now unused goo from the coreclr packaging build. * Remove unused Microsoft.Windows.Compatibility tests. * Remove unused frameworkPackage.targets
1 parent 520719c commit adc4e4c

32 files changed

Lines changed: 10 additions & 732 deletions

eng/Version.Details.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha.1.19563.6">
4-
<Uri>https://github.com/dotnet/corefx</Uri>
5-
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
6-
</Dependency>
73
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.20080.9">
84
<Uri>https://github.com/dotnet/runtime</Uri>
95
<Sha>665983a01f9c604bc3f704f469acb8a08c619d8a</Sha>

eng/pipelines/coreclr/templates/build-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
177177

178178
# Build packages
179-
- script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossPackagesArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig)
179+
- script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig)
180180
displayName: Build packages
181181

182182
# Save packages using the prepare-signed-artifacts format.

eng/pipelines/coreclr/templates/xplat-job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,9 @@ jobs:
109109
- ${{ if ne(parameters.crossrootfsDir, '') }}:
110110
- name: crossArg
111111
value: 'cross'
112-
- name: crossPackagesArg
113-
value: '-__DoCrossArchBuild=1'
114112
- ${{ if eq(parameters.crossrootfsDir, '') }}:
115113
- name: crossArg
116114
value: ''
117-
- name: crossPackagesArg
118-
value: ''
119115

120116
- ${{ each variable in parameters.variables }}:
121117
- ${{insert}}: ${{ variable }}

src/coreclr/build-packages.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ while :; do
9797
__Id=$(echo $1| cut -d'=' -f 2)
9898
buildArgs="$buildArgs /p:OfficialBuildId=$__Id"
9999
;;
100-
-__DoCrossArchBuild=*)
101-
__CrossBuild=$(echo $1| cut -d'=' -f 2)
102-
buildArgs="$buildArgs /p:__DoCrossArchBuild=$__CrossBuild"
100+
cross)
101+
__CrossBuild=1
103102
;;
104103
-portablebuild=false)
105104
buildArgs="$buildArgs /p:PortableBuild=false"

src/coreclr/src/.nuget/Directory.Build.targets

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,16 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<AdditionalLibPackageExcludes Include="@(LongNameFile -> '%(TargetPath)')" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<NativeWithSymbolFile Include="@(NativeBinary);@(CrossGenBinary)">
17+
<NativeWithSymbolFile Include="@(NativeBinary)">
2218
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2319
</NativeWithSymbolFile>
24-
<!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. -->
25-
<NativeWithSymbolFile Include="@(ArchitectureSpecificLibFile)">
26-
<TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
27-
</NativeWithSymbolFile>
2820
<NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)">
2921
<TargetPath>tools</TargetPath>
3022
</NativeWithSymbolFile>
3123
</ItemGroup>
3224

33-
<ItemGroup Condition="'$(HasCrossTargetComponents)'=='true'">
34-
<NativeWithSymbolFile Include="@(CrossArchitectureSpecificNativeFileAndSymbol)">
35-
<TargetPath>runtimes/$(CrossTargetComponentFolder)_$(Platform)/native</TargetPath>
36-
</NativeWithSymbolFile>
37-
<NativeWithSymbolFile Include="@(CrossArchitectureSpecificToolFile)">
38-
<TargetPath>tools/$(CrossTargetComponentFolder)_$(Platform)</TargetPath>
39-
</NativeWithSymbolFile>
40-
</ItemGroup>
41-
42-
<ItemGroup>
43-
<!-- The symbols for these files are already in place together with respective *.ni.pdb -->
44-
<IlForCrossGenedFile Include="@(CrossGenBinary -> '%(RootDir)%(Directory)IL\%(Filename).dll')">
45-
<TargetPath>runtimes/$(PackageTargetRuntime)/il</TargetPath>
46-
</IlForCrossGenedFile>
47-
</ItemGroup>
48-
4925
<ItemGroup>
5026
<File Include="@(NativeWithSymbolFile)" />
51-
<File Include="@(LongNameFile);@(IlForCrossGenedFile)">
52-
<IsSymbolFile>true</IsSymbolFile>
53-
</File>
5427
</ItemGroup>
5528

5629
<ItemGroup>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)