Skip to content

Commit

Permalink
Merge pull request #101 from dsccommunity/dev
Browse files Browse the repository at this point in the history
Merge to master
  • Loading branch information
PlagueHO authored Apr 28, 2020
2 parents 872b6c6 + 0bae0d8 commit dc68ec3
Show file tree
Hide file tree
Showing 110 changed files with 3,720 additions and 2,147 deletions.
10 changes: 0 additions & 10 deletions .MetaTestOptIn.json

This file was deleted.

26 changes: 0 additions & 26 deletions .codecov.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text eol=crlf

# Ensure any exe files are treated as binary
*.exe binary
*.jpg binary
*.xl* binary
*.pfx binary
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@
*.user
*.coverage
.vs
.vscode
.psproj
.sln
DscResource.Tests
DscResource.Tests/*
Modules/DFSDsc/DscResource.Tests
Modules/DFSDsc/DscResource.Tests/*
node_modules
node_modules/*
markdownissues.txt
TestResults.xml
*.config.json
output/
15 changes: 3 additions & 12 deletions .vscode/analyzersettings.psd1
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
@{
<#
For the custom rules to work, the DscResource.Tests repo must be
cloned. It is automatically clone as soon as any unit or
integration tests are run.
#>
CustomRulePath = '.\DSCResource.Tests\DscResource.AnalyzerRules'

CustomRulePath = '.\output\RequiredModules\DscResource.AnalyzerRules'
includeDefaultRules = $true
IncludeRules = @(
# DSC Resource Kit style guideline rules.
'PSAvoidDefaultValueForMandatoryParameter',
Expand Down Expand Up @@ -43,11 +38,7 @@
'PSUseDeclaredVarsMoreThanAssignments',
'PSUsePSCredentialType',

<#
This is to test all the DSC Resource Kit custom rules.
The name of the function-blocks of each custom rule start
with 'Measure*'.
#>
'Measure-*'
)

}
29 changes: 26 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,38 @@
// Place your settings in this file to overwrite default and user settings.
{
"powershell.codeFormatting.openBraceOnSameLine": false,
"powershell.codeFormatting.newLineAfterOpenBrace": false,
"powershell.codeFormatting.newLineAfterOpenBrace": true,
"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.pipelineIndentationStyle": "IncreaseIndentationAfterEveryPipeline",
"powershell.codeFormatting.preset": "Custom",
"powershell.codeFormatting.alignPropertyValuePairs": true,
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"powershell.scriptAnalysis.settingsPath": ".vscode\\analyzersettings.psd1"
"powershell.scriptAnalysis.settingsPath": ".vscode\\analyzersettings.psd1",
"powershell.scriptAnalysis.enable": true,
"files.associations": {
"*.ps1xml": "xml"
},
"cSpell.words": [
"COMPANYNAME",
"ICONURI",
"LICENSEURI",
"PROJECTURI",
"RELEASENOTES",
"buildhelpers",
"endregion",
"gitversion",
"icontains",
"keepachangelog",
"notin",
"pscmdlet",
"steppable"
],
"[markdown]": {
"files.encoding": "utf8"
}
}
110 changes: 85 additions & 25 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
# Versions
# Change log for DFSDsc

## Unreleased
The format is based on and uses the types of changes according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 4.4.0.0
## [Unreleased]

### Changed

- BREAKING CHANGE: Changed resource prefix from MSFT to DSC.
- Updated to use continuous delivery pattern using Azure DevOps - fixes
[Issue #41](https://github.com/dsccommunity/DFSDsc/issues/98).
- Updated build badges in README.MD.
- Renamed `DFSDsc.ResourceHelper` module to `DFSDsc.Common` to align to
other modules.
- Correct case of localization folder names.
- Update build badges in `README.md` with correct build IDs.

## [4.4.0.0] - 2019-09-19

### Changed

- Fix example publish to PowerShell Gallery by adding `gallery_api`
environment variable to `AppVeyor.yml` - fixes [Issue #91](https://github.com/PowerShell/DfsDsc/issues/91).
- Fix minor style issues in statement case.

## 4.3.0.0
## [4.3.0.0] - 2019-02-20

### Changed

- Fixes PSSA style violation issues resulting - fixes [Issue #84](https://github.com/PowerShell/DfsDsc/issues/84).
- Added 'DscResourcesToExport' to manifest to improve information in
Expand All @@ -17,7 +35,9 @@
to empty list in manifest to meet best practice.
- Explicitly removed extra hidden files from release package

## 4.2.0.0
## [4.2.0.0] - 2018-11-29

### Changed

- Add support for modifying staging quota size in
MSFT_DFSReplicationGroupMembership - fixes [Issue #77](https://github.com/PowerShell/DfsDsc/issues/77).
Expand All @@ -30,15 +50,19 @@
- Updated LICENSE file to match the Microsoft Open Source Team
standard - fixes [Issue #79](https://github.com/PowerShell/DFSDsc/issues/79)

## 4.1.0.0
## [4.1.0.0] - 2018-06-13

### Changed

- Added Hub and Spoke replication group example - fixes [Issue #62](https://github.com/PowerShell/DFSDsc/issues/62).
- Enabled PSSA rule violations to fail build - fixes [Issue #320](https://github.com/PowerShell/DFSDsc/issues/59).
- Allow null values in resource group members or folders - fixes [Issue #27](https://github.com/PowerShell/xDFS/issues/27).
- Added a CODE\_OF\_CONDUCT.md with the same content as in the README.md - fixes
[Issue #67](https://github.com/PowerShell/DFSDsc/issues/67).

## 4.0.0.0
## [4.0.0.0] - 2018-05-03

### Changed

- BREAKING CHANGE
- Renamed xDFS to DFSDsc - fixes [Issue #55](https://github.com/PowerShell/xDFS/issues/55).
Expand All @@ -63,7 +87,9 @@
execution - fixes [Issue #51](https://github.com/PowerShell/xDFS/issues/51).
- Updated tests to meet Pester V4 guidelines - fixes [Issue #53](https://github.com/PowerShell/xDFS/issues/53).

## 3.2.0.0
## [3.2.0.0] - 2017-06-01

### Changed

- Converted AppVeyor.yml to pull Pester from PSGallery instead of Chocolatey.
- Changed AppVeyor.yml to use default image.
Expand All @@ -86,27 +112,35 @@
- Prevented ResourceHelper and Common module cmdlets from being exported to resolve
conflicts with other resource modules.

## 3.1.0.0
## [3.1.0.0] - 2016-06-29

### Changed

- MSFT_xDFSNamespaceServerConfiguration- resource added.
- Corrected names of DFS Namespace sample files to indicate that they are setting
Namespace roots and folders.
- Removed Pester version from AppVeyor.yml.

## 3.0.0.0
## [3.0.0.0] - 2016-05-11

### Changed

- RepGroup renamed to ReplicationGroup in all files.
- xDFSReplicationGroupConnection- Changed DisableConnection parameter to EnsureEnabled.
Changed DisableRDC parameter to EnsureRDCEnabled.
- xDFSReplicationGroup- Fixed bug where disabled connection was not enabled in
Fullmesh topology.

## 2.2.0.0
## [2.2.0.0] - 2016-01-01

### Changed

- DSC Module moved to MSFT.
- MSFT_xDFSNamespace- Removed.

## 2.1.0.0
## [2.1.0.0] - 2016-01-01

### Changed

- MSFT_xDFSRepGroup- Fixed issue when using FQDN member names.
- MSFT_xDFSRepGroupMembership- Fixed issue with Get-TargetResource when using
Expand All @@ -116,13 +150,17 @@
- MSFT_xDFSNamespaceRoot- Added write support to TimeToLiveSec parameter.
- MSFT_xDFSNamespaceFolder- Added write support to TimeToLiveSec parameter.

## 2.0.0.0
## [2.0.0.0] - 2016-01-01

### Changed

- MSFT_xDFSNamespaceRoot- resource added.
- MSFT_xDFSNamespaceFolder- resource added.
- MSFT_xDFSNamespace- deprecated - use MSFT_xDFSNamespaceRoot instead.

## 1.5.1.0
## [1.5.1.0] - 2016-01-01

### Changed

- MSFT_xDFSNamespace- Add parameters:
- EnableSiteCosting
Expand All @@ -133,7 +171,9 @@
- ReferralPriorityClass
- ReferralPriorityRank

## 1.5.0.0
## [1.5.0.0] - 2016-01-01

### Changed

- MSFT_xDFSNamespace- New sample files added.
- MSFT_xDFSNamespace- MOF parameter descriptions corrected.
Expand All @@ -146,49 +186,69 @@
until [this issue](https://windowsserver.uservoice.com/forums/301869-powershell/suggestions/11088807-get-dscconfiguration-fails-with-embedded-cim-type)
is resolved.

## 1.4.2.0
## [1.4.2.0] - 2016-01-01

### Changed

- MSFT_xDFSRepGroup- Fixed "Cannot bind argument to parameter 'DifferenceObject'
because it is null." error.
- All Unit tests updated to use *_TestEnvironment functions in DSCResource.Tests\TestHelpers.psm1

## 1.4.1.0
## [1.4.1.0] - 2016-01-01

### Changed

- MSFT_xDFSNamespace- Renamed Sample_DcFSNamespace.ps1 to Sample_xDFSNamespace.
- MSFT_xDFSNamespace- Corrected Import-DscResouce in example.

## 1.4.0.0
## [1.4.0.0] - 2016-01-01

### Changed

- Community update by Erik Granneman
- New DSC recource xDFSNameSpace

## 1.3.2.0
## [1.3.2.0] - 2016-01-01

### Changed

- Documentation and Module Manifest Update only.

## 1.3.1.0
## [1.3.1.0] - 2016-01-01

### Changed

- xDFSRepGroupFolder- DfsnPath parameter added for setting DFS Namespace path mapping.

## 1.3.0.0
## [1.3.0.0] - 2016-01-01

### Changed

- xDFSRepGroup- If ContentPaths is set, PrimaryMember is set to first member in
the Members array.
- xDFSRRepGroupMembership- PrimaryMembers property added so that Primary Member
can be set.

## 1.2.1.0
## [1.2.1.0] - 2016-01-01

### Changed

- xDFSRepGroup- Fix to ContentPaths generation when more than one folder is provided.

## 1.2.0.0
## [1.2.0.0] - 2016-01-01

### Changed

- xDFSRepGroup- ContentPaths string array parameter.

## 1.1.0.0
## [1.1.0.0] - 2016-01-01

### Changed

- xDFSRepGroupConnection- Resource added.

## 1.0.0.0
## [1.0.0.0] - 2016-01-01

### Changed

- Initial release.
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

# Contributing

Please check out common DSC Community [contributing guidelines](https://dsccommunity.org/guidelines/contributing).

## Running the Tests

If want to know how to run this module's tests you can look at the [Testing Guidelines](https://dsccommunity.org/guidelines/testing-guidelines/#running-tests)
Loading

0 comments on commit dc68ec3

Please sign in to comment.