diff --git a/docfx.json b/docfx.json index 7383944dddf54..6360e11ec4d0a 100644 --- a/docfx.json +++ b/docfx.json @@ -153,17 +153,16 @@ "docs/framework/wcf/**/**.md": "None" }, "social_image_url": { - "docs/**/*.*": "/dotnet/media/dotnet-logo.svg", - "docs/azure/**/*.*": "/dotnet/media/dotnet-bot_cloud-apps.svg", - "docs/iot/**/*.*": "/dotnet/media/dotnet-iot.svg", - "docs/maui/**/*.*": "/dotnet/media/dotnet-bot_mobile-apps-xamarin.svg", - "docs/machine-learning/**/*.*": "/dotnet/media/dotnet-bot_machinelearning.svg", - "docs/architecture/**/*.*": "/dotnet/media/dotnet-bot_microservices.svg", - "docs/spark/**/*.*": "/dotnet/media/dotnet-bot_apache-spark.svg", - "docs/standard/**/*.*": "/dotnet/media/dot-net-cross-platform.svg", - "docs/csharp/**/*.*": "/media/logos/logo_csharp.svg", - "docs/fsharp/**/*.*": "/media/logos/logo_fsharp.svg", - "docs/visual-basic/**/*.*": "/media/logos/logo_vb.svg" + "docs/**/*.*": "/dotnet/media/dotnet-logo.png", + "docs/azure/**/*.*": "/dotnet/media/dotnet-bot_cloud-apps.png", + "docs/iot/**/*.*": "/dotnet/media/dotnet-iot.png", + "docs/maui/**/*.*": "/dotnet/media/dotnet-bot_mobile-apps-xamarin.png", + "docs/machine-learning/**/*.*": "/dotnet/media/dotnet-bot_machinelearning.png", + "docs/architecture/**/*.*": "/dotnet/media/dotnet-bot_microservices.png", + "docs/standard/**/*.*": "/dotnet/media/dot-net-cross-platform.png", + "docs/csharp/**/*.*": "/dotnet/media/logos/logo_csharp.png", + "docs/fsharp/**/*.*": "/dotnet/media/logos/logo_fsharp.png", + "docs/visual-basic/**/*.*": "/dotnet/media/logos/logo_vb.png" }, "feedback_product_url": { "docs/azure/sdk/**/*.*": "https://github.com/azure/azure-sdk-for-net", diff --git a/docs/azure/includes/dotnet-all.md b/docs/azure/includes/dotnet-all.md index f54e07da2a447..c74154a2b8ffc 100644 --- a/docs/azure/includes/dotnet-all.md +++ b/docs/azure/includes/dotnet-all.md @@ -194,9 +194,9 @@ | DCAP | NuGet [1.10.0](https://www.nuget.org/packages/Microsoft.Azure.DCAP/1.10.0) | | GitHub [1.10.0](https://github.com/microsoft/Azure-DCAP-Client/tree/1.6) | | Devices Client | NuGet [1.37.2](https://www.nuget.org/packages/Microsoft.Azure.Devices.Client/1.37.2)
NuGet [1.38.0-preview-001](https://www.nuget.org/packages/Microsoft.Azure.Devices.Client/1.38.0-preview-001) | | | | Digital Twins - Core | NuGet [1.2.2](https://www.nuget.org/packages/Azure.DigitalTwins.Core/1.2.2) | [docs](/dotnet/api/overview/azure/DigitalTwins.Core-readme) | GitHub [1.2.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.DigitalTwins.Core_1.2.2/sdk/digitaltwins/Azure.DigitalTwins.Core/) | -| Document DB | NuGet [2.14.1](https://www.nuget.org/packages/Microsoft.Azure.DocumentDB/2.14.1) | | GitHub [2.14.1](https://github.com/Azure/azure-cosmos-dotnet-v2) | +| Document DB | NuGet [2.15.0](https://www.nuget.org/packages/Microsoft.Azure.DocumentDB/2.15.0) | | GitHub [2.15.0](https://github.com/Azure/azure-cosmos-dotnet-v2) | | Document DB - Change Feed Processor | NuGet [2.4.0](https://www.nuget.org/packages/Microsoft.Azure.DocumentDB.ChangeFeedProcessor/2.4.0) | | GitHub [2.4.0](https://github.com/Azure/azure-documentdb-changefeedprocessor-dotnet/tree/master) | -| Document DB - Core | NuGet [2.14.1](https://www.nuget.org/packages/Microsoft.Azure.DocumentDB.Core/2.14.1) | | GitHub [2.14.1](https://github.com/Azure/azure-cosmos-dotnet-v2) | +| Document DB - Core | NuGet [2.15.0](https://www.nuget.org/packages/Microsoft.Azure.DocumentDB.Core/2.15.0) | | GitHub [2.15.0](https://github.com/Azure/azure-cosmos-dotnet-v2) | | Document Translation | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Translation.Document/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Translation.Document-readme-pre) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Translation.Document_1.0.0-beta.2/sdk/translation/Azure.AI.Translation.Document/) | | Entity Search | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.EntitySearch/2.0.0) | | | | Event Grid | NuGet [4.4.0](https://www.nuget.org/packages/Azure.Messaging.EventGrid/4.4.0) | [docs](/dotnet/api/overview/azure/Messaging.EventGrid-readme) | GitHub [4.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.EventGrid_4.4.0/sdk/eventgrid/Azure.Messaging.EventGrid/) | @@ -481,7 +481,7 @@ | Management - Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.Fluent/1.37.1) | | | | Management - Front Door | NuGet [4.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.FrontDoor/4.0.0) | | GitHub [4.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.FrontDoor_4.0.0/sdk/frontdoor/Microsoft.Azure.Management.FrontDoor/) | | Management - Graph RBAC Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.Graph.RBAC.Fluent/1.37.1) | | | -| Management - Guest Configuration | NuGet [1.4.0](https://www.nuget.org/packages/Microsoft.Azure.Management.GuestConfiguration/1.4.0) | | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.GuestConfiguration_1.4.0/sdk/guestconfiguration/Microsoft.Azure.Management.GuestConfiguration/) | +| Management - Guest Configuration | NuGet [1.5.0](https://www.nuget.org/packages/Microsoft.Azure.Management.GuestConfiguration/1.5.0) | | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.GuestConfiguration_1.5.0/sdk/guestconfiguration/Microsoft.Azure.Management.GuestConfiguration/) | | Management - HD Insight | NuGet [7.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.HDInsight/7.0.0) | [docs](/dotnet/api/overview/azure/hdinsight) | GitHub [7.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.HDInsight_7.0.0/sdk/hdinsight/Microsoft.Azure.Management.HDInsight/) | | Management - HD Insight Job | NuGet [2.0.7](https://www.nuget.org/packages/Microsoft.Azure.Management.HDInsight.Job/2.0.7) | [docs](/dotnet/api/overview/azure/hdinsight) | | | Management - Health Care APIs | NuGet [3.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.HealthcareApis/3.0.0) | | GitHub [3.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.HealthcareApis_3.0.0/sdk/healthcareapis/Microsoft.Azure.Management.HealthcareApis/) | diff --git a/docs/core/tools/sdk-errors/netsdk1149.md b/docs/core/tools/sdk-errors/netsdk1149.md new file mode 100644 index 0000000000000..42fda5588dc83 --- /dev/null +++ b/docs/core/tools/sdk-errors/netsdk1149.md @@ -0,0 +1,21 @@ +--- +title: "NETSDK1149: Built-in WinRT support not provided in .NET 5+" +description: How to reference a component with built-in WinRT support from an app that targets .NET 5 or later. +author: tdykstra +ms.author: tdykstra +ms.topic: error-reference +ms.date: 06/28/2021 +f1_keywords: +- NETSDK1149 +--- +# NETSDK1149: Built-in WinRT support not provided in .NET 5+" + +NETSDK1149 indicates that you're trying to reference a component that requires WinRT in an application that targets .NET 5 or a later version. These .NET versions don't have built-in support for WinRT. The full error message is similar to the following example: + +> *\* cannot be referenced because it uses built-in support for WinRT, which is no longer supported in .NET 5 and higher. An updated version of the component supporting .NET 5 is needed. + +If your application calls Windows Runtime APIs, resolve this error by changing the application's Target Framework Moniker (TFM) to a value that targets Windows 10. For more information, see [Call Windows Runtime APIs in desktop apps](/windows/apps/desktop/modernize/desktop-to-uwp-enhance). + +If your application calls a 3rd party WinRT component, get an updated version of the component that supports .NET 5. You can generate an updated version by using [C#/WinRT](/windows/uwp/csharp-winrt/). + +For more information, see [Built-in support for WinRT is removed from .NET](../../compatibility/interop/5.0/built-in-support-for-winrt-removed.md). diff --git a/docs/framework/get-started/system-requirements.md b/docs/framework/get-started/system-requirements.md index 2f5c36ad53dbb..ae7cc86776bf9 100644 --- a/docs/framework/get-started/system-requirements.md +++ b/docs/framework/get-started/system-requirements.md @@ -88,7 +88,7 @@ For information on the support lifecycle of .NET Framework versions, see [Micros | Windows Server 2012 R2 | 64-bit | .NET Framework 4.5.1 | .NET Framework 4.5.2

.NET Framework 4.6

.NET Framework 4.6.1

.NET Framework 4.6.2

.NET Framework 4.7

.NET Framework 4.7.1

.NET Framework 4.7.2

.NET Framework 4.8 | | Windows Server 2012 (64-bit edition) | 64-bit| .NET Framework 4.5 | .NET Framework 4.5.1

.NET Framework 4.5.2

.NET Framework 4.6

.NET Framework 4.6.1

.NET Framework 4.6.2

.NET Framework 4.7

.NET Framework 4.7.1

.NET Framework 4.7.2

.NET Framework 4.8 | | Windows Server 2008 R2 SP1|64-bit | -- | .NET Framework 4

.NET Framework 4.5

.NET Framework 4.5.1

.NET Framework 4.5.2

.NET Framework 4.6

.NET Framework 4.6.1

.NET Framework 4.6.2

.NET Framework 4.7

.NET Framework 4.7.1

.NET Framework 4.7.2

.NET Framework 4.8 | -| Windows Server 2008 SP2|32-bit and 64-bit | -- | .NET Framework 4

.NET Framework 4.5

.NET Framework 4.5.1

.NET Framework 4.5.2

.NET Framework 4.6 | +| Windows Server 2008 SP2|32-bit and 64-bit | -- | .NET Framework 4

.NET Framework 4.5

.NET Framework 4.5.1

.NET Framework 4.5.2

.NET Framework 4.6

.NET Framework 4.6.2 | **Notes:** diff --git a/docs/fundamentals/toc.yml b/docs/fundamentals/toc.yml index e623db93a4cab..bc301fb9b790b 100644 --- a/docs/fundamentals/toc.yml +++ b/docs/fundamentals/toc.yml @@ -208,6 +208,8 @@ items: href: ../core/tools/sdk-errors/netsdk1141.md - name: NETSDK1145 href: ../core/tools/sdk-errors/netsdk1145.md + - name: NETSDK1149 + href: ../core/tools/sdk-errors/netsdk1149.md - name: .NET CLI items: - name: Overview diff --git a/docs/media/dot-net-cross-platform.png b/docs/media/dot-net-cross-platform.png new file mode 100644 index 0000000000000..b4e87c018ba4c Binary files /dev/null and b/docs/media/dot-net-cross-platform.png differ diff --git a/docs/media/dot-net-cross-platform.svg b/docs/media/dot-net-cross-platform.svg deleted file mode 100644 index e3d3d37917804..0000000000000 --- a/docs/media/dot-net-cross-platform.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_apache-spark.svg b/docs/media/dotnet-bot_apache-spark.svg deleted file mode 100644 index a10db732f0928..0000000000000 --- a/docs/media/dotnet-bot_apache-spark.svg +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_cloud-apps.png b/docs/media/dotnet-bot_cloud-apps.png new file mode 100644 index 0000000000000..8c630b1b33ca2 Binary files /dev/null and b/docs/media/dotnet-bot_cloud-apps.png differ diff --git a/docs/media/dotnet-bot_cloud-apps.svg b/docs/media/dotnet-bot_cloud-apps.svg deleted file mode 100644 index 8df76b3da67e3..0000000000000 --- a/docs/media/dotnet-bot_cloud-apps.svg +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_iot.png b/docs/media/dotnet-bot_iot.png new file mode 100644 index 0000000000000..f5272e211d762 Binary files /dev/null and b/docs/media/dotnet-bot_iot.png differ diff --git a/docs/media/dotnet-bot_iot.svg b/docs/media/dotnet-bot_iot.svg deleted file mode 100644 index 16bfd027a444d..0000000000000 --- a/docs/media/dotnet-bot_iot.svg +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_machinelearning.png b/docs/media/dotnet-bot_machinelearning.png new file mode 100644 index 0000000000000..6b8bf2ceddab5 Binary files /dev/null and b/docs/media/dotnet-bot_machinelearning.png differ diff --git a/docs/media/dotnet-bot_machinelearning.svg b/docs/media/dotnet-bot_machinelearning.svg deleted file mode 100644 index d15693744651a..0000000000000 --- a/docs/media/dotnet-bot_machinelearning.svg +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_microservices.png b/docs/media/dotnet-bot_microservices.png new file mode 100644 index 0000000000000..63cb42da2e146 Binary files /dev/null and b/docs/media/dotnet-bot_microservices.png differ diff --git a/docs/media/dotnet-bot_microservices.svg b/docs/media/dotnet-bot_microservices.svg deleted file mode 100644 index 30a2622f2beaa..0000000000000 --- a/docs/media/dotnet-bot_microservices.svg +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-bot_mobile-apps-xamarin.png b/docs/media/dotnet-bot_mobile-apps-xamarin.png new file mode 100644 index 0000000000000..d340f024d5380 Binary files /dev/null and b/docs/media/dotnet-bot_mobile-apps-xamarin.png differ diff --git a/docs/media/dotnet-bot_mobile-apps-xamarin.svg b/docs/media/dotnet-bot_mobile-apps-xamarin.svg deleted file mode 100644 index 173917a0ea8a6..0000000000000 --- a/docs/media/dotnet-bot_mobile-apps-xamarin.svg +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/media/dotnet-logo.png b/docs/media/dotnet-logo.png new file mode 100644 index 0000000000000..fb00ecf91e4b7 Binary files /dev/null and b/docs/media/dotnet-logo.png differ diff --git a/docs/media/dotnet-logo.svg b/docs/media/dotnet-logo.svg deleted file mode 100644 index d204a0904247b..0000000000000 --- a/docs/media/dotnet-logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/media/logo_csharp.png b/docs/media/logo_csharp.png new file mode 100644 index 0000000000000..8b317fbca705e Binary files /dev/null and b/docs/media/logo_csharp.png differ diff --git a/docs/media/logo_fsharp.png b/docs/media/logo_fsharp.png new file mode 100644 index 0000000000000..7cfae254c6360 Binary files /dev/null and b/docs/media/logo_fsharp.png differ diff --git a/docs/media/logo_vb.png b/docs/media/logo_vb.png new file mode 100644 index 0000000000000..b91b434fc0cdd Binary files /dev/null and b/docs/media/logo_vb.png differ