Skip to content

Commit d5c0517

Browse files
Changes from master to main for WCT-Graph-Controls; there are still more changes to make for links to Azure Devops and MGT
1 parent 67c6527 commit d5c0517

File tree

3 files changed

+61
-62
lines changed

3 files changed

+61
-62
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Fixes #
2+
23
<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
34

45
## PR Type
6+
57
What kind of change does this PR introduce?
8+
69
<!-- Please uncomment one ore more that apply to this PR -->
710

811
<!-- - Bugfix -->
@@ -14,28 +17,24 @@ What kind of change does this PR introduce?
1417
<!-- - Sample app changes -->
1518
<!-- - Other... Please describe: -->
1619

17-
1820
## What is the current behavior?
19-
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
2021

22+
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
2123

2224
## What is the new behavior?
2325

24-
2526
## PR Checklist
2627

2728
Please check if your PR fulfills the following requirements:
2829

29-
- [ ] Tested code with current [supported SDKs](https://github.com/windows-toolkit/Graph-Controls/blob/master/README.md)
30+
- [ ] Tested code with current [supported SDKs](https://github.com/windows-toolkit/Graph-Controls/blob/main/README.md)
3031
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
31-
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
32+
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
3233
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
33-
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
34+
- [ ] Header has been added to all new source files (run _build/UpdateHeaders.bat_)
3435
- [ ] Contains **NO** breaking changes
3536

36-
37-
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
37+
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
3838
Please note that breaking changes are likely to be rejected -->
3939

40-
4140
## Other information

azure-pipelines.yml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
# Control which branches get CI triggers (defaults to all branches if this parameter is not set)
22
trigger:
3-
- master
4-
- rel/*
3+
- main
4+
- rel/*
55

66
# Specify the target branches for pull request builds
77
pr:
8-
- master
9-
- rel/*
8+
- main
9+
- rel/*
1010

1111
# Microsoft-hosted agent pool for Visual Studio 2019
1212
pool:
1313
vmImage: windows-2019
1414

15-
variables:
15+
variables:
1616
BuildConfiguration: CI
1717

1818
steps:
19-
# Setup Environment Variables
20-
- task: BatchScript@1
21-
inputs:
22-
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
23-
arguments: -no_logo
24-
modifyEnvironment: true
25-
displayName: Setup Environment Variables
19+
# Setup Environment Variables
20+
- task: BatchScript@1
21+
inputs:
22+
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
23+
arguments: -no_logo
24+
modifyEnvironment: true
25+
displayName: Setup Environment Variables
2626

27-
# Install Nuget Tool Installer
28-
- task: NuGetToolInstaller@0
29-
displayName: Use NuGet 5.0.0
30-
inputs:
31-
versionSpec: 5.0.0
27+
# Install Nuget Tool Installer
28+
- task: NuGetToolInstaller@0
29+
displayName: Use NuGet 5.0.0
30+
inputs:
31+
versionSpec: 5.0.0
3232

33-
# Install NBGV Tool
34-
- task: DotNetCoreCLI@2
35-
inputs:
36-
command: custom
37-
custom: tool
38-
arguments: install --tool-path . nbgv
39-
displayName: Install NBGV tool
33+
# Install NBGV Tool
34+
- task: DotNetCoreCLI@2
35+
inputs:
36+
command: custom
37+
custom: tool
38+
arguments: install --tool-path . nbgv
39+
displayName: Install NBGV tool
4040

41-
# Set cloud build variables
42-
- script: nbgv cloud
43-
displayName: Set Version
41+
# Set cloud build variables
42+
- script: nbgv cloud
43+
displayName: Set Version
4444

45-
# Install Windows SDK 18362 (minimum compatible sdk)
46-
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
47-
displayName: Insider SDK
45+
# Install Windows SDK 18362 (minimum compatible sdk)
46+
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
47+
displayName: Insider SDK
4848

49-
# Run cake build
50-
- powershell: .\build.ps1 -target=Package
51-
displayName: Build
52-
workingDirectory: .\build
49+
# Run cake build
50+
- powershell: .\build.ps1 -target=Package
51+
displayName: Build
52+
workingDirectory: .\build
5353

54-
# Sign Nuget package
55-
- task: PowerShell@2
56-
displayName: Authenticode Sign Packages
57-
inputs:
58-
filePath: build/Sign-Package.ps1
59-
env:
60-
SignClientUser: $(SignClientUser)
61-
SignClientSecret: $(SignClientSecret)
62-
ArtifactDirectory: bin\nupkg
63-
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
54+
# Sign Nuget package
55+
- task: PowerShell@2
56+
displayName: Authenticode Sign Packages
57+
inputs:
58+
filePath: build/Sign-Package.ps1
59+
env:
60+
SignClientUser: $(SignClientUser)
61+
SignClientSecret: $(SignClientSecret)
62+
ArtifactDirectory: bin\nupkg
63+
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
6464

65-
# Publish nuget package
66-
- task: PublishBuildArtifacts@1
67-
displayName: Publish Package Artifacts
68-
inputs:
69-
pathToPublish: .\bin\nupkg
70-
artifactType: container
71-
artifactName: Packages
65+
# Publish nuget package
66+
- task: PublishBuildArtifacts@1
67+
displayName: Publish Package Artifacts
68+
inputs:
69+
pathToPublish: .\bin\nupkg
70+
artifactType: container
71+
artifactName: Packages

version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"version": "6.1.0-build.{height}",
33
"publicReleaseRefSpec": [
4-
"^refs/heads/master$", // we release out of master
4+
"^refs/heads/main$", // we release out of main
55
"^refs/heads/dev$", // we release out of dev
66
"^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
77
],
8-
"nugetPackageVersion":{
8+
"nugetPackageVersion": {
99
"semVer": 2
1010
},
1111
"cloudBuild": {

0 commit comments

Comments
 (0)