Merge pull request #728 from BillWagner/merge-v7-work

Merge v7 work

Author: BillWagner

.github/workflows/grammar-validator.yaml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   grammar-validator:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
 

.github/workflows/markdownlint.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - draft-v6
+      - draft-v7
     paths:
       - "standard/*.md"
       - ".markdownlint.json"
@@ -30,7 +31,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d #@v1
       with:
-        node-version: 12.x
+        node-version: 14.x
     - name: Run Markdownlint
       run: |
         echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"

.github/workflows/quest.yml

@@ -0,0 +1,68 @@
+name: "quest import"
+on:
+  issues:
+    types:
+      [ labeled, closed, reopened, assigned, unassigned ]
+  pull_request:
+    types:
+      [ labeled, closed, assigned, unassigned ]
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: "The reason for running the workflow"
+        required: true
+        default: "Manual run"
+      issue:
+        description: "The issue number to manually test"
+        required: true
+
+jobs:
+  import:
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      github.event.label.name == 'reQUEST' ||
+      github.event.label.name == 'seQUESTered' ||
+      contains(github.event.issue.labels.*.name, 'reQUEST') ||
+      contains(github.event.issue.labels.*.name, 'seQUESTered')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+
+    steps:
+      - name: "Print manual run reason"
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          echo "Reason: ${{ github.event.inputs.reason }}"
+          echo "Issue number: ${{ github.event.inputs.issue }}"
+
+      # This step occurs when ran manually, passing the manual issue number input
+      - name: manual-sequester
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        id: manual-sequester
+        uses: dotnet/docs-tools/actions/sequester@main
+        env:
+          ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
+        with:
+          org: ${{ github.repository_owner }}
+          repo: ${{ github.repository }}
+          issue: ${{ github.event.inputs.issue }}
+          branch: ${{ github.ref_name }}
+
+      # This step occurs automatically, passing the issue number from the event
+      - name: auto-sequester
+        if: ${{ github.event_name != 'workflow_dispatch' }}
+        id: auto-sequester
+        uses: dotnet/docs-tools/actions/sequester@main
+        env:
+          ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
+        with:
+          org: ${{ github.repository_owner }}
+          repo: ${{ github.repository }}
+          issue: ${{ github.event.issue.number }}
+          branch: ${{ github.ref_name }}
+          

.github/workflows/renumber-sections.yaml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   renumber-sections:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
 

.github/workflows/test-examples.yaml

@@ -0,0 +1,34 @@
+name: Test examples
+
+# Triggers the workflow on pull request events that update the branch
+on: 
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - '/standard/*.md'
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: 'The reason for running the workflow'
+        required: true
+        default: 'Manual run'
+
+jobs:
+  test-extraction-and-runner:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_NOLOGO: true
+
+    steps:
+    - name: Check out our repo
+      uses: actions/checkout@v2
+
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+
+    - name: Extract and validate tests
+      run: |
+        cd tools
+        ./test-examples.sh

.github/workflows/tools-tests.yaml

@@ -16,8 +16,8 @@ on:
         default: 'Manual run'
 
 jobs:
-  word-converter:
-    runs-on: ubuntu-18.04
+  run-unit-tests:
+    runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
 

.github/workflows/update-on-merge.yaml

@@ -5,7 +5,8 @@ name: Update spec on merge
 on: 
   push:
     branches:
-      - draft-v6 
+      - draft-v6
+      - draft-v7
   workflow_dispatch:
     inputs:
       reason:

.github/workflows/word-converter.yaml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   word-converter:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
 

README.md

@@ -9,9 +9,13 @@ This project has adopted the code of conduct defined by the Contributor Covenant
 
 ## C# Language Specification
 
-### C# 6.0 draft
+### C# 7.0 draft
 
-The branch `draft-v6` has the draft text for C# 6.0. It has not been submitted as a formal standard to ECMA. This version is a working draft that contains the features for C# 6.0.
+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.
+
+### C# 6.0 standard
+
+The branch `standard-v6` has the ECMA C# C# 6.0 standard text, in Markdown format. For the official standard, see the [ECMA site](https://www.ecma-international.org/publications-and-standards/standards/ecma-334/).
 
 ### C# 5.0 standard
 
@@ -23,6 +27,14 @@ This version is stored in this branch as a base markdown version to compare with
 (This document is also available for download: [csharp.pdf](CSharp%20Language%20Specification.pdf?raw=true) and [csharp.docx](CSharp%20Language%20Specification.docx?raw=true))
 -->
 
+### Comments within the standard
+
+There are HTML comments (`<!-- comment -->`) within the standard for the sake of tooling. Some help in the process of converting the standard to Word, and others are for automated testing purposes.
+
+Some automated test comments refer to error codes that are specific to the Microsoft C# compiler (e.g. "CS0509") to test that compilation fails as expected, where an example presents deliberately-invalid code. These error codes are not part of the standard, and should not be viewed as any kind of compliance check for other compilers.
+
+More broadly, *no* comments should be regarded as being part of the standard itself.
+
 ## Admin folder
 
 A home for adminstrative files (such as [eventually] meeting agendas and minutes).
@@ -53,6 +65,12 @@ This tool creates the outline using section numbers, and updates all links to th
 
 Contributors that add sections should follow the guidance in our [contributor guide](CONTRIBUTING.md#how-to-add-or-remove-clauses) to ensure that links to new sections are incorporated correctly. This tool is run on each PR in a `dry-run` mode to ensure that the changes will parse correctly. When a PR is merged, the tool runs to update all section links.
 
+### ExampleExtractor and ExampleTester
+
+These two tools work in tandem to test that the examples presented work (or fail, where invalid code is presented) as expected.
+
+ExampleExtractor populates a temporary directory with code and metadata extracted from the standard. ExampleTester then compiles and runs (where applicable) that code. The test-examples.sh script provides an easy way of running both tools together.
+
 ## .NET Foundation
 
 This project is supported by the [.NET Foundation](https://dotnetfoundation.org).

admin/v6-feature-tracker.md

@@ -2,7 +2,7 @@
 
 To find out what was new/different in v6, Rex used two main sources:
 
-- The [What's New in V6](https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/csharp-6) web page
+- The [What's New in V6](https://docs.microsoft.com/dotnet/csharp/whats-new/csharp-6) web page
 - The diffs that resulted when he compared the v5std md with the v6spec md.
 
 In the latter case, he located those features that required new or changed grammar. He then found all uses of the names of grammar productions that were added/removed, so he could make adjustments to the text. As he progressed, he discovered some new features that did *not* involve grammar changes. Others have reported (small) new features as well.