From 964bdcc7fc94e581c11df4fd81789c31857d27a7 Mon Sep 17 00:00:00 2001 From: Lee Coward Date: Wed, 20 Mar 2019 10:49:03 -0700 Subject: [PATCH] snap yaml updates to enable build on 18.04 Commit migrated from https://github.com/dotnet/core-setup/commit/8e8df8c0eec8ba4d67dcce9c9dc5d3501895cd5f --- .../snap/snapcraft.yaml | 0 .../snap/snapcraft.yaml | 5 ++--- .../snap/snapcraft.yaml | 4 ++-- .../pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml | 13 ++++++------- 4 files changed, 10 insertions(+), 12 deletions(-) rename src/installer/pkg/packaging/snaps/{dotnet-runtime-11 => dotnet-runtime-1.1}/snap/snapcraft.yaml (100%) rename src/installer/pkg/packaging/snaps/{dotnet-runtime-21 => dotnet-runtime-2.1}/snap/snapcraft.yaml (92%) rename src/installer/pkg/packaging/snaps/{dotnet-runtime-22 => dotnet-runtime-2.2}/snap/snapcraft.yaml (95%) diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-1.1/snap/snapcraft.yaml similarity index 100% rename from src/installer/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml rename to src/installer/pkg/packaging/snaps/dotnet-runtime-1.1/snap/snapcraft.yaml diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml similarity index 92% rename from src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml rename to src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml index 17e2705..7335192 100644 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml +++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml @@ -28,18 +28,17 @@ parts: source: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.1.9/dotnet-runtime-2.1.9-linux-x64.tar.gz source-checksum: sha512/39c6d225196aee9f839f957d326bce682c7855565c7cbbd1f7898430da0134425da106d5c9f43e69cee973af4091a89577add0cf3e85bd313346faa64c82b164 stage-packages: - - libicu55 + - libicu60 - libssl1.0.0 - libcurl3 - libgssapi-krb5-2 - - liblttng-ust0 - libstdc++6 - zlib1g - libgcc1 - lldb - libunwind8 - libtinfo5 - - libdb5.3 + - libc6 #install: | # mv $SNAPCRAFT_PART_INSTALL/shared $SNAPCRAFT_PART_INSTALL/shared.real # ln -s /var/snap/$SNAPCRAFT_PROJECT_NAME/current $SNAPCRAFT_PART_INSTALL/shared \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-22/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml similarity index 95% rename from src/installer/pkg/packaging/snaps/dotnet-runtime-22/snap/snapcraft.yaml rename to src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml index b81e85e..68e681f 100644 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-22/snap/snapcraft.yaml +++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml @@ -28,8 +28,7 @@ parts: source: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.2.3/dotnet-runtime-2.2.3-linux-x64.tar.gz source-checksum: sha512/476df111a1a7786b742b69759da36185720707ad45de0550dea418484a401fbe338adb8d1ba2706abdbb7ed5c489e7d7a76579ca50c60168dbebe52e00f7071f stage-packages: - - libc6 - - libicu60 + - libicu60 - libssl1.0.0 - libcurl3 - libgssapi-krb5-2 @@ -41,6 +40,7 @@ parts: - libunwind8 - libtinfo5 - libdb5.3 + - libc6 #install: | # mv $SNAPCRAFT_PART_INSTALL/shared $SNAPCRAFT_PART_INSTALL/shared.real # ln -s /var/snap/$SNAPCRAFT_PROJECT_NAME/current $SNAPCRAFT_PART_INSTALL/shared \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml index 15c2fc8..33fbfed 100644 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml +++ b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml @@ -1,10 +1,10 @@ name: dotnet-sdk -version: 2.2.105 +version: 3.0.100-preview-010431 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. -grade: stable +grade: devel confinement: classic apps: @@ -14,10 +14,10 @@ apps: parts: dotnet-sdk: plugin: dump - source: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.2.105/dotnet-sdk-2.2.105-linux-x64.tar.gz - source-checksum: sha512/b7ad26b344995de91848adec56bda5dfe5fef0b83abaa3e4376dc790cf9786e945b625de1ae4cecaf5c5bef86284652886ed87696581553aeda89ee2e2e99517 + source: /home/leecow/Downloads/dotnet-sdk-3.0.100-preview3-010431-linux-x64.tar.gz + source-checksum: sha512/EAA1208590E60A793CAA8A35E9A26722A4E3BCD8733EA1F79D18C7A777E1A5A8E9D82EDDABBD18B82D8795838E6DFC3B5EC7C4504E58C0C852F2D69D40131CFE stage-packages: - - libicu60 + - libicu55 - libssl1.0.0 - libcurl3 - libgssapi-krb5-2 @@ -30,5 +30,4 @@ parts: - libc6 runtime-wrapper: plugin: dump - source: . - + source: . \ No newline at end of file -- 2.7.4