Skip to content

merge code from master to prtest #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 46 commits into from
Sep 22, 2017
Merged

merge code from master to prtest #21

Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b1d0fe8
fixed broken link (#3169)
mairaw Sep 18, 2017
f4767ee
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 18, 2017
fc8ef62
fixed pipes in tables (#3163)
mairaw Sep 19, 2017
2d0dfff
added info about relative paths for output (#3042)
mairaw Sep 19, 2017
71258c7
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 19, 2017
51d3e2d
Update how-to-write-a-simple-parallel-for-loop.md (#3174)
whosenbocus Sep 20, 2017
53382d0
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
af9512d
fixed formulas (#3182)
mairaw Sep 20, 2017
54de1d8
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
058c717
simplifying version list (#3176)
mairaw Sep 20, 2017
3536654
Minor fixes : inconsistent wording and some ghost characters (#3171)
Styxxy Sep 20, 2017
84aa428
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
7b7b3ed
Adding C# version history post (#2867)
erikdietrich Sep 20, 2017
9d583c8
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
eb4056d
Learn C# Tutorial (#2306)
BillWagner Sep 20, 2017
9dd64c4
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
433a854
Fix typo: AesCrytpServiceProvider -> AesCryptoServiceProvider (#3185)
chlowell Sep 20, 2017
eceb396
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
b39ad8a
added net core behavior (#3140)
mairaw Sep 20, 2017
d4e91ea
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 20, 2017
f30153d
quick link fix to the hub page (#3193)
BillWagner Sep 21, 2017
f857949
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
377505c
Removed duplicate entry from 'See Also' section (#3195)
ZeeshanAK Sep 21, 2017
6418ad5
removed invisible characters (#3192)
mairaw Sep 21, 2017
2a91ee2
update snippet reference (#3191)
mairaw Sep 21, 2017
ade8b66
fixed broken link (#3190)
mairaw Sep 21, 2017
1c8fb08
clarified example (#3184)
mairaw Sep 21, 2017
47a46e9
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
bb9d7b2
Updating condition(s) under which the method throws (#3152)
stevewhims Sep 21, 2017
612f4fb
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
96512eb
Update mutually recursive functions snippet (#3186)
aliozgur Sep 21, 2017
e6bf84a
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
70abdf8
494407 Corrections to DnsSafeHost and IdnHost (#3143)
stevewhims Sep 21, 2017
c39a418
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
2656807
Improve Suits and Ranks definitions (#3197)
ibqn Sep 21, 2017
1fc3d85
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
ca5c1a7
Fixed Kelvin output, make culture independent (#3157)
paulroho Sep 21, 2017
af1ad32
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
6ab8f52
Fixed Kelvin output, make culture independent (#3159)
paulroho Sep 21, 2017
16b6e65
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
2c0814b
Remove Duplicate Config Definition (#3200)
kellenlask Sep 21, 2017
67349b6
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 21, 2017
81117b1
fixed api link format (#3194)
mairaw Sep 21, 2017
2b5135e
Typo in document - IOne instead of One (#3202)
whosenbocus Sep 22, 2017
dbf6d46
Fix framework in dotnet store command topic (#3188)
guardrex Sep 22, 2017
265a9a0
Merging changes synced from https://github.com/dotnet/docs (branch ma…
Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
simplifying version list (#3176)
  • Loading branch information
@mairaw
mairaw authored Sep 20, 2017
commit 058c717776f232ac571841bc08cd0c203bf4735c
6 changes: 1 addition & 5 deletions docs/framework/install/troubleshoot-blocked-installations-and-uninstallations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
---
title: "Troubleshoot blocked .NET Framework installations and uninstallations"
ms.custom: ""
ms.date: "05/26/2017"
ms.prod: ".net-framework"
ms.reviewer: ""
ms.suite: ""
ms.technology:
- "dotnet-clr"
ms.tgt_pltfrm: ""
ms.topic: "article"
helpviewer_keywords:
- ".NET Framework, troubleshooting blocked installations"
Expand All @@ -21,7 +17,7 @@ manager: "wpickett"

# Troubleshoot blocked .NET Framework installations and uninstallations

When you run the [web or offline installer](../../../docs/framework/install/guide-for-developers.md) for the .NET Framework 4.5, 4.5.1, 4.5.2, 4.6, 4.6.1, 4.6.2, or 4.7 you might encounter an issue that prevents or blocks the installation of the .NET Framework. The following table lists possible blocking issues and provides links to troubleshooting information.
When you run the [web or offline installer](../../../docs/framework/install/guide-for-developers.md) for the .NET Framework 4.5 or later versions, you might encounter an issue that prevents or blocks the installation of the .NET Framework. The following table lists possible blocking issues and provides links to troubleshooting information.

In Windows 8 and above, the .NET Framework is an operating system component and cannot be independently uninstalled. Updates to the .NET Framework appear in the **Installed Updates** tab of the Control Panel **Programs and Features** app. For operating systems on which the .NET Framework is not preinstalled, the .NET Framework appears in the **Uninstall or change a program** tab (or the **Add/Remove programs** tab) of the **Program and Features** app in Control Panel. For information on the Windows versions on which the .NET Framework is preinstalled, see [System Requirements](../../../docs/framework/get-started/system-requirements.md).

Expand Down