From adc4e4cad1132dc99be93f914b11101f5e52d5b4 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 5 Feb 2020 14:13:40 -0800 Subject: [PATCH] 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 --- eng/Version.Details.xml | 4 - eng/pipelines/coreclr/templates/build-job.yml | 2 +- eng/pipelines/coreclr/templates/xplat-job.yml | 4 - src/coreclr/build-packages.sh | 5 +- .../src/.nuget/Directory.Build.targets | 29 +-- .../Microsoft.NETCore.Jit.builds | 9 - .../Microsoft.NETCore.Jit.pkgproj | 12 -- ...untime.FreeBSD.Microsoft.NETCore.Jit.props | 6 - .../runtime.Linux.Microsoft.NETCore.Jit.props | 7 - .../runtime.OSX.Microsoft.NETCore.Jit.props | 6 - ...ime.Windows_NT.Microsoft.NETCore.Jit.props | 12 -- .../Directory.Build.props | 10 - .../Microsoft.NETCore.Runtime.CoreCLR.builds | 9 - .../Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 18 -- ...SD.Microsoft.NETCore.Runtime.CoreCLR.props | 16 -- ...ux.Microsoft.NETCore.Runtime.CoreCLR.props | 23 --- ...SX.Microsoft.NETCore.Runtime.CoreCLR.props | 14 -- ...NT.Microsoft.NETCore.Runtime.CoreCLR.props | 48 ----- ...soft.TargetingPack.Private.CoreCLR.pkgproj | 15 -- src/coreclr/src/.nuget/descriptions.json | 15 -- src/coreclr/src/.nuget/packages.builds | 14 +- src/coreclr/src/.nuget/packaging.props | 4 - src/libraries/pkg/Directory.Build.targets | 11 +- .../Configurations.props | 7 - ...Microsoft.Private.CoreFx.NETCoreApp.builds | 10 - ...icrosoft.Private.CoreFx.NETCoreApp.pkgproj | 78 -------- .../netcoreapp.rids.props | 38 ---- .../tests/Directory.Build.props | 13 -- ...ft.Windows.Compatibility.Validation.csproj | 19 -- .../tests/publishcompatibilityassets.ps1 | 80 -------- src/libraries/pkg/descriptions.json | 17 +- src/libraries/pkg/frameworkPackage.targets | 187 ------------------ 32 files changed, 10 insertions(+), 732 deletions(-) delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Directory.Build.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.FreeBSD.Microsoft.NETCore.Runtime.CoreCLR.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props delete mode 100644 src/coreclr/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props delete mode 100644 src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props delete mode 100644 src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj delete mode 100644 src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 delete mode 100644 src/libraries/pkg/frameworkPackage.targets diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 237dbf86e0c..0206f724b29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,5 @@ - - https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b - https://github.com/dotnet/runtime 665983a01f9c604bc3f704f469acb8a08c619d8a diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 9e3eb699c41..2bef6d6c695 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -176,7 +176,7 @@ jobs: SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat' # Build packages - - script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossPackagesArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig) + - script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig) displayName: Build packages # Save packages using the prepare-signed-artifacts format. diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index ffa0cf37724..e463ddc7752 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -109,13 +109,9 @@ jobs: - ${{ if ne(parameters.crossrootfsDir, '') }}: - name: crossArg value: 'cross' - - name: crossPackagesArg - value: '-__DoCrossArchBuild=1' - ${{ if eq(parameters.crossrootfsDir, '') }}: - name: crossArg value: '' - - name: crossPackagesArg - value: '' - ${{ each variable in parameters.variables }}: - ${{insert}}: ${{ variable }} diff --git a/src/coreclr/build-packages.sh b/src/coreclr/build-packages.sh index 9617440e44b..e717e3e5d48 100755 --- a/src/coreclr/build-packages.sh +++ b/src/coreclr/build-packages.sh @@ -97,9 +97,8 @@ while :; do __Id=$(echo $1| cut -d'=' -f 2) buildArgs="$buildArgs /p:OfficialBuildId=$__Id" ;; - -__DoCrossArchBuild=*) - __CrossBuild=$(echo $1| cut -d'=' -f 2) - buildArgs="$buildArgs /p:__DoCrossArchBuild=$__CrossBuild" + cross) + __CrossBuild=1 ;; -portablebuild=false) buildArgs="$buildArgs /p:PortableBuild=false" diff --git a/src/coreclr/src/.nuget/Directory.Build.targets b/src/coreclr/src/.nuget/Directory.Build.targets index a20c6f20e2b..f9886d59b0b 100644 --- a/src/coreclr/src/.nuget/Directory.Build.targets +++ b/src/coreclr/src/.nuget/Directory.Build.targets @@ -14,43 +14,16 @@ - - - - - + runtimes/$(PackageTargetRuntime)/native - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - tools - - - runtimes/$(CrossTargetComponentFolder)_$(Platform)/native - - - tools/$(CrossTargetComponentFolder)_$(Platform) - - - - - - - runtimes/$(PackageTargetRuntime)/il - - - - - true - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds deleted file mode 100644 index 85918b379ea..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 7d32891bb5c..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - true - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props deleted file mode 100644 index b92d11ae597..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props deleted file mode 100644 index b00b1d024af..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props deleted file mode 100644 index 99cee0e68b0..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props deleted file mode 100644 index f31b152a79b..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - runtimes/$(PackageTargetRuntime)-aot/native - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Directory.Build.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Directory.Build.props deleted file mode 100644 index e4d014b960a..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - ref/netstandard1.0 - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds deleted file mode 100644 index 85918b379ea..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index ecfce2186ff..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - true - - - - - %(ProjectReference.AdditionalProperties);IsLineupPackage=false - - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.FreeBSD.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.FreeBSD.Microsoft.NETCore.Runtime.CoreCLR.props deleted file mode 100644 index 7751b8dfce2..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.FreeBSD.Microsoft.NETCore.Runtime.CoreCLR.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - runtimes\$(PackageTargetRuntime)\native - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props deleted file mode 100644 index f5ea97eb0eb..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true - <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true - - - - - - - - - runtimes\$(PackageTargetRuntime)\native - - - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props deleted file mode 100644 index fe041463223..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - runtimes\$(PackageTargetRuntime)\native - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props deleted file mode 100644 index 3e006903d4d..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - $(MinOSForArch)-$(PackagePlatform) - $(Platform) - amd64 - $(CrossTargetComponentFolder) - amd64 - _$(LongNamePlatform)_$(LongNamePlatform)_$(FileVersion) - _$(CrossTargetPlatform)_$(LongNamePlatform)_$(FileVersion) - - - - - - - - - - - - runtimes\$(PackageTargetRuntime)\native - - - - - - - - - - - runtimes/$(PackageTargetRuntime)-aot/lib/netstandard1.0 - - - runtimes/$(PackageTargetRuntime)-aot/native - - - - - runtimes\$(PackageTargetRuntime)\native\%(FileName)$(LongNameSuffix)%(Extension) - - - tools\$(CrossTargetComponentFolder)_$(Platform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension) - - - diff --git a/src/coreclr/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj b/src/coreclr/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj deleted file mode 100644 index 4d2ed803534..00000000000 --- a/src/coreclr/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - true - true - $(PackagesOutputPath) - - - - lib/netstandard1.0 - - - - diff --git a/src/coreclr/src/.nuget/descriptions.json b/src/coreclr/src/.nuget/descriptions.json index e019928e404..7b497e7a565 100644 --- a/src/coreclr/src/.nuget/descriptions.json +++ b/src/coreclr/src/.nuget/descriptions.json @@ -9,16 +9,6 @@ "Description": "When using NuGet 3.x this package requires at least version {0}.", "CommonTypes": [ ] }, - { - "Name": "Microsoft.NETCore.Runtime.CoreCLR", - "Description": "The .NET Core runtime, called CoreCLR, and the base library, called System.Private.CoreLib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.TargetingPack.Private.CoreCLR", - "Description": "Contains a private targeting pack which contains only the CoreCLR System.Private.CoreLib reference assembly. Used for producing platform specific libraries such as facades.", - "CommonTypes": [ ] - }, { "Name": "Microsoft.NETCore.ILAsm", "Description": "The .NET IL Assembler.", @@ -29,11 +19,6 @@ "Description": "The .NET IL Disassembler.", "CommonTypes": [ ] }, - { - "Name": "Microsoft.NETCore.Jit", - "Description": "The .NET JIT compiler.", - "CommonTypes": [ ] - }, { "Name": "Microsoft.NETCore.TestHost", "Description": "CoreCLR application host for test applications", diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds index d76b76c9625..7fcc996c041 100644 --- a/src/coreclr/src/.nuget/packages.builds +++ b/src/coreclr/src/.nuget/packages.builds @@ -1,22 +1,10 @@ - - - - - - - - - - - - - + diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 2fb1f606e83..d9bc61f45a5 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -17,10 +17,6 @@ win8 win10 - - true - true - $(MSBuildThisFileDirectory)/packageIndex.json diff --git a/src/libraries/pkg/Directory.Build.targets b/src/libraries/pkg/Directory.Build.targets index ae837fe5c54..6131f69c976 100644 --- a/src/libraries/pkg/Directory.Build.targets +++ b/src/libraries/pkg/Directory.Build.targets @@ -1,10 +1,7 @@ - - - - - - + diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props deleted file mode 100644 index b79c1d7c3d9..00000000000 --- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - $(NetCoreAppCurrent); - - - diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds deleted file mode 100644 index e8acfa38cd3..00000000000 --- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj deleted file mode 100644 index bf861d02cbb..00000000000 --- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - netcoreapp - $(NETCoreAppCurrentVersion) - $(TargetFrameworkName)$(TargetFrameworkVersion) - $(NETCoreAppPackageRefPath) - $(NETCoreAppPackageRuntimePath) - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @(AllowedRuntimeOnlyFiles); - - - - - - System.ComponentModel.Composition; - - - - - - - - <_RuntimeOnlyMissingFile Include="@(AllowedRuntimeOnlyFiles)" Exclude="@(ClosureFile->'%(FileName)')" /> - - - - - - diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props deleted file mode 100644 index 7ce2ea9e2c7..00000000000 --- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props +++ /dev/null @@ -1,38 +0,0 @@ - - - - - arm - - - arm64 - - - arm64 - - - - - - - arm - - - arm64 - - - - x86 - - - - - armel - - - armel - - - diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props deleted file mode 100644 index 29939afd03a..00000000000 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - false - bin - .NETCoreApp,Version=v$(NugetMonikerVersion) - true - - 99.9 - Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages) - true - $(NetCoreAppCurrent) - - \ No newline at end of file diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj deleted file mode 100644 index abe0c7d3e10..00000000000 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 b/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 deleted file mode 100644 index 5752a6928aa..00000000000 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1 +++ /dev/null @@ -1,80 +0,0 @@ -param ( -$frameworkVersion = "3.0", -$runtimeVersion = "3.0.0-*", -$refDirName = "netcoreapp30_compat", -$rid = "win7-x64" -) - -function _getPackageVersion($packageName) -{ - $searchPattern = -join($localPackageSourcePath, $packageName, ".[0-9].[0-9].[0-9]*.nupkg") - if (!(Test-Path $searchPattern)) - { - Write-Error -Message (-join("Didn't find package: ", $packageName, " in source: ", $localPackageSourcePath, " please run build -allConfigurations")) - Exit; - } - - if (!([string]((get-item $searchPattern).FullName) -match '([0-9].[0-9].[0-9][-a-z]*.[0-9]*.[0-9]*)')) - { - Write-Error -Message "Package name is invalid" - Exit; - } - - if (!$matches) - { - Write-Error -Message (-join("Couldn't get package version for: ", $packageName)) - Exit; - } - return $matches[1] -} - -$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 - -$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName) -$dotnetPath = -join($repoRoot, "\.dotnet\dotnet.exe") -$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name)) -$packagesCachePath = -join($repoRoot, "\packages") -$localPackageSourcePath = -join($repoRoot, "\artifacts\packages\Debug\") -$targetFramework = -join("netcoreapp5.0", $frameworkVersion) - -if (!(Test-Path $localPackageSourcePath)) -{ - $localPackageSourcePath = -join($repoRoot, "\artifacts\packages\Release\") - if (!(Test-Path $localPackageSourcePath)) - { - Write-Error -Message (-join('Local package source must exist ', $localPackageSourcePath)) - Exit; - } -} - -$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;", $localPackageSourcePath) - -$compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility" -$privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp" - -Write-Output "Calling dotnet restore" -& $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RuntimeIdentifiers=$rid $csprojPath - -$outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\") - -Write-Output "Calling dotnet publish" -& $dotnetPath publish -r $rid -o $outputPath /p:NugetMonikerVersion=$frameworkVersion /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:RuntimeFrameworkVersion=$runtimeFramework /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RuntimeIdentifiers=$rid $csprojPath - -if (!(Test-Path $outputPath)) -{ - Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework)) - Exit; -} - -Write-Output (-join("Published succedded for: ", $targetFramework)) - -$refPath = -join($repoRoot, "\artifacts\bin\ref\", $refDirName) - -if (Test-Path $refPath) -{ - Remove-Item $refPath -r -force -} - -New-Item $refPath -ItemType directory -Remove-Item (-join($outputPath, "Microsoft.Windows.Compatibility.Validation.dll")) -force -Copy-Item (-join($outputPath,"\refs\", "*.dll")) $refPath diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json index b612f41f0a5..d9bec69f7ae 100644 --- a/src/libraries/pkg/descriptions.json +++ b/src/libraries/pkg/descriptions.json @@ -79,11 +79,6 @@ "Description": "The .NET Core runtime.", "CommonTypes": [] }, - { - "Name": "Microsoft.NETCore.Runtime.CoreCLR", - "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", - "CommonTypes": [] - }, { "Name": "Microsoft.NETCore.Targets", "Description": "Provides supporting infrastructure for portable projects: support identifiers that define framework and runtime for support targets and packages that reference the minimum supported package versions when targeting these.", @@ -129,11 +124,6 @@ "Description": "Package used by CoreFx build infrastructure to represent the latest package versions in a release.", "CommonTypes": [] }, - { - "Name": "Microsoft.Private.CoreFx.NETCoreApp", - "Description": "Package used to represent the portions of NETCoreApp that come from CoreFx.", - "CommonTypes": [] - }, { "Name": "Microsoft.Private.CoreFx.OOB", "Description": "Package used to represent out-of-band packages that are not included in NetCoreApp.", @@ -144,11 +134,6 @@ "Description": "Contains the .NET Framework v4.6 targeting pack.", "CommonTypes": [] }, - { - "Name": "Microsoft.TargetingPack.Private.CoreCLR", - "Description": "Contains a private targeting pack which contains only the CoreCLR mscorlib reference assembly. Used for producing platform specific libraries such as facades.", - "CommonTypes": [] - }, { "Name": "Microsoft.VisualBasic.Core", "Description": "Provides types that support the Visual Basic runtime", @@ -1394,7 +1379,7 @@ "System.Resources.SatelliteContractVersionAttribute", "System.Resources.MissingManifestResourceException" ] - }, + }, { "Name": "System.Resources.Extensions", "Description": "Provides classes which read and write resources in a format that supports non-primitive objects.", diff --git a/src/libraries/pkg/frameworkPackage.targets b/src/libraries/pkg/frameworkPackage.targets deleted file mode 100644 index 1459d7f4a9b..00000000000 --- a/src/libraries/pkg/frameworkPackage.targets +++ /dev/null @@ -1,187 +0,0 @@ - - - - true - true - - 2.0 - $(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard$(NETStandardVersion)\ref - - true - true - true - - ref/$(TargetFramework) - lib/$(TargetFramework) - runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework) - - runtimes/$(PackageTargetRuntime)/native - $(NativeBinDir)-aot - - - - - - <_buildRIDWithMetadata Include="@(BuildRID)"> - %(Identity) - $(PackageVersion) - - - - - - - - - - - - - - - - - - - - - - - - - <_repoRootLength>$(RepoRoot.Length) - - - - - - $(RefFileTargetPath)%(RefFile.SubFolder) - - - - - $(LibFileTargetPath)%(LibFile.SubFolder) - - - - $(NativeFileTargetPath) - - - - - - - src - src/$([System.String]::Copy('%(FullPath)').Substring($(_repoRootLength)).Replace('\', '/')) - - - - - - - - - reference - - - - runtime - - - - - - - <_closureFileNames Include="@(ClosureFile->'%(FileName)')"> - %(Identity) - - <_closureFileNamesFiltered Include="@(_closureFileNames)" Exclude="@(ExcludeFromClosure)"/> - <_closureFileFiltered Include="@(_closureFileNamesFiltered->'%(Original)')"/> - - - - - - - - - - <_fileSet>%(ClosureFile.FileSet) - - - <_dupTypeFileName Include="@(ClosureFile->'%(FileName)')"> - %(Identity) - - <_dupTypeFileName Include="@(FrameworkClosureFile->'%(FileName)')" Exclude="@(_dupTypeFileName)" Condition="'$(_fileSet)' == '%(FrameworkClosureFile.FileSet)'"> - %(Identity) - - <_dupTypeFileNamesFiltered Include="@(_dupTypeFileName)" Exclude="@(ExcludeFromDuplicateTypes)"/> - <_dupTypeFileFiltered Include="@(_dupTypeFileNamesFiltered->'%(Original)')"/> - - - - - - - - - - - <_fileSet>%(ClosureFile.FileSet) - - - - <_NETStandardFile Include="$(NETStandardPackageRefPath)\*.dll" /> - - - - - <_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(ClosureFile->'%(FileName)')" /> - <_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" /> - <_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" /> - - - - - - - - - - - - true - true - - - - - - - - - - @(BuildRID) - - - - -- GitLab