Update Snap definitions with latest

Commit migrated from https://github.com/dotnet/core-setup/commit/57478cb0932c48d66916edaa060f73791f190006

diff --git a/src/installer/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml
deleted file mode 100644 (file)
index 9195013..0000000
--- a/src/installer/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: dotnet-hosting-20
-version: 2.0.5
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core 2.0.5 Runtime and ASP.NET Core. https://dot.net/core.
-
-grade: devel
-confinement: devmode
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  dotnet-hosting:
-    content: dotnet-hosting-20
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-      plugin: dump
-      source: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/2.0.5-155/dotnet-hosting-2.0.5-linux-x64.tar.gz
-      source-checksum: sha512/6df0b17349346818656d906c442469383b4b2e2e77515cfb8e86ccf7a0f42c5192f056da2541dba80410a8a68fb033b09adaddccf58b5f884d0a058a77f36bd7
-      stage-packages:
-        - libicu55
-        - libssl1.0.0
-        - libc6
-        - libcurl3
-        - libgssapi-krb5-2
-        - liblttng-ust0
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - lldb
-        - libunwind8

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml
deleted file mode 100644 (file)
index cff9773..0000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: dotnet-runtime-20
-version: 2.0.5
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core 2.0.5 Runtime. https://dot.net/core.
-
-grade: devel
-confinement: devmode
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  # This is how we make a part of this snap readable by other
-  # snaps. Consumers will need to access the runtime as well
-  # as various libs contained in this snap, so share the entire
-  # $SNAP
-  dotnet-runtime:
-    content: dotnet-runtime-20
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-      plugin: dump
-      source: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.5/dotnet-runtime-2.0.5-linux-x64.tar.gz
-      source-checksum: sha512/21d54e559c5130bb3f8c38eadacb7833ec90943f71c4e9c8fa2d53192313505311230b96f1afeb52d74d181d49ce736b83521754e55f15d96a8756921783cd33
-      stage-packages:
-        - libicu55
-        - libssl1.0.0
-        - libc6
-        - libcurl3
-        - libgssapi-krb5-2
-        - liblttng-ust0
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - lldb
-        - libunwind8

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml
new file mode 100644 (file)
index 0000000..17e2705
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-21/snap/snapcraft.yaml
@@ -0,0 +1,45 @@
+name: dotnet-runtime-21
+version: 2.1.9
+summary: Cross-Platform .NET Core Runtime. 
+description: |
+  .NET Core 2.1 Runtime and ASP.NET Core. https://dot.net/core.
+
+grade: stable
+confinement: strict
+
+apps:
+  dotnet:
+    command: dotnet
+    plugs:
+      - network
+      - network-bind
+      - removable-media
+      - home
+
+slots:
+  dotnet-runtime:
+    content: dotnet-runtime-21
+    interface: content
+    read: [/]
+
+parts:
+  dotnet-runtime:
+      plugin: dump
+      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
+        - libssl1.0.0
+        - libcurl3
+        - libgssapi-krb5-2
+        - liblttng-ust0
+        - libstdc++6
+        - zlib1g
+        - libgcc1
+        - lldb
+        - libunwind8
+        - libtinfo5
+        - libdb5.3
+      #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-22/snap/snapcraft.yaml
new file mode 100644 (file)
index 0000000..b81e85e
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-22/snap/snapcraft.yaml
@@ -0,0 +1,46 @@
+name: dotnet-runtime-22
+version: 2.2.3
+summary: Cross-Platform .NET Core Runtime. 
+description: |
+  .NET Core 2.2 Runtime and ASP.NET Core. https://dot.net/core.
+
+grade: stable
+confinement: strict
+
+apps:
+  dotnet:
+    command: dotnet
+    plugs:
+      - network
+      - network-bind
+      - removable-media
+      - home
+
+slots:
+  dotnet-runtime:
+    content: dotnet-runtime-22
+    interface: content
+    read: [/]
+
+parts:
+  dotnet-runtime:
+      plugin: dump
+      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
+        - libssl1.0.0
+        - libcurl3
+        - libgssapi-krb5-2
+        - liblttng-ust0
+        - libstdc++6
+        - zlib1g
+        - libgcc1
+        - lldb
+        - libunwind8
+        - libtinfo5
+        - libdb5.3
+      #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/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/dotnet-runtime
new file mode 100644 (file)
index 0000000..d5f6b44
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/dotnet-runtime
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dotnet_runtime_snaps=$(ls $SNAP/../..|grep dotnet-runtime)
+
+for snap in $dotnet_runtime_snaps
+do
+  runtime_dir=$(realpath $SNAP/../../$snap/current/shared/Microsoft.NETCore.App)
+  if [ -d "$runtime_dir" ]; then
+    runtime_version=$(ls $runtime_dir)
+    runtime_path="$SNAP_DATA/Microsoft.NETCore.App/$runtime_version"
+    if [ ! -d "$runtime_path" ]; then
+      sudo ln -s "$runtime_dir/$runtime_version" "$runtime_path"
+    fi
+  fi
+done
+
+exec $SNAP/dotnet "$@"
\ 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
new file mode 100644 (file)
index 0000000..15c2fc8
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml
@@ -0,0 +1,34 @@
+name: dotnet-sdk
+version: 2.2.105
+summary: Cross-Platform .NET Core SDK
+description: |
+  .NET Core SDK. https://dot.net/core.
+
+grade: stable
+confinement: classic
+
+apps:
+  dotnet:
+    command: dotnet-runtime
+
+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
+      stage-packages:
+        - libicu60
+        - libssl1.0.0
+        - libcurl3
+        - libgssapi-krb5-2
+        - libstdc++6
+        - zlib1g
+        - libgcc1
+        - lldb
+        - libunwind8
+        - libtinfo5
+        - libc6
+  runtime-wrapper:
+      plugin: dump
+      source: .
+

diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime
new file mode 100644 (file)
index 0000000..d5f6b44
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dotnet_runtime_snaps=$(ls $SNAP/../..|grep dotnet-runtime)
+
+for snap in $dotnet_runtime_snaps
+do
+  runtime_dir=$(realpath $SNAP/../../$snap/current/shared/Microsoft.NETCore.App)
+  if [ -d "$runtime_dir" ]; then
+    runtime_version=$(ls $runtime_dir)
+    runtime_path="$SNAP_DATA/Microsoft.NETCore.App/$runtime_version"
+    if [ ! -d "$runtime_path" ]; then
+      sudo ln -s "$runtime_dir/$runtime_version" "$runtime_path"
+    fi
+  fi
+done
+
+exec $SNAP/dotnet "$@"
\ No newline at end of file

diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
index 7b963e1..15c2fc8 100644 (file)
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
+++ b/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
@@ -1,48 +1,34 @@
 name: dotnet-sdk
-version: 2.1.4
+version: 2.2.105
 summary: Cross-Platform .NET Core SDK
 description: |
   .NET Core SDK. https://dot.net/core.
 
-grade: devel
-confinement: devmode
+grade: stable
+confinement: classic
 
 apps:
   dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-plugs:
-  # Mount the content shared from dotnet-runtime into supported runtimes
-  # need feature to enable content interfaces between classic snaps in order for this to work.
-  dotnet-runtime-11:
-    content: dotnet-runtime-11
-    interface: content
-    target: /shared/Microsoft.NETCore.App/1.1.6
-    default-provider: dotnet-runtime:dotnet-runtime
-
+    command: dotnet-runtime
 
 parts:
   dotnet-sdk:
       plugin: dump
-      source: https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/dotnet-sdk-2.1.4-linux-x64.tar.gz
-      source-checksum: sha512/05fe90457a8b77ad5a5eb2f22348f53e962012a55077ac4ad144b279f6cad69740e57f165820bfd6104e88b30e93684bde3e858f781541d4f110f28cd52ce2b7
+      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
       stage-packages:
-        - libicu55
+        - libicu60
         - libssl1.0.0
-        - libc6
         - libcurl3
         - libgssapi-krb5-2
-        - liblttng-ust0
         - libstdc++6
         - zlib1g
         - libgcc1
         - lldb
         - libunwind8
-      install:
-        mkdir $SNAPCRAFT_PART_INSTALL/shared/Microsoft.NETCore.App/1.1.6
+        - libtinfo5
+        - libc6
+  runtime-wrapper:
+      plugin: dump
+      source: .