Skip to content

Commit b7b13de

Browse files
authored
Merge branch 'master' into feature/failing-tests-for-1526-and-1526
2 parents 33242eb + 2698412 commit b7b13de

File tree

561 files changed

+13758
-8722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

561 files changed

+13758
-8722
lines changed

.artifactignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
**/*
22

3-
!artifacts/*/bin/netcoreapp2.1
4-
!artifacts/*/bin/netcoreapp3.1
5-
!artifacts/*/build-artifact
3+
artifacts/build-artifact
4+
artifacts/test-results
65
!artifacts/*/nuget
76

87
!artifacts/*/*.tar.gz

.azurepipelines/artifacts-test.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
jobs:
2+
- ${{ each distro in parameters.distros }}:
3+
- ${{ each dotnetVersion in parameters.dotnetVersions }}:
4+
- job:
5+
displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
6+
pool:
7+
vmImage: ${{ parameters.vmImage }}
8+
steps:
9+
- template: common-steps.yml
10+
parameters:
11+
includeArtifacts: true
12+
- pwsh: ./build.ps1 -target Artifacts-Test -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
13+
displayName: '[Docker Test Artifacts ${{ distro }}_${{ dotnetVersion }}]'
14+
- job: Artifacts_Test_MsBuild
15+
displayName: Artifacts Test MsBuild (Windows)
16+
pool:
17+
vmImage: windows-latest
18+
steps:
19+
- template: common-steps.yml
20+
parameters:
21+
includeArtifacts: true
22+
- pwsh: ./build.ps1 -target Artifacts-MsBuildFull-Test
23+
displayName: '[MsBuild Test Artifacts]'
24+
- job: Artifacts_Test_Commandline
25+
displayName: Artifacts Test Commandline (Windows)
26+
pool:
27+
vmImage: windows-latest
28+
steps:
29+
- template: common-steps.yml
30+
parameters:
31+
includeArtifacts: true
32+
- pwsh: ./build.ps1 -target Artifacts-Commandline-Test
33+
displayName: '[Commandline Test Artifacts]'
34+
- job: Artifacts_Test_Portable
35+
displayName: Artifacts Test Portable (Windows)
36+
pool:
37+
vmImage: windows-latest
38+
steps:
39+
- template: common-steps.yml
40+
parameters:
41+
includeArtifacts: true
42+
- pwsh: ./build.ps1 -target Artifacts-Portable-Test
43+
displayName: '[Portable Test Artifacts]'

.azurepipelines/build.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
steps:
2+
- template: common-steps.yml
3+
- pwsh: ./build.ps1 -target Pack
4+
displayName: '[Cake build & pack]'
5+
- publish: $(System.DefaultWorkingDirectory)/artifacts
6+
displayName: 'Upload artifacts folder'
7+
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
8+
artifact: storage
9+
- publish: $(System.DefaultWorkingDirectory)/artifacts/native
10+
displayName: 'Upload native folder'
11+
artifact: storage-$(VM_IMAGE)

.azurepipelines/common-steps.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
parameters:
2+
- name: includeArtifacts
3+
type: boolean
4+
default: false
5+
6+
steps:
7+
- task: Cache@2
8+
inputs:
9+
key: 'v1-tools | "$(Agent.OS)" | build.cake'
10+
path: tools
11+
displayName: Cache Cake tools
12+
- task: Cache@2
13+
inputs:
14+
key: 'v1-dotnet | "$(Agent.OS)" | build.config'
15+
path: .dotnet
16+
displayName: Cache dotnet locally
17+
- ${{ if eq(parameters.includeArtifacts, true) }}:
18+
- task: DownloadPipelineArtifact@2
19+
displayName: 'Download artifacts folder'
20+
inputs:
21+
source: current
22+
path: $(Build.SourcesDirectory)/artifacts
23+
artifact: storage

.azurepipelines/docker.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
jobs:
2+
- ${{ each distro in parameters.distros }}:
3+
- ${{ each dotnetVersion in parameters.dotnetVersions }}:
4+
- job:
5+
displayName: 'Docker ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
6+
pool:
7+
vmImage: ${{ parameters.vmImage }}
8+
steps:
9+
- template: common-steps.yml
10+
parameters:
11+
includeArtifacts: true
12+
- pwsh: ./build.ps1 -target Publish-DockerHub -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
13+
displayName: '[Docker build & Test ${{ distro }} ${{ dotnetVersion }}]'
14+
env:
15+
DOCKER_USERNAME: $(DOCKER_USERNAME)
16+
DOCKER_PASSWORD: $(DOCKER_PASSWORD)
17+
ENABLED_PUBLISH_DOCKER: $(ENABLED_PUBLISH_DOCKER)

.azurepipelines/publish.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
parameters:
2+
- name: taskName # defaults for any parameters that aren't specified
3+
default: ''
4+
5+
steps:
6+
- template: common-steps.yml
7+
parameters:
8+
includeArtifacts: true
9+
- pwsh: ./build.ps1 -target Publish-${{ parameters.taskName }}
10+
displayName: '[Publish]'
11+
env:
12+
GITHUB_TOKEN: $(GITHUB_TOKEN)
13+
NUGET_API_KEY: $(NUGET_API_KEY)
14+
NUGET_API_URL: $(NUGET_API_URL)
15+
CHOCOLATEY_API_KEY: $(CHOCOLATEY_API_KEY)
16+
CHOCOLATEY_API_URL: $(CHOCOLATEY_API_URL)
17+
ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
18+
ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
19+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

.azurepipelines/release.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
parameters:
2+
oses: ['windows', 'ubuntu', 'macos']
3+
steps:
4+
- template: common-steps.yml
5+
parameters:
6+
includeArtifacts: true
7+
- ${{ each os in parameters.oses }}:
8+
- task: DownloadPipelineArtifact@2
9+
displayName: 'Download ${{os}} native folder'
10+
inputs:
11+
source: current
12+
path: $(Build.SourcesDirectory)/artifacts/native
13+
artifact: storage-${{os}}-latest
14+
- pwsh: ./build.ps1 -target Release
15+
displayName: '[Release]'
16+
env:
17+
GITHUB_TOKEN: $(GITHUB_TOKEN)
18+
ENABLED_PUBLISH_RELEASE: $(ENABLED_PUBLISH_RELEASE)

build/stages/test.yml renamed to .azurepipelines/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
2-
- template: common-build-steps.yml
3-
- script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Test
2+
- template: common-steps.yml
3+
- pwsh: ./build.ps1 -target Test
44
displayName: '[Run Test]'
55
env:
66
ENABLED_UNIT_TESTS: $(ENABLED_UNIT_TESTS)

.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "0.37.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

.editorconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,5 @@ charset = utf-8
99
trim_trailing_whitespace = true
1010
insert_final_newline = true
1111

12-
[.yml]
13-
indent_style = space
12+
[*.yml]
1413
indent_size = 2
15-
end_of_line = lf
16-
charset = utf-8
17-
trim_trailing_whitespace = true
18-
insert_final_newline = true

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto eol=crlf
2+
* text=auto eol=lf
33

44
# Declare files that will always have LF line endings on checkout.
55
*.sh text eol=lf
66

77
# Don't check these into the repo as LF to work around TeamCity bug
8-
*.xml -text
8+
*.xml -text
99
*.targets -text
1010

1111
# Custom for Visual Studio

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[Bug]"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
## Expected Behavior
14+
<!-- Tell us what you believe should happen -->
15+
16+
## Actual Behavior
17+
<!-- Tell us what is happening -->
18+
19+
## Possible Fix
20+
<!-- Not obligatory, but suggest a fix or reason for the bug -->
21+
22+
## Steps to Reproduce
23+
<!-- Provide a link to a live example, or an unambiguous set of steps to -->
24+
<!-- reproduce this bug. Include code to reproduce, if relevant -->
25+
26+
## Context
27+
<!-- How has this bug affected you? What were you trying to accomplish? -->
28+
29+
## Your Environment
30+
<!-- Include as many relevant details about the environment -->
31+
<!-- you experienced the bug in -->
32+
33+
- Version Used:
34+
- Operating System and version (Windows 10, Ubuntu 18.04):
35+
- Link to your project:
36+
- Link to your CI build (if appropriate):

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Gitter Community Chat
4+
url: https://gitter.im/GitTools/GitVersion
5+
about: Please ask and answer questions here.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Documentation
3+
about: Describe this issue template's purpose here.
4+
title: "[Docs]"
5+
labels: documentation
6+
assignees: ''
7+
8+
---
9+
10+
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Failing test
3+
about: Describe this issue template's purpose here.
4+
title: "[Failing test]"
5+
labels: failing test case
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is or a link to it
12+
13+
## Test code
14+
```
15+
using var fixture = new EmptyRepositoryFixture();
16+
fixture.Repository.MakeACommit();
17+
fixture.BranchTo("develop");
18+
fixture.Repository.MakeCommits(3);
19+
20+
fixture.AssertFullSemver("0.1.0-alpha.1");
21+
```
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: "[Feature]"
5+
labels: feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
## Detailed Description
14+
<!--- Provide a detailed description of the change or addition you are proposing -->
15+
16+
## Context
17+
<!--- Why is this change important to you? How would you use it? -->
18+
<!--- How can it benefit other users? -->
19+
20+
## Possible Implementation
21+
<!--- Not obligatory, but suggest an idea for implementing addition or change -->
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Improvement request
3+
about: Describe this issue template's purpose here.
4+
title: "[Improvement]"
5+
labels: improvement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your improvement request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
## Detailed Description
14+
<!--- Provide a detailed description of the change or addition you are proposing -->
15+
16+
## Context
17+
<!--- Why is this change important to you? How would you use it? -->
18+
<!--- How can it benefit other users? -->
19+
20+
## Possible Implementation
21+
<!--- Not obligatory, but suggest an idea for implementing addition or change -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
## Description
4+
<!--- Describe your changes in detail -->
5+
6+
## Related Issue
7+
<!--- This project only accepts pull requests related to open issues -->
8+
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
9+
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
10+
<!--- Please link to the issue here: -->
11+
12+
## Motivation and Context
13+
<!--- Why is this change required? What problem does it solve? -->
14+
15+
## How Has This Been Tested?
16+
<!--- Please describe in detail how you tested your changes. -->
17+
<!--- Include details of your testing environment, and the tests you ran to -->
18+
<!--- see how your change affects other areas of the code, etc. -->
19+
20+
## Screenshots (if appropriate):
21+
22+
## Checklist:
23+
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
24+
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
25+
26+
- [ ] My code follows the code style of this project.
27+
- [ ] My change requires a change to the documentation.
28+
- [ ] I have updated the documentation accordingly.
29+
- [ ] I have added tests to cover my changes.
30+
- [ ] All new and existing tests passed.

.github/stale.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ daysUntilClose: 30
66
exemptLabels:
77
- pinned
88
- security
9+
- bug
910
# Label to use when marking an issue as stale
1011
staleLabel: stale
1112
# Comment to post when marking an issue as stale. Set to `false` to disable
@@ -14,4 +15,4 @@ markComment: >
1415
recent activity. After 30 days from now, it will be closed if no further
1516
activity occurs. Thank you for your contributions.
1617
# Comment to post when closing a stale issue. Set to `false` to disable
17-
closeComment: false
18+
closeComment: false

0 commit comments

Comments
 (0)