Update yamls with latest release info. Clean out EOL versions. (#2371)

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml
index ed19aad..bfd43ef 100644 (file)
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml
+++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: dotnet-runtime-21
 base: core18
-version: 2.1.13
+version: 2.1.15
 summary: Cross-Platform .NET Core Runtime. 
 description: |
   .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
@@ -27,8 +27,8 @@ slots:
 parts:
   dotnet-runtime:
     plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/7085b86a-0888-49b5-a272-6cd317abc4d3/1d5d8107d575e7fc8b14e9ace9f7667b/dotnet-runtime-2.1.13-linux-x64.tar.gz
-    source-checksum: sha512/10c037287a06d901ec5d5cfb2064c341e9b33a46f72ac8606c926499a5ac500e74a7bd1445224df3ac4ac4cd0aea76cc73cc0b8990d4a5ad6272e6261572359f
+    source: https://download.visualstudio.microsoft.com/download/pr/d2fb0b54-01ce-452c-b2a2-86dbef286265/055ad7740827cbe862d14ceb7ea54fac/dotnet-runtime-2.1.15-linux-x64.tar.gz
+    source-checksum: sha512/cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6
     stage-packages:
       - libicu60
       - libssl1.0.0

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml
deleted file mode 100644 (file)
index 1102cc0..0000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.2/snap/snapcraft.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: dotnet-runtime-22
-base: core18
-version: 2.2.7
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
-  .NET Core is a general purpose development platform maintained by Microsoft. 
-
-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://download.visualstudio.microsoft.com/download/pr/dc8dd18d-e165-4f58-a821-d657eea08bf1/efd846172658c27dde2d9eafa7d0082e/dotnet-runtime-2.2.7-linux-x64.tar.gz
-    source-checksum: sha512/5c76eee6dcf89569b40f5d7e87b2daa1ac9e924c6c22f37a7a2498bd96266b93aa95b70537218f9bac6e3992b24d991816afeb185ac6b29ecd3ea9b85201139c
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - liblttng-ust0
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - lldb
-      - libunwind8
-      - libtinfo5
-      - libdb5.3
-      - libc6
\ No newline at end of file

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml
index 8904a70..9276af3 100644 (file)
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml
+++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: dotnet-runtime-30
 base: core18
-version: 3.0.0
+version: 3.0.2
 summary: Cross-Platform .NET Core Runtime. 
 description: |
   .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
@@ -27,8 +27,8 @@ slots:
 parts:
   dotnet-runtime:
     plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/a5ff9cbb-d558-49d1-9fd2-410cb1c8b095/a940644f4133b81446cb3733a620983a/dotnet-runtime-3.0.0-linux-x64.tar.gz
-    source-checksum: sha512/0cabf85877eb3ee0415e6f8de9390c95ec90fa8f5a0fdb104f1163924fd52d89932a51c2e07b5c13a6b9802d5b6962676042a586ec8aff4f2a641d33c6c84dec
+    source: https://download.visualstudio.microsoft.com/download/pr/7647815e-9c28-40a5-96ea-c6ac4ebe2020/c026b1e93a5d6750a7666d3fe36a87f5/dotnet-runtime-3.0.2-linux-x64.tar.gz
+    source-checksum: sha512/c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45
     stage-packages:
       - libicu60
       - libssl1.0.0

diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml
index 95c8ba2..a81092e 100644 (file)
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml
+++ b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: dotnet-runtime-31
 base: core18
-version: 3.1.0
+version: 3.1.1
 summary: Cross-Platform .NET Core Runtime. 
 description: |
   .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
@@ -27,8 +27,8 @@ slots:
 parts:
   dotnet-runtime:
     plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/30915c37-fa5a-4930-b4e6-b4130e4596b2/38d531c10dc56950f17f3c604e9a2ebc/aspnetcore-runtime-3.1.0-linux-x64.tar.gz
-    source-checksum: sha512/7d14e4617413fd7939f90a4e283b7abedbd51ecfbc150938d4c52ecca8182cab8c4946408c1f6369944c68757c91b580796d9e0c62349c377c5e90b739a87d8b
+    source: https://download.visualstudio.microsoft.com/download/pr/e060c2eb-1476-4d70-857c-24f5eead2070/ff0e007b7373c04f754b3818ffdb2134/dotnet-runtime-3.1.1-linux-x64.tar.gz
+    source-checksum: sha512/991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611
     stage-packages:
       - libicu60
       - libssl1.0.0

diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml
new file mode 100644 (file)
index 0000000..fc78988
--- /dev/null
+++ b/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml
@@ -0,0 +1,36 @@
+name: dotnet-sdk
+version: 3.1.101
+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/c4b503d6-2f41-4908-b634-270a0a1dcfca/c5a20e42868a48a2cd1ae27cf038044c/dotnet-sdk-3.1.101-linux-x64.tar.gz
+      source-checksum: sha512/eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1
+      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/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml
deleted file mode 100644 (file)
index 8f9c7cc..0000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk-3/snap/snapcraft.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: dotnet-sdk
-version: $(DOTNET_SDK_VERSION)
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: devel
-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
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - lldb
-      - libunwind8
-      - libtinfo5
-      - liblttng-ust0
-      - liburcu6
-  runtime-wrapper:
-      plugin: dump
-      source: .

diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime
similarity index 100%
rename from src/installer/pkg/packaging/snaps/dotnet-sdk-3/dotnet-runtime
rename to src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime

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 b730756..8f9c7cc 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,10 +1,10 @@
 name: dotnet-sdk
-version: 3.1.100
+version: $(DOTNET_SDK_VERSION)
 summary: Cross-Platform .NET Core SDK
 description: |
   .NET Core SDK. https://dot.net/core.
 
-grade: stable
+grade: devel
 confinement: classic
 
 apps:
@@ -15,22 +15,22 @@ base: core18
 
 parts:
   dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/d731f991-8e68-4c7c-8ea0-fad5605b077a/49497b5420eecbd905158d86d738af64/dotnet-sdk-3.1.100-linux-x64.tar.gz
-      source-checksum: sha512/5217ae1441089a71103694be8dd5bb3437680f00e263ad28317665d819a92338a27466e7d7a2b1f6b74367dd314128db345fa8fff6e90d0c966dea7a9a43bd21
-      stage-packages:
-        - libicu60
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu6
-
+    plugin: dump
+    source: $(SOURCE_TARGZ)
+    source-checksum: sha512/$(SOURCE_TARGZ_SHA)
+    stage-packages:
+      - libicu60
+      - libssl1.0.0
+      - libcurl3
+      - libgssapi-krb5-2
+      - libstdc++6
+      - zlib1g
+      - libgcc1
+      - lldb
+      - libunwind8
+      - libtinfo5
+      - liblttng-ust0
+      - liburcu6
   runtime-wrapper:
       plugin: dump
       source: .
-