Skip to content

Commit

Permalink
Updated pipeline files to support change of default branch to main (#199
Browse files Browse the repository at this point in the history
)
  • Loading branch information
johlju authored Jun 8, 2022
1 parent 5b69372 commit 3b66b8f
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
1 change: 0 additions & 1 deletion .github/CONTRIBUTING.md

This file was deleted.

7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/Problem_with_resource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,13 @@ body:
- type: textarea
id: moduleVersion
attributes:
label: xHyper-V version
label: HyperVDsc version
description: |
Please provide the version of the xHyper-V module that was used. _Will be automatically formatted as plain text._
Please provide the version of the HyperVDsc module that was used. _Will be automatically formatted as plain text._
To help with this information, please run this command: `Get-Module -Name 'xHyper-V' -ListAvailable | ft Name,Version,Path`
To help with this information, please run this command: `Get-Module -Name 'HyperVDsc' -ListAvailable | ft Name,Version,Path`
placeholder: |
Add module information here
render: text
validations:
required: true

8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Changelog for xHyper-V
# Changelog for HyperVDsc

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).

For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md).

## [Unreleased]

- xHyper-V
- BREAKING CHANGE
- Renamed _xHyper-V_ to _HyperVDsc - fixes [Issue #69](https://github.com/PowerShell/xHyper-V/issues/213).
- Renamed _xHyper-V_ to _HyperVDsc - fixes [Issue #69](https://github.com/PowerShell/HyperVDsc/issues/213).
- Changed all MSFT_xResourceName to DSC_ResourceName.
- Updated DSCResources, Examples, Modules and Tests for new naming.
- Updated README.md from _xHyper-V_ to _HyperVDsc
- Renamed default branch to `main` - Fixes [Issue #198](https://github.com/dsccommunity/HyperVDsc/issues/198).

## [3.18.0] - 2022-06-04

Expand All @@ -27,7 +29,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
### Deprecated

- **The module _xHyper-V_ will be renamed to _HyperVDsc_
([issue #62](https://github.com/dsccommunity/xHyper-V/issues/62)).
([issue #62](https://github.com/dsccommunity/HyperVDsc/issues/62)).
The version `v3.18.0` will be the the last release of _xHyper-V_.
Version `v4.0.0` will be released as _HyperVDsc_, it will be
released shortly after the `v3.18.0` release to be able to start transition
Expand Down
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
branches:
master:
tag: preview
regex: ^master$
regex: ^main$
pull-request:
tag: PR
feature:
Expand Down
6 changes: 3 additions & 3 deletions HISTORIC_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ change log short.
- Fixed code styling issues.
- Fixed bug where StartupMemory was not evaluated in Test-TargetResource.
- Redo of abandoned PRs:
- [PR #148](https://github.com/PowerShell/xHyper-V/pull/148), Fixes [Issue #149](https://github.com/PowerShell/xHyper-V/issues/149).
- [PR #67](https://github.com/PowerShell/xHyper-V/pull/67), Fixes [Issue #145](https://github.com/PowerShell/xHyper-V/issues/145).
- [PR #148](https://github.com/dsccommunity/HyperVDsc/pull/148), Fixes [Issue #149](https://github.com/dsccommunity/HyperVDsc/issues/149).
- [PR #67](https://github.com/dsccommunity/HyperVDsc/pull/67), Fixes [Issue #145](https://github.com/dsccommunity/HyperVDsc/issues/145).
- Fixed Get throws error when NetworkAdapters are not attached or missing
properties.

Expand All @@ -31,7 +31,7 @@ change log short.
## [3.14.0.0] - 2018-11-28

- MSFT_xVMHost:
- Added support to Enable / Disable VM Live Migration. Fixes [Issue #155](https://github.com/PowerShell/xHyper-V/issues/155).
- Added support to Enable / Disable VM Live Migration. Fixes [Issue #155](https://github.com/dsccommunity/HyperVDsc/issues/155).

## [3.13.0.0] - 2018-10-24

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
This module contains DSC resources for the management and
configuration of Hyper-V hosts, virtual machines and related resources.

[![Build Status](https://dev.azure.com/dsccommunity/HyperVDsc/_apis/build/status/dsccommunity.HyperVDsc?branchName=master)](https://dev.azure.com/dsccommunity/HyperVDsc/_build/latest?definitionId=25&branchName=master)
![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/dsccommunity/HyperVDsc/25/master)
[![codecov](https://codecov.io/gh/dsccommunity/HyperVDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/dsccommunity/HyperVDsc)
[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/HyperVDsc/25/master)](https://dsccommunity.visualstudio.com/HyperVDsc/_test/analytics?definitionId=25&contextType=build)
[![Build Status](https://dev.azure.com/dsccommunity/HyperVDsc/_apis/build/status/dsccommunity.HyperVDsc?branchName=main)](https://dev.azure.com/dsccommunity/HyperVDsc/_build/latest?definitionId=25&branchName=main)
![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/dsccommunity/HyperVDsc/25/main)
[![codecov](https://codecov.io/gh/dsccommunity/HyperVDsc/branch/main/graph/badge.svg)](https://codecov.io/gh/dsccommunity/HyperVDsc)
[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/HyperVDsc/25/main)](https://dsccommunity.visualstudio.com/HyperVDsc/_test/analytics?definitionId=25&contextType=build)
[![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/HyperVDsc?label=HyperVDsc%20Preview)](https://www.powershellgallery.com/packages/HyperVDsc/)
[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/HyperVDsc?label=HyperVDsc)](https://www.powershellgallery.com/packages/HyperVDsc/)

Expand All @@ -16,7 +16,7 @@ This project has adopted this [Code of Conduct](CODE_OF_CONDUCT.md).

## Releases

For each merge to the branch `master` a preview release will be
For each merge to the branch `main` a preview release will be
deployed to [PowerShell Gallery](https://www.powershellgallery.com/).
Periodically a release version tag will be pushed which will deploy a
full release to [PowerShell Gallery](https://www.powershellgallery.com/).
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
paths:
include:
- source/*
Expand All @@ -17,7 +17,7 @@ variables:
testResultFolderName: testResults
testArtifactName: testResults
sourceFolderName: source
defaultBranch: master
defaultBranch: main

stages:
- stage: Build
Expand Down Expand Up @@ -187,7 +187,7 @@ stages:
and(
succeeded(),
or(
eq(variables['Build.SourceBranch'], 'refs/heads/master'),
eq(variables['Build.SourceBranch'], 'refs/heads/main'),
startsWith(variables['Build.SourceBranch'], 'refs/tags/')
),
contains(variables['System.TeamFoundationCollectionUri'], 'dsccommunity')
Expand Down
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ DscTest:
- output
ExcludeModuleFile:
- Modules/DscResource.Common
MainGitBranch: master
MainGitBranch: main

ModuleBuildTasks:
Sampler:
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
codecov:
require_ci_to_pass: no
# main should be the baseline for reporting
branch: master
branch: main

comment:
layout: "reach, diff, flags, files"
Expand Down
2 changes: 1 addition & 1 deletion source/HyperVDsc.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')

# A URL to the license for this module.
LicenseUri = 'https://github.com/dsccommunity/HyperVDsc/blob/master/LICENSE'
LicenseUri = 'https://github.com/dsccommunity/HyperVDsc/blob/main/LICENSE'

# A URL to the main website for this project.
ProjectUri = 'https://github.com/dsccommunity/HyperVDsc'
Expand Down
20 changes: 10 additions & 10 deletions source/WikiSource/Home.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Welcome to the xHyper-V wiki
# Welcome to the HyperVDsc wiki

<sup>*xHyper-V v#.#.#*</sup>
<sup>*HyperVDsc v#.#.#*</sup>

Here you will find all the information you need to make use of the xHyper-V
Here you will find all the information you need to make use of the HyperVDsc
DSC resources in the latest release. This includes details of the resources
that are available, current capabilities and known issues, and information
to help plan a DSC based implementation of xHyper-V.
to help plan a DSC based implementation of HyperVDsc.

Please leave comments, feature requests, and bug reports for this module in
the [issues section](https://github.com/dsccommunity/xHyper-V/issues)
the [issues section](https://github.com/dsccommunity/HyperVDsc/issues)
for this repository.

## Deprecated resources
Expand All @@ -27,18 +27,18 @@ To get started either:
following command:

```powershell
Install-Module -Name xHyper-V -Repository PSGallery
Install-Module -Name HyperVDsc -Repository PSGallery
```

- Download xHyper-V from the [PowerShell Gallery](http://www.powershellgallery.com/packages/xHyper-V/)
- Download HyperVDsc from the [PowerShell Gallery](http://www.powershellgallery.com/packages/HyperVDsc/)
and then unzip it to one of your PowerShell modules folders (such as
`$env:ProgramFiles\WindowsPowerShell\Modules`).

To confirm installation, run the below command and ensure you see the xHyper-V
To confirm installation, run the below command and ensure you see the HyperVDsc
DSC resources available:

```powershell
Get-DscResource -Module xHyper-V
Get-DscResource -Module HyperVDsc
```

## Prerequisites
Expand All @@ -52,4 +52,4 @@ and Windows Server 2012 R2.

## Change log

A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/xHyper-V/blob/main/CHANGELOG.md).
A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/HyperVDsc/blob/main/CHANGELOG.md).

0 comments on commit 3b66b8f

Please sign in to comment.