From 689558bdf2781a6099da6287f34583917b753e15 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 7 May 2024 11:19:25 -0700 Subject: [PATCH 1/2] Remove Microsoft.Dotnet.Sdk.Internal.csproj as this is no longer used. Remove snaps as they are now owned by Canonical via https://github.com/dotnet/announcements/issues/304. --- .../Microsoft.Dotnet.Sdk.Internal.csproj | 12 ------ .../arm/dotnet-sdk-3.1/snap/snapcraft.yaml | 40 ------------------ .../arm/dotnet-sdk-5.0/snap/snapcraft.yaml | 40 ------------------ .../arm64/dotnet-sdk-5.0/snap/snapcraft.yaml | 40 ------------------ src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml | 37 ---------------- src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml | 36 ---------------- src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml | 36 ---------------- src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml | 41 ------------------ src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml | 42 ------------------- src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml | 40 ------------------ src/snaps/dotnet-sdk/snap/snapcraft.yaml | 37 ---------------- 11 files changed, 401 deletions(-) delete mode 100644 src/Microsoft.Dotnet.Sdk.Internal/Microsoft.Dotnet.Sdk.Internal.csproj delete mode 100755 src/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml delete mode 100755 src/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100755 src/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100755 src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml delete mode 100755 src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml delete mode 100755 src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml delete mode 100755 src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml delete mode 100644 src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml delete mode 100644 src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml delete mode 100755 src/snaps/dotnet-sdk/snap/snapcraft.yaml diff --git a/src/Microsoft.Dotnet.Sdk.Internal/Microsoft.Dotnet.Sdk.Internal.csproj b/src/Microsoft.Dotnet.Sdk.Internal/Microsoft.Dotnet.Sdk.Internal.csproj deleted file mode 100644 index be453356a86c..000000000000 --- a/src/Microsoft.Dotnet.Sdk.Internal/Microsoft.Dotnet.Sdk.Internal.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - netstandard2.0 - true - false - - - diff --git a/src/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100755 index b9d9593496a8..000000000000 --- a/src/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 3.1.201 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/ccbcbf70-9911-40b1-a8cf-e018a13e720e/03c0621c6510f9c6f4cca6951f2cc1a4/dotnet-sdk-3.1.201-linux-arm.tar.gz - source-checksum: sha512/f37d0e55c9f593c6951bea5a6bb1ea3194486956efe08a2a0f266b419d912cdcbf4ac279358976f0bfa1fe560c333ca5d5437f8e8c718bb5963991e4395e0cd7 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100755 index c9e2ab7efb6c..000000000000 --- a/src/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100755 index 94a9af147619..000000000000 --- a/src/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [arm64] - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml deleted file mode 100755 index ee58bc736ab3..000000000000 --- a/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: dotnet-sdk -version: 2.1.815 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/7fba29f6-aac9-4b53-a5f9-9b421bec6288/70ac39be0282331d18b535f64ea5f40a/dotnet-sdk-2.1.815-linux-x64.tar.gz - source-checksum: sha512/e998ccb8b4e47a727141e85823637f2030df556d3056aadbdfbce4eca823fe4759ca0e0b2edaa6f83dd5b4cbb8a3b0046ff2c9eae96832e71dc6c13855998148 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - lldb - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100755 index 1e6c874c94b7..000000000000 --- a/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 3.1.408 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/2054b462-43da-4c61-9e2d-d02167c71c40/a8be03062d9d770c8025c7de47ca366d/dotnet-sdk-3.1.408-linux-x64.tar.gz - source-checksum: sha512/5e2c378addf337c1b7e44583718672e0791235150630f0b613353c8597342dcaae3b7c412b17d5e6d93d87b5708a6ca2dc16ff6e6c5a2101b224d24e6a5c4e7a - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100755 index 3ddf457ba148..000000000000 --- a/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 5.0.202 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/5f0f07ab-cd9a-4498-a9f7-67d90d582180/2a3db6698751e6cbb93ec244cb81cc5f/dotnet-sdk-5.0.202-linux-x64.tar.gz - source-checksum: sha512/01ed59f236184987405673d24940d55ce29d830e7dbbc19556fdc03893039e6046712de6f901dc9911047a0dee4fd15319b7e94f8a31df6b981fa35bd93d9838 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml deleted file mode 100755 index b3693eddce14..000000000000 --- a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: dotnet-sdk -version: 6.0.410 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -architectures: - - build-on: amd64 - run-on: amd64 - -grade: stable -confinement: classic -base: core20 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/ac5809b0-7930-4ae9-9005-58f2fd7912f3/4cf0cb18d22a162b33149b1f28a8e045/dotnet-sdk-6.0.410-linux-x64.tar.gz - source-checksum: sha512/8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3 - stage-packages: - - libicu66 - - libgcc1 - - libstdc++6 - - libssl1.1 - - libcurl4 - - libgssapi-krb5-2 - - zlib1g - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - -apps: - dotnet: - command: dotnet - diff --git a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml deleted file mode 100644 index 387796bd609a..000000000000 --- a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: dotnet-sdk -version: 7.0.304 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -architectures: - - build-on: amd64 - run-on: amd64 - -grade: stable -confinement: classic -base: core20 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/9c86d7b4-acb2-4be4-8a89-d13bc3c3f28f/1d044c7c29df018e8f2837bb343e8a84/dotnet-sdk-7.0.304-linux-x64.tar.gz - source-checksum: sha512/f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727 - stage-packages: - - libicu66 - - libgcc1 - - libstdc++6 - - libssl1.1 - - libcurl4 - - libgssapi-krb5-2 - - zlib1g - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - -apps: - dotnet: - command: dotnet - - diff --git a/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml deleted file mode 100644 index 97ad53f2c823..000000000000 --- a/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 8.0.100-preview.5.23303.2 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -architectures: - - build-on: amd64 - run-on: amd64 - -grade: stable -confinement: classic -base: core20 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/07b027f8-4ef8-48cb-becc-132652c625bb/441ef662adfe931013745df24d53b26d/dotnet-sdk-8.0.100-preview.5.23303.2-linux-x64.tar.gz - source-checksum: sha512/dfe2085a92854a5cee84cb7be9344368f5dcb6333c4ca215375a34b862f3a3ee66c953b9957f7b46f6cd710992ee038f6b4c2bd16464b4a216a1785868e86f7c - stage-packages: - - libicu66 - - libgcc1 - - libstdc++6 - - libssl1.1 - - libcurl4 - - libgssapi-krb5-2 - - zlib1g - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - -apps: - dotnet: - command: dotnet diff --git a/src/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/snaps/dotnet-sdk/snap/snapcraft.yaml deleted file mode 100755 index 758d3f4b000a..000000000000 --- a/src/snaps/dotnet-sdk/snap/snapcraft.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: dotnet-sdk -version: $(DOTNET_SDK_VERSION) -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: $(SOURCE_TARGZ) - source-checksum: sha512/$(SOURCE_TARGZ_SHA) - stage-packages: - - libicu60 - - libc6 - - libgcc1 - - libstdc++6 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - zlib1g - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - runtime-wrapper: - plugin: dump - source: . From a0b78dd68e7e21c2de377a1e1d4ce57ed1358f87 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 7 May 2024 11:21:37 -0700 Subject: [PATCH 2/2] Remove project being referenced in solution. --- Microsoft.DotNet.Cli.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 32a2283a9945..12f6e66eb23e 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}" @@ -43,10 +41,6 @@ Global {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.Build.0 = Release|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU