Skip to content

Commit 0acee09

Browse files
committed
Merge branch 'standard-v7' into incorporate-v7-standard
2 parents 47912d4 + c4d554a commit 0acee09

Some content is hidden

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

59 files changed

+5267
-2839
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Bug report
3+
about: Report an issue with the C# standard
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is. Does the standard disallow code that should be valid? Does the standard allow code that should produce a compiler error? Does the language in the standard leave an ambiguity where the behavior should be mandated?
12+
13+
Include a reference to the clause in the standard containing the violation.
14+
15+
Include the version of C# where you encounter this error. The committee is working on the updated standard for C# 7.3. We have lists for features that will be added in later versions. Bugs that describe changes to behavior that existed in 7.3 are useful. Adding issues for features that aren't covered are less helpful.
16+
17+
**Example**
18+
Provide an example that shows the problem in the standard. A small code snippet that should be allowed or disallowed, or code that behaves differently than the standard.
19+
20+
```csharp
21+
// Add code here
22+
```
23+
24+
**Expected behavior**
25+
What should the standard declare differently?
26+
27+
**Additional context**
28+
Add any other context about the problem here. If you have links to a reference implementation, or feature specification, or issues recorded in an implementation, those details would be very helpful.

.github/workflows/grammar-validator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Install build grammar global tool
3535
- name: Install BuildGrammar tool
3636
run: |
37-
dotnet tool install --version 1.0.0-alpha.1 --global --add-source ./.github/workflows/dependencies/ EcmaTC49.BuildGrammar
37+
dotnet tool install --version 1.0.0-alpha.2 --global --add-source ./.github/workflows/dependencies/ EcmaTC49.BuildGrammar
3838
3939

4040
- name: run validate

.github/workflows/markdownlint.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- draft-v6
77
- draft-v7
8+
- draft-v8
89
paths:
910
- "standard/*.md"
1011
- ".markdownlint.json"
@@ -27,11 +28,11 @@ jobs:
2728
statuses: write
2829

2930
steps:
30-
- uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 #@v2
31+
- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
3132
- name: Use Node.js
32-
uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d #@v1
33+
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
3334
with:
34-
node-version: 14.x
35+
node-version: 16.x
3536
- name: Run Markdownlint
3637
run: |
3738
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"

.github/workflows/quest-bulk.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "bulk quest import"
2+
on:
3+
schedule:
4+
- cron: '0 10 * * *' # UTC time, that's 5:00 am EST, 2:00 am PST.
5+
workflow_dispatch:
6+
inputs:
7+
reason:
8+
description: "The reason for running the bulk import workflow"
9+
required: true
10+
default: "Initial import into Quest (Azure DevOps)"
11+
12+
jobs:
13+
bulk-import:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
issues: write
17+
if: ${{ github.repository_owner == 'dotnet' }}
18+
19+
steps:
20+
- name: "Print manual bulk import run reason"
21+
if: ${{ github.event_name == 'workflow_dispatch' }}
22+
run: |
23+
echo "Reason: ${{ github.event.inputs.reason }}"
24+
25+
- name: bulk-sequester
26+
id: bulk-sequester
27+
uses: dotnet/docs-tools/actions/sequester@main
28+
env:
29+
ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
30+
ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
31+
ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
32+
with:
33+
org: ${{ github.repository_owner }}
34+
repo: ${{ github.repository }}
35+
issue: '-1'
36+
branch: ${{ github.ref_name }}

.github/workflows/quest.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
name: "quest import"
22
on:
3-
issues:
4-
types:
5-
[ labeled, closed, reopened, assigned, unassigned ]
6-
pull_request:
7-
types:
8-
[ labeled, closed, assigned, unassigned ]
93
workflow_dispatch:
104
inputs:
115
reason:
@@ -26,7 +20,6 @@ jobs:
2620
contains(github.event.issue.labels.*.name, 'seQUESTered')
2721
runs-on: ubuntu-latest
2822
permissions:
29-
contents: write
3023
issues: write
3124

3225
steps:
@@ -65,4 +58,3 @@ jobs:
6558
repo: ${{ github.repository }}
6659
issue: ${{ github.event.issue.number }}
6760
branch: ${{ github.ref_name }}
68-

.github/workflows/test-examples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
types: [opened, synchronize, reopened]
77
paths:
8-
- '/standard/*.md'
8+
- "standard/*.md"
99
workflow_dispatch:
1010
inputs:
1111
reason:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This project has adopted the code of conduct defined by the Contributor Covenant
1111

1212
### C# 7.0 draft
1313

14-
The branch `draft-v7` has the draft text for C# 7.0. It has not been submitted as a formal standard to ECMA. This version is a working draft that contains the features for C# 7.0.
14+
The branch `standard-v7` has the text for C# 7.0. It has been submitted as a formal standard to ECMA.
1515

1616
### C# 6.0 standard
1717

@@ -43,7 +43,7 @@ For now, it contains separate logs for the work going on to add V6 (and then V7)
4343

4444
## Tools folder
4545

46-
This folder contains tools related to maintaining and converting the ECMA C# spec (ECMA-354).
46+
This folder contains tools related to maintaining and converting the ECMA C# spec (ECMA-334).
4747

4848
### GetGrammar
4949

@@ -77,4 +77,4 @@ This project is supported by the [.NET Foundation](https://dotnetfoundation.org)
7777

7878
## Table of contents - C# standard
7979

80-
The [README.md](standard/README.md) file in the `standard` folder contains a detailed table of contents for the C# standard.
80+
The [README.md](standard/README.md) file in the `standard` folder contains a detailed table of contents for the C# standard.

0 commit comments

Comments
 (0)