Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Merge in 'release/2.1' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Apr 9, 2021
2 parents 37d16c2 + 10ef253 commit 7a6e0bb
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 185 deletions.
2 changes: 1 addition & 1 deletion BranchInfo.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<MajorVersion>2</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>27</PatchVersion>
<PatchVersion>28</PatchVersion>

<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>

Expand Down
10 changes: 5 additions & 5 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>4ca43846b60de4d4fea9fe7cfd77d7d5011f6719</CoreFxCurrentRef>
<CoreClrCurrentRef>4ca43846b60de4d4fea9fe7cfd77d7d5011f6719</CoreClrCurrentRef>
<CoreFxCurrentRef>1e5a9889bf425a617479c7689f7eccb428a341b0</CoreFxCurrentRef>
<CoreClrCurrentRef>1e5a9889bf425a617479c7689f7eccb428a341b0</CoreClrCurrentRef>
<StandardCurrentRef>eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1</StandardCurrentRef>
<BuildToolsCurrentRef>ab4f1f8a399f9dceef8a93d2b6ecc0e06cc08abf</BuildToolsCurrentRef>
</PropertyGroup>

<PropertyGroup>
<MicrosoftNETCorePlatformsPackageVersion>2.1.12</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>2.1.13</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>2.0.0</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-servicing-29719-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.25-servicing-29719-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-servicing-29812-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.26-servicing-29812-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<NETStandardLibraryPackageVersion>2.0.3</NETStandardLibraryPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
</PropertyGroup>
Expand Down
45 changes: 45 additions & 0 deletions src/pkg/packaging/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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
41 changes: 0 additions & 41 deletions src/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions src/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions src/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml

This file was deleted.

48 changes: 0 additions & 48 deletions src/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml

This file was deleted.

0 comments on commit 7a6e0bb

Please sign in to comment.