Skip to content

Commit

Permalink
Merge pull request #435 from PowerShell/dev
Browse files Browse the repository at this point in the history
Release of version 8.4.0.0 of xPSDesiredStateConfiguration
  • Loading branch information
kwirkykat committed Jul 25, 2018
2 parents 5c60d16 + 1063b2f commit 01383b3
Show file tree
Hide file tree
Showing 211 changed files with 5,633 additions and 2,601 deletions.
6 changes: 6 additions & 0 deletions .MetaTestOptIn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
"Common Tests - Validate Module Files",
"Common Tests - Validate Script Files",
"Common Tests - Validate Example Files",
"Common Tests - Validate Example Files To Be Published"
]
44 changes: 44 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Configuration for probot-stale - https://github.com/probot/stale

limitPerRun: 30

pulls:
daysUntilStale: 14
daysUntilClose: false
exemptProjects: true
exemptMilestones: true
staleLabel: abandoned
exemptLabels:
- needs review
- on hold
- waiting for CLA pass

markComment: >
Labeling this pull request (PR) as abandoned since it has gone 14 days or more
since the last update. An abandoned PR can be continued by another contributor.
The abandoned label will be removed if work on this PR is taken up again.
issues:
daysUntilStale: 30
daysUntilClose: 40
exemptProjects: true
exemptMilestones: true
staleLabel: stale
exemptLabels:
- bug
- enhancement
- tests
- documentation
- resource proposal
- on hold

markComment: >
This issue has been automatically marked as stale because
it has not had activity from the community in the last 30 days. It will be
closed if no further activity occurs within 10 days. If the issue is labelled
with any of the work labels (e.g bug, enhancement, documentation, or tests)
then the issue will not auto-close.
closeComment: >
This issue has been automatically closed because it is has not had activity
from the community in the last 40 days.
13 changes: 13 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"powershell.codeFormatting.openBraceOnSameLine": false,
"powershell.codeFormatting.newLineAfterOpenBrace": false,
"powershell.codeFormatting.newLineAfterCloseBrace": true,
"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
"powershell.codeFormatting.whitespaceAroundOperator": true,
"powershell.codeFormatting.whitespaceAfterSeparator": true,
"powershell.codeFormatting.ignoreOneLineBlock": false,
"powershell.codeFormatting.preset": "Custom",
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true
}
8 changes: 4 additions & 4 deletions DSCResources/CommonResourceHelper.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<#
<#
.SYNOPSIS
Tests if the current machine is a Nano server.
#>
Expand All @@ -9,7 +9,7 @@ function Test-IsNanoServer
param ()

$isNanoServer = $false

if (Test-CommandExists -Name 'Get-ComputerInfo')
{
$computerInfo = Get-ComputerInfo
Expand All @@ -36,12 +36,12 @@ function Test-CommandExists
{
[OutputType([Boolean])]
[CmdletBinding()]
param
param
(
[Parameter(Mandatory = $true)]
[ValidateNotNullOrEmpty()]
[String]
$Name
$Name
)

$command = Get-Command -Name $Name -ErrorAction 'SilentlyContinue'
Expand Down
Binary file modified DSCResources/MSFT_xArchive/en-US/MSFT_xArchive.schema.mfl
Binary file not shown.
8 changes: 4 additions & 4 deletions DSCResources/MSFT_xArchive/en-US/MSFT_xArchive.strings.psd1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Localized MSFT_xArchive.strings.psd1
# Localized MSFT_xArchive.strings.psd1

ConvertFrom-StringData @'
RetrievingArchiveState = Retrieving the state of the archive with path {0} and destination {1}...
Expand All @@ -13,10 +13,10 @@ ConvertFrom-StringData @'
DestinationExists = A directory already exists at the destination path {0}.
DestinationDoesNotExist = A directory does not exist at the destination path {0}.
CreatingDirectoryAtDestination = Creating the root directory at the destination path {0}...
TestingIfArchiveExistsAtDestination = Testing if the archive at the destination path {0} exists...
ArchiveExistsAtDestination = The archive at path {0} exists at the destination {1}.
ArchiveDoesNotExistAtDestination = The archive at path {0} does not exist at the destination {1}.
ArchiveDoesNotExistAtDestination = The archive at path {0} does not exist at the destination {1}.
OpeningArchive = Opening the archive at path {0}...
ClosingArchive = Closing the archive at path {0}...
Expand All @@ -43,7 +43,7 @@ ConvertFrom-StringData @'
RemovingFile = Removing the file at path {0}...
CouldNotRemoveItemOfIncorrectType = The file at {0} does not match the item type (file, directory, or other) or the archive entry at {1}, so it will not be removed.
ArchiveRemovedFromDestination = Archive removed from the destination path {0}.
ChecksumSpecifiedAndValidateFalse = The Checksum parameter was specified as {0} but the Validate parameter is set to false for the archive with path {1} and destination {2}. Please specify the Validate parameter as true to use the Checksum parameter.
PathDoesNotContainValidPSDriveRoot = The path {0} cannot be accessed because it does not contain any directories to use as the root of a PSDrive.
ErrorCreatingPSDrive = An error occurred while attempting to create a PSDrive to access the path {0} under the user {1}.
Expand Down
Loading

0 comments on commit 01383b3

Please sign in to comment.