Skip to content

Fix the DSC overview URL in a markdown file and some small cleanup changes #16629

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
daxian-dbw merged 4 commits into from
Dec 16, 2021
Merged

Fix the DSC overview URL in a markdown file and some small cleanup changes #16629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e2bf3c
Fix comment in UpdateNotification.cs
daxian-dbw Nov 12, 2021
8beafee
Fix another comment
daxian-dbw Dec 6, 2021
bf42962
Avoid unnecessary verbose messages in Find-Dotnet
daxian-dbw Dec 6, 2021
65dbb1c
Fix DSC overview URL
daxian-dbw Dec 15, 2021
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
4 changes: 2 additions & 2 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,7 @@ function Start-ResGen
}

function Find-Dotnet() {
Write-Verbose -Verbose "In Find-DotNet"
Write-Verbose "In Find-DotNet"

$originalPath = $env:PATH
$dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
Expand All @@ -2259,7 +2259,7 @@ function Find-Dotnet() {
$dotnetCLIInstalledVersion = Get-LatestInstalledSDK
Pop-Location

Write-Verbose -Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion`nchosenDotNetVersion = $chosenDotNetVersion"
Write-Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion; chosenDotNetVersion = $chosenDotNetVersion"

if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
Write-Warning "The 'dotnet' in the current path can't find SDK version ${dotnetCLIRequiredVersion}, prepending $dotnetPath to PATH."
Expand Down
2 changes: 1 addition & 1 deletion demos/DSC/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DSC MOF Compilation Demo

[PowerShell Desired State Configuration](https://docs.microsoft.com/powershell/scripting/dsc/overview/overview) is a declarative configuration platform for Windows and Linux.
[PowerShell Desired State Configuration](https://docs.microsoft.com/powershell/scripting/dsc/overview) is a declarative configuration platform for Windows and Linux.
DSC configurations can be authored in PowerShell and compiled into the resultant MOF document.

This demo shows use of PowerShell to author a DSC configuration to set the configuration of an Apache web server. PowerShell scripting is used to assess distribution and version-specific properties,
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ internal static void ShowUpdateNotification(PSHostUserInterface hostUI)
// We calculate how much whitespace we need to make it look nice
if (hostUI.SupportsVirtualTerminal)
{
// Use Warning Color
// Swaps foreground and background colors.
notificationColor = "\x1B[7m";
resetColor = "\x1B[0m";

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/parser/Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6735,7 +6735,7 @@ private ExpressionAst ExpressionRule(bool endNumberOnTernaryOpChars = false)
SkipToken();
SkipNewlines();

// We have seen the ternary operator '?' and now expecting the 'IfFalse' expression.
// We have seen the ternary operator '?' and now expecting the 'IfTrue' expression.
ExpressionAst ifTrue = ExpressionRule(endNumberOnTernaryOpChars: true);
if (ifTrue == null)
{
Expand Down