From 783a04dcac9870e833c516d4bd22ddc5ec495412 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 11 Mar 2021 02:20:38 -0800 Subject: [PATCH 1/4] Update CoreClr, CoreFx to servicing-29812-02, servicing-29812-01, respectively (#9131) --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index ee28a85239..5f5ace66a2 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 4ca43846b60de4d4fea9fe7cfd77d7d5011f6719 - 4ca43846b60de4d4fea9fe7cfd77d7d5011f6719 + 1e5a9889bf425a617479c7689f7eccb428a341b0 + 1e5a9889bf425a617479c7689f7eccb428a341b0 eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1 ab4f1f8a399f9dceef8a93d2b6ecc0e06cc08abf - 2.1.12 + 2.1.13 2.0.0 - 4.5.0-servicing-29719-01 - 2.1.25-servicing-29719-03 + 4.5.0-servicing-29812-01 + 2.1.26-servicing-29812-02 2.0.3 1.7.0 From ba08e37fd83532d2b9f73ef49f99a954373aa934 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 16 Mar 2021 18:11:29 +0100 Subject: [PATCH 2/4] Remove dotnet-sdk and dotnet-runtime-1.x snaps from release/2.1 (#9134) * Remove dotnet-sdk and dotnet-runtime-1.x snaps Also update the dotnet-runtime-2.1 snap based on the latest snap in dotnet/runtime main. Contributes towards https://github.com/dotnet/runtime/issues/49374 --- src/pkg/packaging/snap/snapcraft.yaml | 45 +++++++++++++++++ .../dotnet-hosting-20/snap/snapcraft.yaml | 41 ---------------- .../dotnet-runtime-11/snap/snapcraft.yaml | 45 ----------------- .../dotnet-runtime-20/snap/snapcraft.yaml | 45 ----------------- .../snaps/dotnet-sdk/snap/snapcraft.yaml | 48 ------------------- 5 files changed, 45 insertions(+), 179 deletions(-) create mode 100755 src/pkg/packaging/snap/snapcraft.yaml delete mode 100644 src/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml delete mode 100644 src/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml delete mode 100644 src/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml delete mode 100644 src/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml diff --git a/src/pkg/packaging/snap/snapcraft.yaml b/src/pkg/packaging/snap/snapcraft.yaml new file mode 100755 index 0000000000..afba782699 --- /dev/null +++ b/src/pkg/packaging/snap/snapcraft.yaml @@ -0,0 +1,45 @@ +name: dotnet-runtime-21 +base: core18 +version: 2.1.26 +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-21 + interface: content + read: [/] + +parts: + dotnet-runtime: + plugin: dump + source: https://download.visualstudio.microsoft.com/download/pr/5c00bafe-4ead-4e9a-82b6-884a9727e751/fdb7f6701e556d89b6884037cc9983cb/dotnet-runtime-2.1.26-linux-x64.tar.gz + source-checksum: sha512/41cc13f14dd7721a079bdd0ab489de40e9d4f32787239a26e7d10fcb0020a8e78d446c3b430b4bf80a557a925b3ca87d7981bfda4bbf9495cc44b1d42d877c40 + 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/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml b/src/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml deleted file mode 100644 index 9195013ab4..0000000000 --- a/src/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/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml b/src/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml deleted file mode 100644 index 58a036402e..0000000000 --- a/src/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: dotnet-runtime-11 -version: 1.1.6 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core 1.1.6 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-11: - content: dotnet-runtime-11 - interface: content - read: [/shared/Microsoft.NETCore.App/1.1.6] - -parts: - dotnet-runtime: - plugin: dump - source: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/1.1.6/dotnet-ubuntu.16.04-x64.1.1.6.tar.gz - source-checksum: sha512/bc8aa9990a99df631338af0d796ca0e51e452001e0593e22d3835621a45f7e3404f1214395e36cf64793d829702dddd4724c66ad841069dcac495ea4b57375db - stage-packages: - - libicu55 - - libssl1.0.0 - - libc6 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 diff --git a/src/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml b/src/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml deleted file mode 100644 index cff977317e..0000000000 --- a/src/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/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml deleted file mode 100644 index 7b963e1940..0000000000 --- a/src/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: dotnet-sdk -version: 2.1.4 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: devel -confinement: devmode - -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 - - -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 - stage-packages: - - libicu55 - - 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 - From 10ef253e2be9a2755b42efd59a9b5d5d31f077b6 Mon Sep 17 00:00:00 2001 From: Jan Jahoda Date: Fri, 9 Apr 2021 11:41:57 +0200 Subject: [PATCH 3/4] Update branding to 2.1.28 (#9137) --- BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BranchInfo.props b/BranchInfo.props index 0e36c9ab9d..4eff08a9d6 100644 --- a/BranchInfo.props +++ b/BranchInfo.props @@ -2,7 +2,7 @@ 2 1 - 27 + 28 false From 683c5901f6ddb2874bb6eb5bfbee59a2cab8f42b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 14 Apr 2021 09:59:15 -0700 Subject: [PATCH 4/4] Update CoreClr, CoreFx to servicing-29916-01, servicing-29916-03, respectively (#9142) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 5f5ace66a2..4b78604fc2 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,8 +9,8 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 1e5a9889bf425a617479c7689f7eccb428a341b0 - 1e5a9889bf425a617479c7689f7eccb428a341b0 + 588776ca20312d2747bc58dee36a64805f3148de + 588776ca20312d2747bc58dee36a64805f3148de eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1 ab4f1f8a399f9dceef8a93d2b6ecc0e06cc08abf @@ -18,8 +18,8 @@ 2.1.13 2.0.0 - 4.5.0-servicing-29812-01 - 2.1.26-servicing-29812-02 + 4.5.0-servicing-29916-03 + 2.1.27-servicing-29916-01 2.0.3 1.7.0