Skip to content

Commit b7763f3

Browse files
authored
Merge pull request #5599 from dotnet/master
Update Live with current Master
2 parents 77d9a94 + 10bbcd6 commit b7763f3

File tree

21 files changed

+54
-39
lines changed

21 files changed

+54
-39
lines changed

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,12 @@ _dependentPackages/
2626
!/xml/System.Net.Cache/
2727

2828
# Visual Studio Code
29-
.vscode
29+
.vscode
30+
31+
# Windows thumbnail cache files
32+
Thumbs.db
33+
ehthumbs.db
34+
ehthumbs_vista.db
35+
36+
# Windows shortcuts
37+
*.lnk

.openpublishing.redirection.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,67 +1236,67 @@
12361236
},
12371237
{
12381238
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/index.md",
1239-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/index"
1239+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/index"
12401240
},
12411241
{
12421242
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/reasons-to-lift-and-shift-existing-net-apps-to-cloud-devops-ready-applications.md",
1243-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/reasons-to-modernize-existing-net-apps-to-cloud-optimized-applications"
1243+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/reasons-to-modernize-existing-net-apps-to-cloud-optimized-applications"
12441244
},
12451245
{
12461246
"source_path": "docs/standard/modernize-with-azure-and-containerslift-and-shift-existing-apps-devops/microsoft-technologies-in-cloud-devops-ready-applications.md",
1247-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/microsoft-technologies-in-cloud-optimized-applications"
1247+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/microsoft-technologies-in-cloud-optimized-applications"
12481248
},
12491249
{
12501250
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/what-about-cloud-optimized-applications.md",
1251-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/what-about-cloud-native-applications"
1251+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/what-about-cloud-native-applications"
12521252
},
12531253
{
12541254
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/deploy-existing-net-apps-as-windows-containers.md",
1255-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/deploy-existing-net-apps-as-windows-containers"
1255+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/deploy-existing-net-apps-as-windows-containers"
12561256
},
12571257
{
12581258
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-not-to-deploy-to-windows-containers.md",
1259-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-not-to-deploy-to-windows-containers"
1259+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-not-to-deploy-to-windows-containers"
12601260
},
12611261
{
12621262
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure.md",
1263-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure"
1263+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure"
12641264
},
12651265
{
12661266
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud.md",
1267-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud"
1267+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud"
12681268
},
12691269
{
12701270
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/how-to-deploy-existing-net-apps-to-azure-app-service.md",
1271-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-instances-ACI"
1271+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-instances-ACI"
12721272
},
12731273
{
12741274
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-service-fabric.md",
1275-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-service-fabric"
1275+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-service-fabric"
12761276
},
12771277
{
12781278
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-azure-container-service-kubernetes.md",
1279-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers//modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-service-kubernetes"
1279+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers//modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-service-kubernetes"
12801280
},
12811281
{
12821282
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud.md",
1283-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud"
1283+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud"
12841284
},
12851285
{
12861286
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/modernize-your-apps-with-monitoring-and-telemetry.md",
1287-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-with-monitoring-and-telemetry"
1287+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-with-monitoring-and-telemetry"
12881288
},
12891289
{
12901290
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud.md",
1291-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud"
1291+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud"
12921292
},
12931293
{
12941294
"source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/migrate-to-hybrid-cloud-scenarios.md",
1295-
"redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/migrate-to-hybrid-cloud-scenarios"
1295+
"redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/migrate-to-hybrid-cloud-scenarios"
12961296
},
12971297
{
12981298
"source_path":"docs/csharp/language-reference/operators/null-conditional-operator.md",
1299-
"redirect_url":"/docs/csharp/language-reference/operators/null-coalescing-operator"
1299+
"redirect_url":"/dotnet/csharp/language-reference/operators/null-coalescing-operator"
13001300
}
13011301
]
13021302
}

docs/core/linux-prerequisites.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,37 @@ The following are intended to be examples. The exact versions and names may vary
6060

6161
Ubuntu distributions require the following libraries installed:
6262

63-
* libunwind8
6463
* liblttng-ust0
6564
* libcurl3
6665
* libssl1.0.0
67-
* libuuid1
6866
* libkrb5-3
6967
* zlib1g
7068
* libicu52 (for 14.x)
7169
* libicu55 (for 16.x)
7270
* libicu57 (for 17.x)
71+
* libicu60 (for 18.x)
72+
73+
For versions earlier than .NET Core 2.1, following dependencies are also required:
74+
75+
* libunwind8
76+
* libuuid1
7377

7478
### CentOS
7579

7680
CentOS distributions require the following libraries installed:
7781

78-
* libunwind
7982
* lttng-ust
8083
* libcurl
8184
* openssl-libs
82-
* libuuid
8385
* krb5-libs
8486
* libicu
8587
* zlib
8688

89+
For versions earlier than .NET Core 2.1, following dependencies are also required:
90+
91+
* libunwind
92+
* libuuid
93+
8794
For more information about the dependencies, see [Self-contained Linux applications](https://github.com/dotnet/core/blob/master/Documentation/self-contained-linux-apps.md).
8895

8996
## Installing .NET Core dependencies with the native installers
@@ -428,4 +435,4 @@ To install .NET Core 2.x for supported SUSE Linux Enterprise Server and OpenSUSE
428435
> * [.NET Core 2.1 known issues](https://github.com/dotnet/core/tree/master/release-notes/2.1)
429436
> * [.NET Core 2.0 known issues](https://github.com/dotnet/core/tree/master/release-notes/2.0)
430437
> * [.NET Core 1.1 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.1)
431-
> * [.NET Core 1.0 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.0)
438+
> * [.NET Core 1.0 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.0)
187 Bytes
Loading
-82 Bytes
Loading
-206 Bytes
Loading
-9.39 KB
Loading
-4.08 KB
Loading
806 Bytes
Loading
-17.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)