PowerShell · mklement0 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017
@@ -5,7 +5,7 @@



-Copyright � 1991-2016 Unicode, Inc. All rights reserved.
+Copyright © 1991-2016 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in http://www.unicode.org/copyright.html

 Permission is hereby granted, free of charge, to any person obtaining

@@ -1,4 +1,4 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

  <!-- MSI installs on Win7 and above -->
  <?define MinOSVersionSupported = "VersionNT >= 601" ?>

@@ -120,4 +120,4 @@ These are automatically defined PowerShell-language variables.
 ## COPYRIGHT

 Copyright (c) 2016 Microsoft Corporation.
-All rights reserved.
+All rights reserved.
@@ -15,4 +15,4 @@ This demo shows management of Apache HTTP Server with PowerShell cmdlets impleme
 	- `sudo yum install httpd`


-Note: Management of Apache requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
+Note: Management of Apache requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
@@ -1,4 +1,4 @@
-### The techniques used in this demo are documented at
+### The techniques used in this demo are documented at
 ### https://azure.microsoft.com/en-us/documentation/articles/powershell-azure-resource-manager/

 ### Import AzureRM.Profile.NetCore.Preview and AzureRM.Resources.NetCore.Preview modules.

@@ -1,4 +1,4 @@
-{
+{
  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
  "parameters": {
@@ -197,4 +197,4 @@
      "value": "[concat('ssh ', parameters('adminUsername'), '@', parameters('dnsLabelPrefix'), '.', resourceGroup().location, '.cloudapp.azure.com')]"
    }
  }
-}
+}
@@ -9,4 +9,4 @@ This demo shows use of PowerShell to author a DSC configuration to set the confi
 - OMI: >= 1.1.0  [https://www.github.com/microsoft/omi/releases](https://www.github.com/microsoft/omi/releases)
 - Desired State Configuration for Linux >= 1.1.1-278 [https://github.com/Microsoft/PowerShell-DSC-for-Linux/releases](https://github.com/Microsoft/PowerShell-DSC-for-Linux/releases)

-Note: applying the DSC configuration requires privileges. The user must have sudo authorization capabilities. You will be prompted for a sudo password when running the demo. 
+Note: applying the DSC configuration requires privileges. The user must have sudo authorization capabilities. You will be prompted for a sudo password when running the demo. 
@@ -26,4 +26,4 @@ Get-Container | Where-Object State -eq "exited" | Remove-Container
 Remove-ContainerImage hello-world

 # And list the container images left on the container host
-Get-ContainerImage
+Get-ContainerImage
@@ -15,4 +15,4 @@ Function Get-SystemDJournal {
        {
                $Result
        }
-}
+}
@@ -7,4 +7,4 @@ This demo shows use of a PowerShell script module to wrap a native tool (journal
 - Install PowerShell


-Note: Accessing the SystemD journal requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
+Note: Accessing the SystemD journal requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
@@ -66,4 +66,4 @@
 	</TableControl>
 	</View>
  </ViewDefinitions>
-</Configuration>
+</Configuration>
@@ -8,4 +8,4 @@
 # Show the .ps1
 # Run the .ps1 to generate a MOF
 # Apply the MOF locally with Start-DSCConfiguration
-# Show the newly configured state
+# Show the newly configured state
@@ -1,5 +1,5 @@
-## Install demo
+## Install demo

 For Windows refer to the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/windows.md)

-For Linux, using [download.sh](https://github.com/PowerShell/PowerShell/blob/master/tools/download.sh) is the best way to deploy PowerShell bits
+For Linux, using [download.sh](https://github.com/PowerShell/PowerShell/blob/master/tools/download.sh) is the best way to deploy PowerShell bits
@@ -1,4 +1,4 @@
-#region find, install, update, uninstall the PowerShell scripts from an online repository.
+#region find, install, update, uninstall the PowerShell scripts from an online repository.
 # Value: equivalent of pypi

 # List of PowerShellGet commands
@@ -74,4 +74,4 @@ Set-PSRepository -Name "myPrivateGallery" -InstallationPolicy "Untrusted"
 # Remove a private feed
 Unregister-PSRepository -Name "myPrivateGallery"

-#endregion
+#endregion
@@ -1,4 +1,4 @@
-
+
 #-----------------

 function Get-Issue

@@ -1,55 +1,55 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG NanoServerVersion=10.0.16257.1000
-ARG WindowsServerCoreVersion=10.0.16257.1000
-ARG WindowsServerCoreRepo=microsoft/windowsservercore-insider
-ARG NanoServerRepo=microsoft/nanoserver-insider
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:$WindowsServerCoreVersion  AS installer-env
-
-# Arguments for installing powershell, must be defined in the container they are used
-ARG PS_VERSION=6.0.0-beta.6
-
-ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win10-win2016-x64.zip
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-RUN Invoke-WebRequest $Env:PS_DOWNLOAD_URL -OutFile powershell.zip
-
-RUN Expand-Archive powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:$NanoServerVersion
-
-ARG VCS_REF="none"
-ARG PS_VERSION=6.0.0-beta.6
-ARG IMAGE_NAME=microsoft/nanoserver-insider-powershell
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PS." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} powershell -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} powershell -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} powershell -c Get-Help"
-
-# Copy Powershell from the installer containter
-ENV ProgramFiles C:\Program Files
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# Persist %PSCORE% ENV variable for user convenience
-ENV PSCORE="$ProgramFiles\PowerShell\PowerShell.exe"
-
-# Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
-
-CMD ["PowerShell.exe"]
+# escape=`
+# Args used by from statements must be defined here:
+ARG NanoServerVersion=10.0.16257.1000
+ARG WindowsServerCoreVersion=10.0.16257.1000
+ARG WindowsServerCoreRepo=microsoft/windowsservercore-insider
+ARG NanoServerRepo=microsoft/nanoserver-insider
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:$WindowsServerCoreVersion  AS installer-env
+
+# Arguments for installing powershell, must be defined in the container they are used
+ARG PS_VERSION=6.0.0-beta.6
+
+ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win10-win2016-x64.zip
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN Invoke-WebRequest $Env:PS_DOWNLOAD_URL -OutFile powershell.zip
+
+RUN Expand-Archive powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:$NanoServerVersion
+
+ARG VCS_REF="none"
+ARG PS_VERSION=6.0.0-beta.6
+ARG IMAGE_NAME=microsoft/nanoserver-insider-powershell
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PS." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} powershell -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} powershell -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} powershell -c Get-Help"
+
+# Copy Powershell from the installer containter
+ENV ProgramFiles C:\Program Files
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# Persist %PSCORE% ENV variable for user convenience
+ENV PSCORE="$ProgramFiles\PowerShell\PowerShell.exe"
+
+# Set the path
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
+
+CMD ["PowerShell.exe"]
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netstandard1.6</TargetFramework>

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netcoreapp1.1</TargetFramework>

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>

@@ -58,4 +58,4 @@ else {
 # Remove loopback address from output regardless of platform
 $IP | Where-Object {$_ -ne '127.0.0.1'}
 ```
-[run-ps]:http://windowsitpro.com/powershell/running-powershell-scripts-easy-1-2-3
+[run-ps]:http://windowsitpro.com/powershell/running-powershell-scripts-easy-1-2-3
@@ -121,4 +121,4 @@ PS /home/psuser> $d | ForEach-Object {$_.'Total Size' / 1MB}

 PS /home/psuser> $d[1].'Total Size' / 1MB
 148480
-``` 
+``` 
@@ -194,4 +194,4 @@ Below is my suggestion for prioritization to reduce risk and improve confidence
 6. Replace in-lab tests with PowerShell Core tests
 7. Investigate feasibility of running current in-lab tests on PowerShell Core

-These are [tracked](https://github.com/PowerShell/PowerShell/issues?utf8=%E2%9C%93&q=is%3Aissue%20%23testability%20) as issues
+These are [tracked](https://github.com/PowerShell/PowerShell/issues?utf8=%E2%9C%93&q=is%3Aissue%20%23testability%20) as issues
@@ -768,4 +768,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <Import Project="..\..\PowerShell.Common.props"/>


@@ -1,4 +1,4 @@
-/*============================================================================
+/*============================================================================
 * Copyright (C) Microsoft Corporation, All rights reserved.
 *============================================================================
 */

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!--
    Microsoft ResX Schema
-Original file line number
+Diff line change
@@ -15,4 +15,4 @@ Function Get-SystemDJournal {
             {
                     $Result
             }
-    }
+    }